callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add -DG_DISABLE_DEPRECATED and -DGDK_PIXBUF_DISABLE_DEPRECATED to compile

Browse Source 
Wed Sep 25 00:16:53 2002  Manish Singh  <yosh@gimp.org>

        * gdk/Makefile.am gdk/x11/Makefile.am: add -DG_DISABLE_DEPRECATED
        and -DGDK_PIXBUF_DISABLE_DEPRECATED to compile flags

        * gdk/gdkcolor.c gdk/gdkdisplay.c gdk/gdkdraw.c gdk/gdkevents.c
        gdk/gdkgc.c gdk/gdkimage.c gdk/gdkpango.c gdk/gdkpixbuf-render.c
        gdk/gdkpixmap.c gdk/gdkrgb.c gdk/gdkwindow.c gdk/linux-fb/gdkdnd-fb.c
        gdk/linux-fb/gdkfont-fb.c gdk/win32/gdkdnd-win32.c
        gdk/win32/gdkfont-win32.c gdk/x11/gdkdisplay-x11.c gdk/x11/gdkdnd-x11.c
        gdk/x11/gdkdrawable-x11.c gdk/x11/gdkevents-x11.c gdk/x11/gdkfont-x11.c
        gdk/x11/gdkgc-x11.c gdk/x11/gdkgeometry-x11.c gdk/x11/gdkim-x11.c
        gdk/x11/gdkinput-x11.c gdk/x11/gdkkeys-x11.c gdk/x11/gdkscreen-x11.c
        gdk/x11/gdkwindow-x11.c: Deprecation cleanup, mostly changing
        gdk_foo_{ref,unref} to g_object equivalents.
This commit is contained in:
Manish Singh 2002-09-25 07:23:55 +00:00 committed by Manish Singh
parent de4cf94bc2
commit 234e191c1c
35 changed files with 254 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
Wed Sep 25 00:16:53 2002 Manish Singh <yosh@gimp.org>
* gdk/Makefile.am gdk/x11/Makefile.am: add -DG_DISABLE_DEPRECATED
and -DGDK_PIXBUF_DISABLE_DEPRECATED to compile flags
* gdk/gdkcolor.c gdk/gdkdisplay.c gdk/gdkdraw.c gdk/gdkevents.c
gdk/gdkgc.c gdk/gdkimage.c gdk/gdkpango.c gdk/gdkpixbuf-render.c
gdk/gdkpixmap.c gdk/gdkrgb.c gdk/gdkwindow.c gdk/linux-fb/gdkdnd-fb.c
gdk/linux-fb/gdkfont-fb.c gdk/win32/gdkdnd-win32.c
gdk/win32/gdkfont-win32.c gdk/x11/gdkdisplay-x11.c gdk/x11/gdkdnd-x11.c
gdk/x11/gdkdrawable-x11.c gdk/x11/gdkevents-x11.c gdk/x11/gdkfont-x11.c
gdk/x11/gdkgc-x11.c gdk/x11/gdkgeometry-x11.c gdk/x11/gdkim-x11.c
gdk/x11/gdkinput-x11.c gdk/x11/gdkkeys-x11.c gdk/x11/gdkscreen-x11.c
gdk/x11/gdkwindow-x11.c: Deprecation cleanup, mostly changing
gdk_foo_{ref,unref} to g_object equivalents.
Tue Sep 24 23:54:20 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: check if last_selected is valid before doing

16
ChangeLog.pre-2-10
View File

@ -1,3 +1,19 @@
Wed Sep 25 00:16:53 2002 Manish Singh <yosh@gimp.org>
* gdk/Makefile.am gdk/x11/Makefile.am: add -DG_DISABLE_DEPRECATED
and -DGDK_PIXBUF_DISABLE_DEPRECATED to compile flags
* gdk/gdkcolor.c gdk/gdkdisplay.c gdk/gdkdraw.c gdk/gdkevents.c
gdk/gdkgc.c gdk/gdkimage.c gdk/gdkpango.c gdk/gdkpixbuf-render.c
gdk/gdkpixmap.c gdk/gdkrgb.c gdk/gdkwindow.c gdk/linux-fb/gdkdnd-fb.c
gdk/linux-fb/gdkfont-fb.c gdk/win32/gdkdnd-win32.c
gdk/win32/gdkfont-win32.c gdk/x11/gdkdisplay-x11.c gdk/x11/gdkdnd-x11.c
gdk/x11/gdkdrawable-x11.c gdk/x11/gdkevents-x11.c gdk/x11/gdkfont-x11.c
gdk/x11/gdkgc-x11.c gdk/x11/gdkgeometry-x11.c gdk/x11/gdkim-x11.c
gdk/x11/gdkinput-x11.c gdk/x11/gdkkeys-x11.c gdk/x11/gdkscreen-x11.c
gdk/x11/gdkwindow-x11.c: Deprecation cleanup, mostly changing
gdk_foo_{ref,unref} to g_object equivalents.
Tue Sep 24 23:54:20 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: check if last_selected is valid before doing

16
ChangeLog.pre-2-2
View File

@ -1,3 +1,19 @@
Wed Sep 25 00:16:53 2002 Manish Singh <yosh@gimp.org>
* gdk/Makefile.am gdk/x11/Makefile.am: add -DG_DISABLE_DEPRECATED
and -DGDK_PIXBUF_DISABLE_DEPRECATED to compile flags
* gdk/gdkcolor.c gdk/gdkdisplay.c gdk/gdkdraw.c gdk/gdkevents.c
gdk/gdkgc.c gdk/gdkimage.c gdk/gdkpango.c gdk/gdkpixbuf-render.c
gdk/gdkpixmap.c gdk/gdkrgb.c gdk/gdkwindow.c gdk/linux-fb/gdkdnd-fb.c
gdk/linux-fb/gdkfont-fb.c gdk/win32/gdkdnd-win32.c
gdk/win32/gdkfont-win32.c gdk/x11/gdkdisplay-x11.c gdk/x11/gdkdnd-x11.c
gdk/x11/gdkdrawable-x11.c gdk/x11/gdkevents-x11.c gdk/x11/gdkfont-x11.c
gdk/x11/gdkgc-x11.c gdk/x11/gdkgeometry-x11.c gdk/x11/gdkim-x11.c
gdk/x11/gdkinput-x11.c gdk/x11/gdkkeys-x11.c gdk/x11/gdkscreen-x11.c
gdk/x11/gdkwindow-x11.c: Deprecation cleanup, mostly changing
gdk_foo_{ref,unref} to g_object equivalents.
Tue Sep 24 23:54:20 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: check if last_selected is valid before doing

16
ChangeLog.pre-2-4
View File

