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> Tue Sep 24 23:54:20 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: check if last_selected is valid before doing * 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> Tue Sep 24 23:54:20 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: check if last_selected is valid before doing * 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> Tue Sep 24 23:54:20 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: check if last_selected is valid before doing * 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> Tue Sep 24 23:54:20 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: check if last_selected is valid before doing * 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> Tue Sep 24 23:54:20 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: check if last_selected is valid before doing * 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> Tue Sep 24 23:54:20 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkfilesel.c: check if last_selected is valid before doing * gtk/gtkfilesel.c: check if last_selected is valid before doing
......
...@@ -17,6 +17,8 @@ common_includes = @STRIP_BEGIN@ \ ...@@ -17,6 +17,8 @@ common_includes = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk-pixbuf \ -I$(top_srcdir)/gdk-pixbuf \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \ @GTK_DEBUG_FLAGS@ \
@GDK_DEP_CFLAGS@ \ @GDK_DEP_CFLAGS@ \
-DGDK_COMPILATION \ -DGDK_COMPILATION \
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
GdkColormap* GdkColormap*
gdk_colormap_ref (GdkColormap *cmap) 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) ...@@ -53,7 +53,7 @@ gdk_colormap_ref (GdkColormap *cmap)
void void
gdk_colormap_unref (GdkColormap *cmap) gdk_colormap_unref (GdkColormap *cmap)
{ {
g_object_unref (G_OBJECT (cmap)); g_object_unref (cmap);
} }
GdkVisual * GdkVisual *
......
...@@ -145,7 +145,7 @@ gdk_display_close (GdkDisplay *display) ...@@ -145,7 +145,7 @@ gdk_display_close (GdkDisplay *display)
g_signal_emit (display, signals[CLOSED], 0, FALSE); g_signal_emit (display, signals[CLOSED], 0, FALSE);
g_object_run_dispose (G_OBJECT (display)); 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) ...@@ -291,7 +291,7 @@ gdk_drawable_get_colormap (GdkDrawable *drawable)
GdkDrawable* GdkDrawable*
gdk_drawable_ref (GdkDrawable *drawable) 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) ...@@ -306,7 +306,7 @@ gdk_drawable_unref (GdkDrawable *drawable)
{ {
g_return_if_fail (GDK_IS_DRAWABLE (drawable)); g_return_if_fail (GDK_IS_DRAWABLE (drawable));
g_object_unref (G_OBJECT (drawable)); g_object_unref (drawable);
} }
/* Drawing /* Drawing
...@@ -556,7 +556,7 @@ gdk_draw_drawable (GdkDrawable *drawable, ...@@ -556,7 +556,7 @@ gdk_draw_drawable (GdkDrawable *drawable,
xdest, ydest, xdest, ydest,
width, height); width, height);
g_object_unref (G_OBJECT (composite)); g_object_unref (composite);
} }
void void
...@@ -783,7 +783,7 @@ _gdk_drawable_copy_to_image (GdkDrawable *drawable, ...@@ -783,7 +783,7 @@ _gdk_drawable_copy_to_image (GdkDrawable *drawable,
dest_x, dest_y, dest_x, dest_y,
width, height); width, height);
g_object_unref (G_OBJECT (composite)); g_object_unref (composite);
if (!image && retval) if (!image && retval)
{ {
...@@ -874,7 +874,7 @@ gdk_drawable_get_image (GdkDrawable *drawable, ...@@ -874,7 +874,7 @@ gdk_drawable_get_image (GdkDrawable *drawable,
y - composite_y_offset, y - composite_y_offset,
width, height); width, height);
g_object_unref (G_OBJECT (composite)); g_object_unref (composite);
cmap = gdk_drawable_get_colormap (drawable); cmap = gdk_drawable_get_colormap (drawable);
...@@ -908,7 +908,7 @@ gdk_drawable_real_get_composite_drawable (GdkDrawable *drawable, ...@@ -908,7 +908,7 @@ gdk_drawable_real_get_composite_drawable (GdkDrawable *drawable,
*composite_x_offset = 0; *composite_x_offset = 0;
*composite_y_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, ...@@ -1355,8 +1355,8 @@ gdk_drawable_real_draw_pixbuf (GdkDrawable *drawable,
out: out:
if (composited) if (composited)
g_object_unref (G_OBJECT (composited)); g_object_unref (composited);
if (free_gc) if (free_gc)
gdk_gc_unref (gc); g_object_unref (gc);
} }
...@@ -295,7 +295,7 @@ gdk_event_copy (GdkEvent *event) ...@@ -295,7 +295,7 @@ gdk_event_copy (GdkEvent *event)
*new_event = *event; *new_event = *event;
if (new_event->any.window) if (new_event->any.window)
gdk_window_ref (new_event->any.window); g_object_ref (new_event->any.window);
switch (event->any.type) switch (event->any.type)
{ {
...@@ -307,7 +307,7 @@ gdk_event_copy (GdkEvent *event) ...@@ -307,7 +307,7 @@ gdk_event_copy (GdkEvent *event)
case GDK_ENTER_NOTIFY: case GDK_ENTER_NOTIFY:
case GDK_LEAVE_NOTIFY: case GDK_LEAVE_NOTIFY:
if (event->crossing.subwindow != NULL) if (event->crossing.subwindow != NULL)
gdk_window_ref (event->crossing.subwindow); g_object_ref (event->crossing.subwindow);
break; break;
case GDK_DRAG_ENTER: case GDK_DRAG_ENTER:
...@@ -316,7 +316,7 @@ gdk_event_copy (GdkEvent *event) ...@@ -316,7 +316,7 @@ gdk_event_copy (GdkEvent *event)
case GDK_DRAG_STATUS: case GDK_DRAG_STATUS:
case GDK_DROP_START: case GDK_DROP_START:
case GDK_DROP_FINISHED: case GDK_DROP_FINISHED:
gdk_drag_context_ref (event->dnd.context); g_object_ref (event->dnd.context);
break; break;
case GDK_EXPOSE: case GDK_EXPOSE:
...@@ -352,7 +352,7 @@ gdk_event_free (GdkEvent *event) ...@@ -352,7 +352,7 @@ gdk_event_free (GdkEvent *event)
g_assert (event_chunk != NULL); /* paranoid */ g_assert (event_chunk != NULL); /* paranoid */
if (event->any.window) if (event->any.window)
gdk_window_unref (event->any.window); g_object_unref (event->any.window);
switch (event->any.type) switch (event->any.type)
{ {
...@@ -364,7 +364,7 @@ gdk_event_free (GdkEvent *event) ...@@ -364,7 +364,7 @@ gdk_event_free (GdkEvent *event)
case GDK_ENTER_NOTIFY: case GDK_ENTER_NOTIFY:
case GDK_LEAVE_NOTIFY: case GDK_LEAVE_NOTIFY:
if (event->crossing.subwindow != NULL) if (event->crossing.subwindow != NULL)
gdk_window_unref (event->crossing.subwindow); g_object_unref (event->crossing.subwindow);
break; break;
case GDK_DRAG_ENTER: case GDK_DRAG_ENTER:
...@@ -373,7 +373,7 @@ gdk_event_free (GdkEvent *event) ...@@ -373,7 +373,7 @@ gdk_event_free (GdkEvent *event)
case GDK_DRAG_STATUS: case GDK_DRAG_STATUS:
case GDK_DROP_START: case GDK_DROP_START:
case GDK_DROP_FINISHED: case GDK_DROP_FINISHED:
gdk_drag_context_unref (event->dnd.context); g_object_unref (event->dnd.context);
break; break;
case GDK_BUTTON_PRESS: case GDK_BUTTON_PRESS:
......
...@@ -112,7 +112,7 @@ gdk_gc_new_with_values (GdkDrawable *drawable, ...@@ -112,7 +112,7 @@ gdk_gc_new_with_values (GdkDrawable *drawable,
{ {
gc->colormap = gdk_drawable_get_colormap (drawable); gc->colormap = gdk_drawable_get_colormap (drawable);
if (gc->colormap) if (gc->colormap)
g_object_ref (G_OBJECT (gc->colormap)); g_object_ref (gc->colormap);
} }
return gc; return gc;
...@@ -124,7 +124,7 @@ gdk_gc_finalize (GObject *object) ...@@ -124,7 +124,7 @@ gdk_gc_finalize (GObject *object)
GdkGC *gc = GDK_GC (object); GdkGC *gc = GDK_GC (object);
if (gc->colormap) if (gc->colormap)
g_object_unref (G_OBJECT (gc->colormap)); g_object_unref (gc->colormap);
parent_class->finalize (object); parent_class->finalize (object);
} }
...@@ -140,7 +140,7 @@ gdk_gc_finalize (GObject *object) ...@@ -140,7 +140,7 @@ gdk_gc_finalize (GObject *object)
GdkGC * GdkGC *
gdk_gc_ref (GdkGC *gc) 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) ...@@ -152,7 +152,7 @@ gdk_gc_ref (GdkGC *gc)
void void
gdk_gc_unref (GdkGC *gc) gdk_gc_unref (GdkGC *gc)
{ {
g_object_unref (G_OBJECT (gc)); g_object_unref (gc);
} }
void void
...@@ -439,10 +439,10 @@ gdk_gc_set_colormap (GdkGC *gc, ...@@ -439,10 +439,10 @@ gdk_gc_set_colormap (GdkGC *gc,
if (gc->colormap != colormap) if (gc->colormap != colormap)
{ {
if (gc->colormap) if (gc->colormap)
g_object_unref (G_OBJECT (gc->colormap)); g_object_unref (gc->colormap);
gc->colormap = colormap; gc->colormap = colormap;
g_object_ref (G_OBJECT (gc->colormap)); g_object_ref (gc->colormap);
} }
} }
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
GdkImage * GdkImage *
gdk_image_ref (GdkImage *image) 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) ...@@ -58,7 +58,7 @@ gdk_image_unref (GdkImage *image)
{ {
g_return_if_fail (GDK_IS_IMAGE (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, ...@@ -113,10 +113,10 @@ gdk_image_set_colormap (GdkImage *image,
if (image->colormap != colormap) if (image->colormap != colormap)
{ {
if (image->colormap) if (image->colormap)
g_object_unref (G_OBJECT (image->colormap)); g_object_unref (image->colormap);
image->colormap = 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, ...@@ -215,7 +215,7 @@ allocate_scratch_images (GdkScratchImageInfo *info,
gint j; gint j;
for (j = 0; j < i; j++) for (j = 0; j < i; j++)
gdk_image_unref (info->static_image[i]); g_object_unref (info->static_image[i]);
return FALSE; return FALSE;
} }
......
...@@ -54,7 +54,7 @@ static void ...@@ -54,7 +54,7 @@ static void
gdk_pango_context_destroy (GdkPangoContextInfo *info) gdk_pango_context_destroy (GdkPangoContextInfo *info)
{ {
if (info->colormap) if (info->colormap)
gdk_colormap_unref (info->colormap); g_object_unref (info->colormap);
g_free (info); g_free (info);
} }
...@@ -125,7 +125,7 @@ static void ...@@ -125,7 +125,7 @@ static void
gdk_pango_free_gc (PangoContext *context, gdk_pango_free_gc (PangoContext *context,
GdkGC *gc) GdkGC *gc)
{ {
gdk_gc_unref (gc); g_object_unref (gc);
} }
/** /**
...@@ -154,12 +154,12 @@ gdk_pango_context_set_colormap (PangoContext *context, ...@@ -154,12 +154,12 @@ gdk_pango_context_set_colormap (PangoContext *context,
if (info->colormap != colormap) if (info->colormap != colormap)
{ {
if (info->colormap) if (info->colormap)
gdk_colormap_unref (info->colormap); g_object_unref (info->colormap);
info->colormap = colormap; info->colormap = colormap;
if (info->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) ...@@ -570,7 +570,7 @@ gdk_pango_attr_stipple_destroy (PangoAttribute *attr)
GdkPangoAttrStipple *st = (GdkPangoAttrStipple*) attr; GdkPangoAttrStipple *st = (GdkPangoAttrStipple*) attr;
if (st->stipple) if (st->stipple)
g_object_unref (G_OBJECT (st->stipple)); g_object_unref (st->stipple);
g_free (attr); g_free (attr);
} }
......
...@@ -89,7 +89,7 @@ gdk_pixbuf_render_threshold_alpha (GdkPixbuf *pixbuf, ...@@ -89,7 +89,7 @@ gdk_pixbuf_render_threshold_alpha (GdkPixbuf *pixbuf,
color.pixel = (alpha_threshold == 255) ? 0 : 1; color.pixel = (alpha_threshold == 255) ? 0 : 1;
gdk_gc_set_foreground (gc, &color); gdk_gc_set_foreground (gc, &color);
gdk_draw_rectangle (bitmap, gc, TRUE, dest_x, dest_y, width, height); gdk_draw_rectangle (bitmap, gc, TRUE, dest_x, dest_y, width, height);
gdk_gc_unref (gc); g_object_unref (gc);
return; return;
} }
...@@ -132,7 +132,7 @@ gdk_pixbuf_render_threshold_alpha (GdkPixbuf *pixbuf, ...@@ -132,7 +132,7 @@ gdk_pixbuf_render_threshold_alpha (GdkPixbuf *pixbuf,
x - 1 + dest_x, y + dest_y); 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, ...@@ -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_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf),
GDK_RGB_DITHER_NORMAL, GDK_RGB_DITHER_NORMAL,
0, 0); 0, 0);
gdk_gc_unref (gc); g_object_unref (gc);
} }
if (mask_return) if (mask_return)
......
...@@ -215,7 +215,7 @@ gdk_pixmap_finalize (GObject *object) ...@@ -215,7 +215,7 @@ gdk_pixmap_finalize (GObject *object)
{ {
GdkPixmapObject *obj = (GdkPixmapObject *) object; GdkPixmapObject *obj = (GdkPixmapObject *) object;
g_object_unref (G_OBJECT (obj->impl)); g_object_unref (obj->impl);
obj->impl = NULL; obj->impl = NULL;
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
...@@ -491,7 +491,7 @@ make_solid_mask (GdkScreen *screen, gint width, gint height) ...@@ -491,7 +491,7 @@ make_solid_mask (GdkScreen *screen, gint width, gint height)
gdk_draw_rectangle (bitmap, gc, TRUE, 0, 0, width, height); gdk_draw_rectangle (bitmap, gc, TRUE, 0, 0, width, height);
gdk_gc_unref (gc); g_object_unref (gc);
return bitmap; return bitmap;