Commit 234e191c authored by Manish Singh's avatar Manish Singh Committed by Manish Singh

add -DG_DISABLE_DEPRECATED and -DGDK_PIXBUF_DISABLE_DEPRECATED to compile

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.
parent de4cf94b
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
......
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
......
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
......
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
......
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
......
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
......
......@@ -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 \
......
......@@ -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 *
......
......@@ -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);
}
}
......
......@@ -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);
}
......@@ -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:
......
......@@ -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);
}
}
......
......@@ -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;
}
......
......@@ -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);
}
......
......@@ -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)
......
......@@ -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;
}
......
......@@ -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);
......
......@@ -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);
}
/**
......
......@@ -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 *
......
......@@ -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);
}
......
......@@ -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 *
......
......@@ -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;
......
......@@ -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@ \