@ -1,3 +1,19 @@
Wed Sep 25 00:16:53 2002 Manish Singh <yosh@gimp.org>
* gdk/Makefile.am gdk/x11/Makefile.am: add -DG_DISABLE_DEPRECATED
and -DGDK_PIXBUF_DISABLE_DEPRECATED to compile flags
* gdk/gdkcolor.c gdk/gdkdisplay.c gdk/gdkdraw.c gdk/gdkevents.c
gdk/gdkgc.c gdk/gdkimage.c gdk/gdkpango.c gdk/gdkpixbuf-render.c
gdk/gdkpixmap.c gdk/gdkrgb.c gdk/gdkwindow.c gdk/linux-fb/gdkdnd-fb.c
gdk/linux-fb/gdkfont-fb.c gdk/win32/gdkdnd-win32.c
gdk/win32/gdkfont-win32.c gdk/x11/gdkdisplay-x11.c gdk/x11/gdkdnd-x11.c
gdk/x11/gdkdrawable-x11.c gdk/x11/gdkevents-x11.c gdk/x11/gdkfont-x11.c
gdk/x11/gdkgc-x11.c gdk/x11/gdkgeometry-x11.c gdk/x11/gdkim-x11.c
gdk/x11/gdkinput-x11.c gdk/x11/gdkkeys-x11.c gdk/x11/gdkscreen-x11.c
gdk/x11/gdkwindow-x11.c: Deprecation cleanup, mostly changing
gdk_foo_{ref,unref} to g_object equivalents.
Tue Sep 24 23:54:20 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: check if last_selected is valid before doing

16
ChangeLog.pre-2-6
View File

@ -1,3 +1,19 @@
Wed Sep 25 00:16:53 2002 Manish Singh <yosh@gimp.org>
* gdk/Makefile.am gdk/x11/Makefile.am: add -DG_DISABLE_DEPRECATED
and -DGDK_PIXBUF_DISABLE_DEPRECATED to compile flags
* gdk/gdkcolor.c gdk/gdkdisplay.c gdk/gdkdraw.c gdk/gdkevents.c
gdk/gdkgc.c gdk/gdkimage.c gdk/gdkpango.c gdk/gdkpixbuf-render.c
gdk/gdkpixmap.c gdk/gdkrgb.c gdk/gdkwindow.c gdk/linux-fb/gdkdnd-fb.c
gdk/linux-fb/gdkfont-fb.c gdk/win32/gdkdnd-win32.c
gdk/win32/gdkfont-win32.c gdk/x11/gdkdisplay-x11.c gdk/x11/gdkdnd-x11.c
gdk/x11/gdkdrawable-x11.c gdk/x11/gdkevents-x11.c gdk/x11/gdkfont-x11.c
gdk/x11/gdkgc-x11.c gdk/x11/gdkgeometry-x11.c gdk/x11/gdkim-x11.c
gdk/x11/gdkinput-x11.c gdk/x11/gdkkeys-x11.c gdk/x11/gdkscreen-x11.c
gdk/x11/gdkwindow-x11.c: Deprecation cleanup, mostly changing
gdk_foo_{ref,unref} to g_object equivalents.
Tue Sep 24 23:54:20 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: check if last_selected is valid before doing

16
ChangeLog.pre-2-8
View File

@ -1,3 +1,19 @@
Wed Sep 25 00:16:53 2002 Manish Singh <yosh@gimp.org>
* gdk/Makefile.am gdk/x11/Makefile.am: add -DG_DISABLE_DEPRECATED
and -DGDK_PIXBUF_DISABLE_DEPRECATED to compile flags
* gdk/gdkcolor.c gdk/gdkdisplay.c gdk/gdkdraw.c gdk/gdkevents.c
gdk/gdkgc.c gdk/gdkimage.c gdk/gdkpango.c gdk/gdkpixbuf-render.c
gdk/gdkpixmap.c gdk/gdkrgb.c gdk/gdkwindow.c gdk/linux-fb/gdkdnd-fb.c
gdk/linux-fb/gdkfont-fb.c gdk/win32/gdkdnd-win32.c
gdk/win32/gdkfont-win32.c gdk/x11/gdkdisplay-x11.c gdk/x11/gdkdnd-x11.c
gdk/x11/gdkdrawable-x11.c gdk/x11/gdkevents-x11.c gdk/x11/gdkfont-x11.c
gdk/x11/gdkgc-x11.c gdk/x11/gdkgeometry-x11.c gdk/x11/gdkim-x11.c
gdk/x11/gdkinput-x11.c gdk/x11/gdkkeys-x11.c gdk/x11/gdkscreen-x11.c
gdk/x11/gdkwindow-x11.c: Deprecation cleanup, mostly changing
gdk_foo_{ref,unref} to g_object equivalents.
Tue Sep 24 23:54:20 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: check if last_selected is valid before doing

2
gdk/Makefile.am
View File

@ -17,6 +17,8 @@ common_includes = @STRIP_BEGIN@ \
-I$(top_srcdir) \
-I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk-pixbuf \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \
@GDK_DEP_CFLAGS@ \
-DGDK_COMPILATION \

4
gdk/gdkcolor.c
View File

@ -41,7 +41,7 @@
GdkColormap*
gdk_colormap_ref (GdkColormap *cmap)
{
return (GdkColormap *) g_object_ref (G_OBJECT (cmap));
return (GdkColormap *) g_object_ref (cmap);
}
/**
@ -53,7 +53,7 @@ gdk_colormap_ref (GdkColormap *cmap)
void
gdk_colormap_unref (GdkColormap *cmap)
{
g_object_unref (G_OBJECT (cmap));
g_object_unref (cmap);
}
GdkVisual *

2
gdk/gdkdisplay.c
View File

@ -145,7 +145,7 @@ gdk_display_close (GdkDisplay *display)
g_signal_emit (display, signals[CLOSED], 0, FALSE);
g_object_run_dispose (G_OBJECT (display));
g_object_unref (G_OBJECT (display));
g_object_unref (display);
}
}

16
gdk/gdkdraw.c
View File

@ -291,7 +291,7 @@ gdk_drawable_get_colormap (GdkDrawable *drawable)
GdkDrawable*
gdk_drawable_ref (GdkDrawable *drawable)
{
return (GdkDrawable *) g_object_ref (G_OBJECT (drawable));
return (GdkDrawable *) g_object_ref (drawable);
}
/**
@ -306,7 +306,7 @@ gdk_drawable_unref (GdkDrawable *drawable)
{
g_return_if_fail (GDK_IS_DRAWABLE (drawable));
g_object_unref (G_OBJECT (drawable));
g_object_unref (drawable);
}
/* Drawing
@ -556,7 +556,7 @@ gdk_draw_drawable (GdkDrawable *drawable,
xdest, ydest,
width, height);
g_object_unref (G_OBJECT (composite));
g_object_unref (composite);
}
void
@ -783,7 +783,7 @@ _gdk_drawable_copy_to_image (GdkDrawable *drawable,
dest_x, dest_y,
width, height);
g_object_unref (G_OBJECT (composite));
g_object_unref (composite);
if (!image && retval)
{
@ -874,7 +874,7 @@ gdk_drawable_get_image (GdkDrawable *drawable,
y - composite_y_offset,
width, height);
g_object_unref (G_OBJECT (composite));
g_object_unref (composite);
cmap = gdk_drawable_get_colormap (drawable);
@ -908,7 +908,7 @@ gdk_drawable_real_get_composite_drawable (GdkDrawable *drawable,
*composite_x_offset = 0;
*composite_y_offset = 0;
return GDK_DRAWABLE (g_object_ref (G_OBJECT (drawable)));
return g_object_ref (drawable);
}
/**
@ -1355,8 +1355,8 @@ gdk_drawable_real_draw_pixbuf (GdkDrawable *drawable,
out:
if (composited)
g_object_unref (G_OBJECT (composited));
g_object_unref (composited);
if (free_gc)
gdk_gc_unref (gc);
g_object_unref (gc);
}

12
gdk/gdkevents.c
View File

@ -295,7 +295,7 @@ gdk_event_copy (GdkEvent *event)
*new_event = *event;
if (new_event->any.window)
gdk_window_ref (new_event->any.window);
g_object_ref (new_event->any.window);
switch (event->any.type)
{
@ -307,7 +307,7 @@ gdk_event_copy (GdkEvent *event)
case GDK_ENTER_NOTIFY:
case GDK_LEAVE_NOTIFY:
if (event->crossing.subwindow != NULL)
gdk_window_ref (event->crossing.subwindow);
g_object_ref (event->crossing.subwindow);
break;
case GDK_DRAG_ENTER:
@ -316,7 +316,7 @@ gdk_event_copy (GdkEvent *event)
case GDK_DRAG_STATUS:
case GDK_DROP_START:
case GDK_DROP_FINISHED:
gdk_drag_context_ref (event->dnd.context);
g_object_ref (event->dnd.context);
break;
case GDK_EXPOSE:
@ -352,7 +352,7 @@ gdk_event_free (GdkEvent *event)
g_assert (event_chunk != NULL); /* paranoid */
if (event->any.window)
gdk_window_unref (event->any.window);
g_object_unref (event->any.window);
switch (event->any.type)
{
@ -364,7 +364,7 @@ gdk_event_free (GdkEvent *event)
case GDK_ENTER_NOTIFY:
case GDK_LEAVE_NOTIFY:
if (event->crossing.subwindow != NULL)
gdk_window_unref (event->crossing.subwindow);
g_object_unref (event->crossing.subwindow);
break;
case GDK_DRAG_ENTER:
@ -373,7 +373,7 @@ gdk_event_free (GdkEvent *event)
case GDK_DRAG_STATUS:
case GDK_DROP_START:
case GDK_DROP_FINISHED:
gdk_drag_context_unref (event->dnd.context);
g_object_unref (event->dnd.context);
break;
case GDK_BUTTON_PRESS:

12
gdk/gdkgc.c
View File

@ -112,7 +112,7 @@ gdk_gc_new_with_values (GdkDrawable *drawable,
{
gc->colormap = gdk_drawable_get_colormap (drawable);
if (gc->colormap)
g_object_ref (G_OBJECT (gc->colormap));
g_object_ref (gc->colormap);
}
return gc;
@ -124,7 +124,7 @@ gdk_gc_finalize (GObject *object)
GdkGC *gc = GDK_GC (object);
if (gc->colormap)
g_object_unref (G_OBJECT (gc->colormap));
g_object_unref (gc->colormap);
parent_class->finalize (object);
}
@ -140,7 +140,7 @@ gdk_gc_finalize (GObject *object)
GdkGC *
gdk_gc_ref (GdkGC *gc)
{
return (GdkGC *) g_object_ref (G_OBJECT (gc));
return (GdkGC *) g_object_ref (gc);
}
/**
@ -152,7 +152,7 @@ gdk_gc_ref (GdkGC *gc)
void
gdk_gc_unref (GdkGC *gc)
{
g_object_unref (G_OBJECT (gc));
g_object_unref (gc);
}
void
@ -439,10 +439,10 @@ gdk_gc_set_colormap (GdkGC *gc,
if (gc->colormap != colormap)
{
if (gc->colormap)
g_object_unref (G_OBJECT (gc->colormap));
g_object_unref (gc->colormap);
gc->colormap = colormap;
g_object_ref (G_OBJECT (gc->colormap));
g_object_ref (gc->colormap);
}
}

10
gdk/gdkimage.c
View File

@ -43,7 +43,7 @@
GdkImage *
gdk_image_ref (GdkImage *image)
{
return (GdkImage *) g_object_ref (G_OBJECT (image));
return (GdkImage *) g_object_ref (image);
}
/**
@ -58,7 +58,7 @@ gdk_image_unref (GdkImage *image)
{
g_return_if_fail (GDK_IS_IMAGE (image));
g_object_unref (G_OBJECT (image));
g_object_unref (image);
}
/**
@ -113,10 +113,10 @@ gdk_image_set_colormap (GdkImage *image,
if (image->colormap != colormap)
{
if (image->colormap)
g_object_unref (G_OBJECT (image->colormap));
g_object_unref (image->colormap);
image->colormap = colormap;
g_object_ref (G_OBJECT (image->colormap));
g_object_ref (image->colormap);
}
}
@ -215,7 +215,7 @@ allocate_scratch_images (GdkScratchImageInfo *info,
gint j;
for (j = 0; j < i; j++)
gdk_image_unref (info->static_image[i]);
g_object_unref (info->static_image[i]);
return FALSE;
}

10
gdk/gdkpango.c
View File

@ -54,7 +54,7 @@ static void
gdk_pango_context_destroy (GdkPangoContextInfo *info)
{
if (info->colormap)
gdk_colormap_unref (info->colormap);
g_object_unref (info->colormap);
g_free (info);
}
@ -125,7 +125,7 @@ static void
gdk_pango_free_gc (PangoContext *context,
GdkGC *gc)
{
gdk_gc_unref (gc);
g_object_unref (gc);
}
/**
@ -154,12 +154,12 @@ gdk_pango_context_set_colormap (PangoContext *context,
if (info->colormap != colormap)
{
if (info->colormap)
gdk_colormap_unref (info->colormap);
g_object_unref (info->colormap);
info->colormap = colormap;
if (info->colormap)
gdk_colormap_ref (info->colormap);
g_object_ref (info->colormap);
}
}
@ -570,7 +570,7 @@ gdk_pango_attr_stipple_destroy (PangoAttribute *attr)
GdkPangoAttrStipple *st = (GdkPangoAttrStipple*) attr;
if (st->stipple)
g_object_unref (G_OBJECT (st->stipple));
g_object_unref (st->stipple);
g_free (attr);
}

6
gdk/gdkpixbuf-render.c
View File

@ -89,7 +89,7 @@ gdk_pixbuf_render_threshold_alpha (GdkPixbuf *pixbuf,
color.pixel = (alpha_threshold == 255) ? 0 : 1;
gdk_gc_set_foreground (gc, &color);
gdk_draw_rectangle (bitmap, gc, TRUE, dest_x, dest_y, width, height);
gdk_gc_unref (gc);
g_object_unref (gc);
return;
}
@ -132,7 +132,7 @@ gdk_pixbuf_render_threshold_alpha (GdkPixbuf *pixbuf,
x - 1 + dest_x, y + dest_y);
}
gdk_gc_unref (gc);
g_object_unref (gc);
}
@ -329,7 +329,7 @@ gdk_pixbuf_render_pixmap_and_mask_for_colormap (GdkPixbuf *pixbuf,
gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf),
GDK_RGB_DITHER_NORMAL,
0, 0);
gdk_gc_unref (gc);
g_object_unref (gc);
}
if (mask_return)

12
gdk/gdkpixmap.c
View File

@ -215,7 +215,7 @@ gdk_pixmap_finalize (GObject *object)
{
GdkPixmapObject *obj = (GdkPixmapObject *) object;
g_object_unref (G_OBJECT (obj->impl));
g_object_unref (obj->impl);
obj->impl = NULL;
G_OBJECT_CLASS (parent_class)->finalize (object);
@ -491,7 +491,7 @@ make_solid_mask (GdkScreen *screen, gint width, gint height)
gdk_draw_rectangle (bitmap, gc, TRUE, 0, 0, width, height);
gdk_gc_unref (gc);
g_object_unref (gc);
return bitmap;
}
@ -532,10 +532,10 @@ gdk_pixmap_colormap_new_from_pixbuf (GdkColormap *colormap,
gdk_pixbuf_get_width (render_pixbuf),
gdk_pixbuf_get_height (render_pixbuf),
GDK_RGB_DITHER_NORMAL, 0, 0);
gdk_gc_unref (tmp_gc);
g_object_unref (tmp_gc);
if (render_pixbuf != pixbuf)
gdk_pixbuf_unref (render_pixbuf);
g_object_unref (render_pixbuf);
if (mask)
gdk_pixbuf_render_pixmap_and_mask_for_colormap (pixbuf, colormap, NULL, mask, 128);
@ -571,7 +571,7 @@ gdk_pixmap_colormap_create_from_xpm (GdkWindow *window,
pixmap = gdk_pixmap_colormap_new_from_pixbuf (colormap, mask, transparent_color, pixbuf);
gdk_pixbuf_unref (pixbuf);
g_object_unref (pixbuf);
return pixmap;
}
@ -609,7 +609,7 @@ gdk_pixmap_colormap_create_from_xpm_d (GdkWindow *window,
pixmap = gdk_pixmap_colormap_new_from_pixbuf (colormap, mask, transparent_color, pixbuf);
gdk_pixbuf_unref (pixbuf);
g_object_unref (pixbuf);
return pixmap;
}

8
gdk/gdkrgb.c
View File

@ -565,7 +565,7 @@ gdk_rgb_free_info (GdkRgbInfo *image_info)
gdk_rgb_cmap_free (image_info->gray_cmap);
if (image_info->own_gc)
gdk_gc_unref (image_info->own_gc);
g_object_unref (image_info->own_gc);
if (image_info->colorcube)
g_free (image_info->colorcube);
@ -639,7 +639,7 @@ gdk_rgb_create_info (GdkVisual *visual, GdkColormap *colormap)
image_info->visual->depth >= 3))
{
if (!image_info->cmap)
image_info->cmap = gdk_colormap_ref (gdk_screen_get_system_colormap (screen));
image_info->cmap = g_object_ref (gdk_screen_get_system_colormap (screen));
gdk_rgb_colorcube_222 (image_info);
}
@ -665,7 +665,7 @@ gdk_rgb_create_info (GdkVisual *visual, GdkColormap *colormap)
image_info->nblue_shades);
if (!image_info->cmap)
image_info->cmap = gdk_colormap_ref (gdk_screen_get_system_colormap (screen));
image_info->cmap = g_object_ref (gdk_screen_get_system_colormap (screen));
}
#ifdef ENABLE_GRAYSCALE
else if (image_info->visual->type == GDK_VISUAL_GRAYSCALE)
@ -686,7 +686,7 @@ gdk_rgb_create_info (GdkVisual *visual, GdkColormap *colormap)
/* Always install colormap in direct color. */
if (image_info->visual->type != GDK_VISUAL_DIRECT_COLOR &&
image_info->visual == gdk_screen_get_system_visual (screen))
image_info->cmap = gdk_colormap_ref (gdk_screen_get_system_colormap (screen));
image_info->cmap = g_object_ref (gdk_screen_get_system_colormap (screen));
else
{
image_info->cmap = gdk_colormap_new (image_info->visual, FALSE);

40
gdk/gdkwindow.c
View File

@ -273,7 +273,7 @@ gdk_window_finalize (GObject *object)
_gdk_window_destroy (window, TRUE);
}
g_object_unref (G_OBJECT (obj->impl));
g_object_unref (obj->impl);
obj->impl = NULL;
G_OBJECT_CLASS (parent_class)->finalize (object);
@ -335,7 +335,7 @@ _gdk_window_destroy_hierarchy (GdkWindow *window,
private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
private->bg_pixmap != GDK_NO_BG)
{
gdk_pixmap_unref (private->bg_pixmap);
g_object_unref (private->bg_pixmap);
private->bg_pixmap = NULL;
}
@ -422,7 +422,7 @@ void
gdk_window_destroy (GdkWindow *window)
{
_gdk_window_destroy_hierarchy (window, FALSE, FALSE);
gdk_drawable_unref (window);
g_object_unref (window);
}
/**
@ -900,7 +900,7 @@ gdk_window_paint_init_bg (GdkWindow *window,
gdk_gc_set_clip_region (tmp_gc, init_region);
gdk_draw_rectangle (paint->pixmap, tmp_gc, TRUE, 0, 0, -1, -1);
gdk_gc_unref (tmp_gc);
g_object_unref (tmp_gc);
}
#ifdef GDK_WINDOWING_X11
@ -1000,8 +1000,8 @@ gdk_window_begin_paint_region (GdkWindow *window,
0, 0,
old_rect.x - new_rect.x, old_rect.y - new_rect.y,
old_rect.width, old_rect.height);
gdk_gc_unref (tmp_gc);
gdk_drawable_unref (tmp_paint->pixmap);
g_object_unref (tmp_gc);
g_object_unref (tmp_paint->pixmap);
paint->x_offset = new_rect.x;
paint->y_offset = new_rect.y;
@ -1105,7 +1105,7 @@ gdk_window_end_paint (GdkWindow *window)
clip_box.y - paint->y_offset,
clip_box.x - x_offset, clip_box.y - y_offset,
clip_box.width, clip_box.height);
gdk_gc_unref (tmp_gc);
g_object_unref (tmp_gc);
if (private->paint_stack)
{
@ -1119,7 +1119,7 @@ gdk_window_end_paint (GdkWindow *window)
}
}
else
gdk_drawable_unref (paint->pixmap);
g_object_unref (paint->pixmap);
gdk_region_destroy (paint->region);
g_free (paint);
@ -1140,7 +1140,7 @@ gdk_window_free_paint_stack (GdkWindow *window)
GdkWindowPaint *paint = tmp_list->data;
if (tmp_list == private->paint_stack)
gdk_drawable_unref (paint->pixmap);
g_object_unref (paint->pixmap);
gdk_region_destroy (paint->region);
g_free (paint);
@ -1450,7 +1450,7 @@ gdk_window_get_composite_drawable (GdkDrawable *window,
composite_x_offset,
composite_y_offset);
return GDK_DRAWABLE (g_object_ref (G_OBJECT (window)));
return g_object_ref (window);
}
buffered_region = NULL;
@ -1500,7 +1500,7 @@ gdk_window_get_composite_drawable (GdkDrawable *window,
composite_x_offset,
composite_y_offset);
return GDK_DRAWABLE (g_object_ref (G_OBJECT (window)));
return g_object_ref (window);
}
tmp_pixmap = gdk_pixmap_new (window,
@ -1549,7 +1549,7 @@ gdk_window_get_composite_drawable (GdkDrawable *window,
*composite_x_offset = x;
*composite_y_offset = y;
g_object_unref (G_OBJECT (tmp_gc));
g_object_unref (tmp_gc);
return tmp_pixmap;
}
@ -1800,7 +1800,7 @@ gdk_window_clear_backing_rect (GdkWindow *window,
tmp_gc = gdk_window_get_bg_gc (window, paint);
gdk_draw_rectangle (paint->pixmap, tmp_gc, TRUE,
x - paint->x_offset, y - paint->y_offset, width, height);
gdk_gc_unref (tmp_gc);
g_object_unref (tmp_gc);
}
/**
@ -2117,7 +2117,7 @@ gdk_window_process_updates_internal (GdkWindow *window)
save_region = _gdk_windowing_window_queue_antiexpose (window, update_area);
event.expose.type = GDK_EXPOSE;
event.expose.window = gdk_window_ref (window);
event.expose.window = g_object_ref (window);
event.expose.count = 0;
if (save_region)
@ -2139,7 +2139,7 @@ gdk_window_process_updates_internal (GdkWindow *window)
if (expose_region != update_area)
gdk_region_destroy (expose_region);
gdk_window_unref (window);
g_object_unref (window);
}
if (!save_region)
gdk_region_destroy (update_area);
@ -2290,12 +2290,12 @@ draw_ugly_color (GdkWindow *window,
gdk_region_get_clipbox (region, &clipbox);
gdk_draw_rectangle (window,
ugly_gc,
TRUE,
clipbox.x, clipbox.y,
clipbox.width, clipbox.height);
ugly_gc,
TRUE,
clipbox.x, clipbox.y,
clipbox.width, clipbox.height);
g_object_unref (G_OBJECT (ugly_gc));
g_object_unref (ugly_gc);
}
/**

4
gdk/linux-fb/gdkdnd-fb.c
View File

@ -143,13 +143,13 @@ gdk_drag_context_new (void)
void
gdk_drag_context_ref (GdkDragContext *context)
{
g_object_ref (G_OBJECT (context));
g_object_ref (context);
}
void
gdk_drag_context_unref (GdkDragContext *context)
{
g_object_unref (G_OBJECT (context));
g_object_unref (context);
}
static GdkDragContext *

4
gdk/linux-fb/gdkfont-fb.c
View File

@ -141,7 +141,7 @@ gdk_font_from_description_for_display (GdkDisplay *display,
private->pango_font = pango_font;
g_free (lang);
g_object_unref (G_OBJECT (context));
g_object_unref (context);
font->ascent = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics));
font->descent = PANGO_PIXELS (pango_font_metrics_get_descent (metrics));
@ -245,7 +245,7 @@ _gdk_font_destroy (GdkFont *font)
GdkFontPrivateFB *private = (GdkFontPrivateFB *)font;
gdk_font_hash_remove (font->type, font);
g_object_unref (G_OBJECT (private->pango_font));
g_object_unref (private->pango_font);
g_free (private->name);
g_free (font);
}

4
gdk/win32/gdkdnd-win32.c
View File

@ -193,7 +193,7 @@ gdk_drag_context_ref (GdkDragContext *context)
GDK_NOTE (DND, g_print ("gdk_drag_context_ref: %p %d\n", context, G_OBJECT(context)->ref_count));
g_object_ref (G_OBJECT (context));
g_object_ref (context);
}
void
@ -202,7 +202,7 @@ gdk_drag_context_unref (GdkDragContext *context)
g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
GDK_NOTE (DND, g_print ("gdk_drag_context_unref: %p %d\n", context, G_OBJECT(context)->ref_count));
g_object_unref (G_OBJECT (context));
g_object_unref (context);
}
static GdkDragContext *

2
gdk/win32/gdkfont-win32.c
View File

@ -1268,7 +1268,7 @@ gdk_font_from_description_for_display (GdkDisplay *display,
result = gdk_font_from_one_singlefont (gdk_font_load_logfont (lfp));
g_free (lfp);
g_object_unref (G_OBJECT (font));
g_object_unref (font);
}
return result;

18
gdk/x11/Makefile.am
View File

@ -2,14 +2,16 @@
libgdkincludedir = $(includedir)/gtk-2.0/gdk
INCLUDES = @STRIP_BEGIN@ \
-DG_LOG_DOMAIN=\"Gdk\" \
-DINSIDE_GDK_X11 \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
@GTK_DEBUG_FLAGS@ \
@GDK_DEP_CFLAGS@ \
INCLUDES = @STRIP_BEGIN@ \
-DG_LOG_DOMAIN=\"Gdk\" \
-DINSIDE_GDK_X11 \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \
@GDK_DEP_CFLAGS@ \
@STRIP_END@
LDADDS = @STRIP_BEGIN@ \

6
gdk/x11/gdkdisplay-x11.c
View File

@ -537,15 +537,15 @@ gdk_display_x11_finalize (GObject *object)
/* input GdkDevice list */
/* FIXME need to write finalize fct */
for (tmp = display_x11->input_devices; tmp; tmp = tmp->next)
g_object_unref (G_OBJECT (tmp->data));
g_object_unref (tmp->data);
g_list_free (display_x11->input_devices);
/* input GdkWindow list */
for (tmp = display_x11->input_windows; tmp; tmp = tmp->next)
g_object_unref (G_OBJECT (tmp->data));
g_object_unref (tmp->data);
g_list_free (display_x11->input_windows);
/* Free all GdkScreens */
for (i = 0; i < ScreenCount (display_x11->xdisplay); i++)
g_object_unref (G_OBJECT (display_x11->screens[i]));
g_object_unref (display_x11->screens[i]);
g_free (display_x11->screens);
G_OBJECT_CLASS (parent_class)->finalize (object);
}

70
gdk/x11/gdkdnd-x11.c
View File

@ -197,11 +197,11 @@ gdk_drag_context_finalize (GObject *object)
!context->is_source)
xdnd_manage_source_filter (context, context->source_window, FALSE);
gdk_window_unref (context->source_window);
g_object_unref (context->source_window);
}
if (context->dest_window)
gdk_window_unref (context->dest_window);
g_object_unref (context->dest_window);
if (private->window_cache)
gdk_window_cache_destroy (private->window_cache);
@ -226,7 +226,7 @@ gdk_drag_context_ref (GdkDragContext *context)
{
g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
g_object_ref (G_OBJECT (context));
g_object_ref (context);
}
void
@ -234,7 +234,7 @@ gdk_drag_context_unref (GdkDragContext *context)
{
g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
g_object_unref (G_OBJECT (context));
g_object_unref (context);
}
static GdkDragContext *
@ -1488,7 +1488,7 @@ motif_drag_context_new (GdkWindow *dest_window,
{
if (timestamp >= display_x11->current_dest_drag->start_time)
{
gdk_drag_context_unref (display_x11->current_dest_drag);
g_object_unref (display_x11->current_dest_drag);
display_x11->current_dest_drag = NULL;
}
else
@ -1503,19 +1503,19 @@ motif_drag_context_new (GdkWindow *dest_window,
new_context->source_window = gdk_window_lookup_for_display (display, source_window);
if (new_context->source_window)
gdk_window_ref (new_context->source_window);
g_object_ref (new_context->source_window);
else
{
new_context->source_window = gdk_window_foreign_new_for_display (display, source_window);
if (!new_context->source_window)
{
gdk_drag_context_unref (new_context);
g_object_unref (new_context);
return NULL;
}
}
new_context->dest_window = dest_window;
gdk_window_ref (dest_window);
g_object_ref (dest_window);
new_context->start_time = timestamp;
if (!motif_read_initiator_info (GDK_WINDOW_DISPLAY (dest_window),
@ -1524,7 +1524,7 @@ motif_drag_context_new (GdkWindow *dest_window,
&new_context->targets,
&private->motif_selection))
{
gdk_drag_context_unref (new_context);
g_object_unref (new_context);
return NULL;
}
@ -1557,7 +1557,7 @@ motif_top_level_enter (GdkEvent *event,
event->dnd.type = GDK_DRAG_ENTER;
event->dnd.context = new_context;
gdk_drag_context_ref (new_context);
g_object_ref (new_context);
display_x11->current_dest_drag = new_context;
@ -1611,7 +1611,7 @@ motif_motion (GdkEvent *event,
event->dnd.type = GDK_DRAG_MOTION;
event->dnd.context = display_x11->current_dest_drag;
gdk_drag_context_ref (display_x11->current_dest_drag);
g_object_ref (display_x11->current_dest_drag);
event->dnd.time = timestamp;
@ -1648,7 +1648,7 @@ motif_operation_changed (GdkEvent *event,
event->dnd.type = GDK_DRAG_MOTION;
event->dnd.send_event = FALSE;
event->dnd.context = display_x11->current_dest_drag;
gdk_drag_context_ref (display_x11->current_dest_drag);
g_object_ref (display_x11->current_dest_drag);
event->dnd.time = timestamp;
private = PRIVATE_DATA (display_x11->current_dest_drag);
@ -1693,7 +1693,7 @@ motif_drop_start (GdkEvent *event,
event->dnd.x_root = x_root;
event->dnd.y_root = y_root;
gdk_drag_context_ref (new_context);
g_object_ref (new_context);
display_x11->current_dest_drag = new_context;
return GDK_FILTER_TRANSLATE;
@ -1726,7 +1726,7 @@ motif_drag_status (GdkEvent *event,
event->dnd.type = GDK_DRAG_STATUS;
event->dnd.send_event = FALSE;
event->dnd.context = context;
gdk_drag_context_ref (context);
g_object_ref (context);
event->dnd.time = timestamp;
@ -1935,7 +1935,7 @@ xdnd_status_filter (GdkXEvent *xev,
event->dnd.send_event = FALSE;
event->dnd.type = GDK_DRAG_STATUS;
event->dnd.context = context;
gdk_drag_context_ref (context);
g_object_ref (context);
event->dnd.time = GDK_CURRENT_TIME; /* FIXME? */
if (!(action != 0) != !(flags & 1))
@ -1977,7 +1977,7 @@ xdnd_finished_filter (GdkXEvent *xev,
{
event->dnd.type = GDK_DROP_FINISHED;
event->dnd.context = context;
gdk_drag_context_ref (context);
g_object_ref (context);
return GDK_FILTER_TRANSLATE;
}
@ -2136,7 +2136,7 @@ xdnd_send_enter (GdkDragContext *context)
GDK_NOTE (DND,
g_message ("Send event to %lx failed",
GDK_DRAWABLE_XID (context->dest_window)));
gdk_window_unref (context->dest_window);
g_object_unref (context->dest_window);
context->dest_window = NULL;
}
}
@ -2168,7 +2168,7 @@ xdnd_send_leave (GdkDragContext *context)
GDK_NOTE (DND,
g_message ("Send event to %lx failed",
GDK_DRAWABLE_XID (context->dest_window)));
gdk_window_unref (context->dest_window);
g_object_unref (context->dest_window);
context->dest_window = NULL;
}
}
@ -2199,7 +2199,7 @@ xdnd_send_drop (GdkDragContext *context, guint32 time)
GDK_NOTE (DND,
g_message ("Send event to %lx failed",
GDK_DRAWABLE_XID (context->dest_window)));
gdk_window_unref (context->dest_window);
g_object_unref (context->dest_window);
context->dest_window = NULL;
}
}
@ -2234,7 +2234,7 @@ xdnd_send_motion (GdkDragContext *context,
GDK_NOTE (DND,
g_message ("Send event to %lx failed",
GDK_DRAWABLE_XID (context->dest_window)));
gdk_window_unref (context->dest_window);
g_object_unref (context->dest_window);
context->dest_window = NULL;
}
private->drag_status = GDK_DRAG_STATUS_MOTION_WAIT;
@ -2462,7 +2462,7 @@ xdnd_enter_filter (GdkXEvent *xev,
if (display_x11->current_dest_drag != NULL)
{
gdk_drag_context_unref (display_x11->current_dest_drag);
g_object_unref (display_x11->current_dest_drag);
display_x11->current_dest_drag = NULL;
}
@ -2472,18 +2472,18 @@ xdnd_enter_filter (GdkXEvent *xev,
new_context->source_window = gdk_window_lookup_for_display (display, source_window);
if (new_context->source_window)
gdk_window_ref (new_context->source_window);
g_object_ref (new_context->source_window);
else
{
new_context->source_window = gdk_window_foreign_new_for_display (display, source_window);
if (!new_context->source_window)
{
gdk_drag_context_unref (new_context);
g_object_unref (new_context);
return GDK_FILTER_REMOVE;
}
}
new_context->dest_window = event->any.window;
gdk_window_ref (new_context->dest_window);
g_object_ref (new_context->dest_window);
new_context->targets = NULL;
if (get_types)
@ -2498,7 +2498,7 @@ xdnd_enter_filter (GdkXEvent *xev,
if (gdk_error_trap_pop () || (format != 32) || (type != XA_ATOM))
{
gdk_drag_context_unref (new_context);
g_object_unref (new_context);
return GDK_FILTER_REMOVE;
}
@ -2530,7 +2530,7 @@ xdnd_enter_filter (GdkXEvent *xev,
event->dnd.type = GDK_DRAG_ENTER;
event->dnd.context = new_context;
gdk_drag_context_ref (new_context);
g_object_ref (new_context);
display_x11->current_dest_drag = new_context;
@ -2606,7 +2606,7 @@ xdnd_position_filter (GdkXEvent *xev,
{
event->dnd.type = GDK_DRAG_MOTION;
event->dnd.context = display_x11->current_dest_drag;
gdk_drag_context_ref (display_x11->current_dest_drag);
g_object_ref (display_x11->current_dest_drag);
event->dnd.time = time;
@ -2657,7 +2657,7 @@ xdnd_drop_filter (GdkXEvent *xev,
event->dnd.type = GDK_DROP_START;
event->dnd.context = display_x11->current_dest_drag;
gdk_drag_context_ref (display_x11->current_dest_drag);
g_object_ref (display_x11->current_dest_drag);
event->dnd.time = time;
event->dnd.x_root = private->last_x;
@ -2728,7 +2728,7 @@ gdk_drag_do_leave (GdkDragContext *context, guint32 time)
break;
}
gdk_window_unref (context->dest_window);
g_object_unref (context->dest_window);
context->dest_window = NULL;
}
}
@ -2744,7 +2744,7 @@ gdk_drag_begin (GdkWindow *window,
new_context = gdk_drag_context_new ();
new_context->is_source = TRUE;
new_context->source_window = window;
gdk_window_ref (window);
g_object_ref (window);
new_context->targets = g_list_copy (targets);
new_context->actions = 0;
@ -2888,7 +2888,7 @@ gdk_drag_find_window (GdkDragContext *context,
{
*dest_window = gdk_window_lookup_for_display (display, recipient);
if (*dest_window)
gdk_window_ref (*dest_window);
g_object_ref (*dest_window);
else
*dest_window = gdk_window_foreign_new_for_display (display, recipient);
}
@ -2899,7 +2899,7 @@ gdk_drag_find_window (GdkDragContext *context,
{
*dest_window = context->dest_window;
if (*dest_window)
gdk_window_ref (*dest_window);
g_object_ref (*dest_window);
*protocol = context->protocol;
}
}
@ -2943,7 +2943,7 @@ gdk_drag_motion (GdkDragContext *context,
{
context->dest_window = dest_window;
private->drop_xid = private->dest_xid;
gdk_window_ref (context->dest_window);
g_object_ref (context->dest_window);
context->protocol = protocol;
switch (protocol)
@ -3272,10 +3272,10 @@ gdk_window_register_dnd (GdkWindow *window)
g_return_if_fail (window != NULL);
if (GPOINTER_TO_INT (gdk_drawable_get_data (window, "gdk-dnd-registered")))
if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (window), "gdk-dnd-registered")))
return;
else
gdk_drawable_set_data (window, "gdk-dnd-registered", GINT_TO_POINTER(TRUE), NULL);
g_object_set_data (G_OBJECT (window), "gdk-dnd-registered", GINT_TO_POINTER (TRUE));
/* Set Motif drag receiver information property */

4
gdk/x11/gdkdrawable-x11.c
View File

@ -351,10 +351,10 @@ gdk_x11_set_colormap (GdkDrawable *drawable,
return;
if (impl->colormap)
gdk_colormap_unref (impl->colormap);
g_object_unref (impl->colormap);
impl->colormap = colormap;
if (impl->colormap)
gdk_colormap_ref (impl->colormap);
g_object_ref (impl->colormap);
}
/* Drawing

8
gdk/x11/gdkevents-x11.c
View File

@ -575,7 +575,7 @@ gdk_event_translate (GdkDisplay *display,
}
}
g_object_ref (G_OBJECT (window));
g_object_ref (window);
}
event->any.window = window;
@ -1649,11 +1649,11 @@ gdk_event_translate (GdkDisplay *display,
if (return_val)
{
if (event->any.window)
gdk_window_ref (event->any.window);
g_object_ref (event->any.window);
if (((event->any.type == GDK_ENTER_NOTIFY) ||
(event->any.type == GDK_LEAVE_NOTIFY)) &&
(event->crossing.subwindow != NULL))
gdk_window_ref (event->crossing.subwindow);
g_object_ref (event->crossing.subwindow);
}
else
{
@ -1663,7 +1663,7 @@ gdk_event_translate (GdkDisplay *display,
}
if (window)
gdk_window_unref (window);
g_object_unref (window);
return return_val;
}

2
gdk/x11/gdkfont-x11.c
View File

@ -309,7 +309,7 @@ gdk_font_from_description_for_display (GdkDisplay *display,
g_free (subfont_charsets);
g_free (charset);
g_object_unref (G_OBJECT (font));
g_object_unref (font);
}
return result;

4
gdk/x11/gdkgc-x11.c
View File

@ -716,10 +716,10 @@ gdk_gc_copy (GdkGC *dst_gc, GdkGC *src_gc)
dst_gc->ts_y_origin = src_gc->ts_y_origin;
if (src_gc->colormap)
g_object_ref (G_OBJECT (src_gc->colormap));
g_object_ref (src_gc->colormap);
if (dst_gc->colormap)
g_object_unref (G_OBJECT (dst_gc->colormap));
g_object_unref (dst_gc->colormap);
dst_gc->colormap = src_gc->colormap;

4
gdk/x11/gdkgeometry-x11.c
View File

@ -903,7 +903,7 @@ queue_delete_link (GQueue *queue,
static void
queue_item_free (GdkWindowQueueItem *item)
{
gdk_drawable_unref (item->window);
g_object_unref (item->window);
if (item->type == GDK_WINDOW_QUEUE_ANTIEXPOSE)
gdk_region_destroy (item->u.antiexpose.area);
@ -969,7 +969,7 @@ gdk_window_queue (GdkWindow *window,
}
}
gdk_drawable_ref (window);
g_object_ref (window);
item->window = window;
item->serial = NextRequest (GDK_WINDOW_XDISPLAY (window));

3
gdk/x11/gdkim-x11.c
View File

@ -86,7 +86,8 @@ _gdk_x11_initialize_locale (void)
result == 0x765)
{
if ((strlen (current_locale) < 4) ||
g_ascii_strcasecmp (current_locale + strlen(current_locale) - 4, "utf8"))
g_ascii_strcasecmp (current_locale + strlen(current_locale) - 4,
"utf8"))
gdk_use_mb = FALSE;
}
#endif /* X_LOCALE */

3
gdk/x11/gdkinput-x11.c
View File

@ -118,8 +118,7 @@ gdk_input_device_new (GdkDisplay *display,
could invite a very, very, long list... Lowercase name
for comparison purposes */
tmp_name = g_strdup (gdkdev->info.name);
g_strdown (tmp_name);
tmp_name = g_ascii_strdown (gdkdev->info.name, -1);
if (!strcmp (tmp_name, "pointer"))
gdkdev->info.source = GDK_SOURCE_MOUSE;

8
gdk/x11/gdkkeys-x11.c
View File

@ -343,9 +343,9 @@ get_direction (GdkKeymapX11 *keymap_x11)
{
name = gdk_x11_get_xatom_name_for_display (display, xkb->names->groups[state_rec.locked_group]);
if (g_strcasecmp (name, "arabic") == 0 ||
g_strcasecmp (name, "hebrew") == 0 ||
g_strcasecmp (name, "israelian") == 0)
if (g_ascii_strcasecmp (name, "arabic") == 0 ||
g_ascii_strcasecmp (name, "hebrew") == 0 ||
g_ascii_strcasecmp (name, "israelian") == 0)
result = PANGO_DIRECTION_RTL;
else
result = PANGO_DIRECTION_LTR;
@ -369,7 +369,7 @@ _gdk_keymap_state_changed (GdkDisplay *display)
{
keymap_x11->have_direction = TRUE;
keymap_x11->current_direction = new_direction;
g_signal_emit_by_name (G_OBJECT (keymap_x11), "direction_changed");
g_signal_emit_by_name (keymap_x11, "direction_changed");
}
}
}

4
gdk/x11/gdkscreen-x11.c
View File

@ -256,12 +256,12 @@ gdk_screen_x11_finalize (GObject *object)
{
GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (object);
/* int i; */
g_object_unref (G_OBJECT (screen_x11->root_window));
g_object_unref (screen_x11->root_window);
/* Visual Part (Need to implement finalize for Visuals for a clean
* finalize) */
/* for (i=0;i<screen_x11->nvisuals;i++)
g_object_unref (G_OBJECT (screen_x11->visuals[i]));*/
g_object_unref (screen_x11->visuals[i]);*/
g_free (screen_x11->visuals);
g_hash_table_destroy (screen_x11->visual_hash);
g_hash_table_destroy (screen_x11->colormap_hash);

31
gdk/x11/gdkwindow-x11.c
View File

@ -511,14 +511,14 @@ gdk_window_new (GdkWindow *parent,
if (attributes_mask & GDK_WA_COLORMAP)
{
draw_impl->colormap = attributes->colormap;
gdk_colormap_ref (attributes->colormap);
g_object_ref (attributes->colormap);
}
else
{
if ((((GdkVisualPrivate *)gdk_screen_get_system_visual (screen))->xvisual) == xvisual)
{
draw_impl->colormap = gdk_screen_get_system_colormap (screen);
gdk_colormap_ref (draw_impl->colormap);
g_object_ref (draw_impl->colormap);
}
else
{
@ -559,7 +559,7 @@ gdk_window_new (GdkWindow *parent,
class = InputOnly;
private->input_only = TRUE;
draw_impl->colormap = gdk_screen_get_system_colormap (screen);
gdk_colormap_ref (draw_impl->colormap);
g_object_ref (draw_impl->colormap);
}
xid = draw_impl->xid = XCreateWindow (xdisplay, xparent,
@ -568,7 +568,7 @@ gdk_window_new (GdkWindow *parent,
0, depth, class, xvisual,
xattributes_mask, &xattributes);
gdk_drawable_ref (window);
g_object_ref (window);
_gdk_xid_table_insert (screen_x11->display, &draw_impl->xid, window);
gdk_window_set_cursor (window, ((attributes_mask & GDK_WA_CURSOR) ?
@ -589,7 +589,7 @@ gdk_window_new (GdkWindow *parent,
case GDK_WINDOW_CHILD:
if ((attributes->wclass == GDK_INPUT_OUTPUT) &&
(draw_impl->colormap != gdk_screen_get_system_colormap (screen)) &&
(draw_impl->colormap != gdk_window_get_colormap (gdk_window_get_toplevel (window))))
(draw_impl->colormap != gdk_drawable_get_colormap (gdk_window_get_toplevel (window))))
{
GDK_NOTE (MISC, g_message ("adding colormap window\n"));
gdk_window_add_colormap_windows (window);
@ -767,7 +767,7 @@ gdk_window_foreign_new_for_display (GdkDisplay *display,
_gdk_window_init_position (GDK_WINDOW (private));
gdk_drawable_ref (window);
g_object_ref (window);
_gdk_xid_table_insert (display, &GDK_WINDOW_XID (window), window);
return window;
}
@ -893,7 +893,7 @@ gdk_window_destroy_notify (GdkWindow *window)
_gdk_xgrab_check_destroy (window);
gdk_drawable_unref (window);
g_object_unref (window);
}
static void
@ -2080,7 +2080,7 @@ gdk_window_set_background (GdkWindow *window,
if (private->bg_pixmap &&
private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
private->bg_pixmap != GDK_NO_BG)
gdk_pixmap_unref (private->bg_pixmap);
g_object_unref (private->bg_pixmap);
private->bg_pixmap = NULL;
}
@ -2125,7 +2125,7 @@ gdk_window_set_back_pixmap (GdkWindow *window,
if (private->bg_pixmap &&
private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
private->bg_pixmap != GDK_NO_BG)
gdk_pixmap_unref (private->bg_pixmap);
g_object_unref (private->bg_pixmap);
if (parent_relative)
{
@ -2136,7 +2136,7 @@ gdk_window_set_back_pixmap (GdkWindow *window,
{
if (pixmap)
{
gdk_pixmap_ref (pixmap);
g_object_ref (pixmap);
private->bg_pixmap = pixmap;
xpixmap = GDK_PIXMAP_XID (pixmap);
}
@ -4492,11 +4492,11 @@ emulate_resize_drag (GdkWindow *window,
mv_resize->resize_edge = edge;
mv_resize->moveresize_x = root_x;
mv_resize->moveresize_y = root_y;
mv_resize->moveresize_window = GDK_WINDOW (g_object_ref (G_OBJECT (window)));
mv_resize->moveresize_window = g_object_ref (window);
gdk_window_get_size (window,
&mv_resize->moveresize_orig_width,
&mv_resize->moveresize_orig_height);
gdk_drawable_get_size (window,
&mv_resize->moveresize_orig_width,
&mv_resize->moveresize_orig_height);
mv_resize->moveresize_geom_mask = 0;
gdk_window_get_geometry_hints (window,
@ -4520,8 +4520,7 @@ emulate_move_drag (GdkWindow *window,
mv_resize->moveresize_x = root_x;
mv_resize->moveresize_y = root_y;
mv_resize->moveresize_window =
GDK_WINDOW (g_object_ref (G_OBJECT (window)));
mv_resize->moveresize_window = g_object_ref (window);
gdk_window_get_deskrelative_origin (mv_resize->moveresize_window,
&mv_resize->moveresize_orig_x,