[dia] Don't use deprecated function gdk_pixmap_unref().
- From: Hans Breuer <hans src gnome org>
- To: svn-commits-list gnome org
- Subject: [dia] Don't use deprecated function gdk_pixmap_unref().
- Date: Sun, 24 May 2009 07:18:44 -0400 (EDT)
commit 60b818ac8749c2a4a64f134679d967b4d86e30fc
Author: Adam Buchbinder <adam buchbinder gmail com>
Date: Mon May 4 11:17:29 2009 -0400
Don't use deprecated function gdk_pixmap_unref().
Replaced gdk_pixmap_unref() with g_object_unref():
http://library.gnome.org/devel/gdk/stable/gdk-Bitmaps-and-Pixmaps.html#gdk-pixmap-unref
Signed-off-by: Adam Buchbinder <adam buchbinder gmail com>
Signed-off-by: Hans Breuer <hans breuer org>
---
app/diapagelayout.c | 4 ++--
app/interface.c | 4 ++--
app/splash.c | 2 +-
lib/diagdkrenderer.c | 2 +-
lib/render_pixmap.c | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/diapagelayout.c b/app/diapagelayout.c
index fe06e90..af217f8 100644
--- a/app/diapagelayout.c
+++ b/app/diapagelayout.c
@@ -198,7 +198,7 @@ dia_page_layout_init(DiaPageLayout *self)
gtk_widget_get_colormap(GTK_WIDGET(self)), &mask, NULL,
portrait_xpm);
wid = gtk_pixmap_new(pix, mask);
- gdk_pixmap_unref(pix);
+ g_object_unref(pix);
gdk_bitmap_unref(mask);
gtk_container_add(GTK_CONTAINER(self->orient_portrait), wid);
gtk_widget_show(wid);
@@ -212,7 +212,7 @@ dia_page_layout_init(DiaPageLayout *self)
gtk_widget_get_colormap(GTK_WIDGET(self)), &mask, NULL,
landscape_xpm);
wid = gtk_pixmap_new(pix, mask);
- gdk_pixmap_unref(pix);
+ g_object_unref(pix);
gdk_bitmap_unref(mask);
gtk_container_add(GTK_CONTAINER(self->orient_landscape), wid);
gtk_widget_show(wid);
diff --git a/app/interface.c b/app/interface.c
index dc0bb63..e9ff6ba 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -1168,7 +1168,7 @@ create_tools(GtkWidget *parent)
tool_setup_drag_source(button, &tool_data[i].callback_data,
pixmap, mask);
- if (pixmap) gdk_pixmap_unref(pixmap);
+ if (pixmap) g_object_unref(pixmap);
if (mask) gdk_bitmap_unref(mask);
tool_data[i].callback_data.widget = button;
@@ -1285,7 +1285,7 @@ fill_sheet_wbox(Sheet *sheet)
}
if (pixmap) {
pixmapwidget = gtk_pixmap_new(pixmap, mask);
- gdk_pixmap_unref(pixmap);
+ g_object_unref(pixmap);
if (mask) gdk_bitmap_unref(mask);
} else {
pixmapwidget = gtk_type_new(gtk_pixmap_get_type());
diff --git a/app/splash.c b/app/splash.c
index 72ed01e..8b3e1fe 100644
--- a/app/splash.c
+++ b/app/splash.c
@@ -26,7 +26,7 @@ get_logo_pixmap (void)
gdk_pixbuf_render_pixmap_and_mask(logo, &pixmap, &bitmap, 128);
gpixmap = gtk_pixmap_new(pixmap, bitmap);
- gdk_pixmap_unref(pixmap);
+ g_object_unref(pixmap);
if (bitmap) gdk_bitmap_unref(bitmap);
g_object_unref (logo);
}
diff --git a/lib/diagdkrenderer.c b/lib/diagdkrenderer.c
index 64ff4df..7b1fef6 100644
--- a/lib/diagdkrenderer.c
+++ b/lib/diagdkrenderer.c
@@ -188,7 +188,7 @@ renderer_finalize(GObject *object)
DiaGdkRenderer *renderer = DIA_GDK_RENDERER (object);
if (renderer->pixmap != NULL)
- gdk_pixmap_unref(renderer->pixmap);
+ g_object_unref(renderer->pixmap);
if (renderer->gc != NULL)
gdk_gc_unref(renderer->gc);
diff --git a/lib/render_pixmap.c b/lib/render_pixmap.c
index c13261f..665cdbf 100644
--- a/lib/render_pixmap.c
+++ b/lib/render_pixmap.c
@@ -75,7 +75,7 @@ renderer_pixmap_set_pixmap (DiaRenderer *ren,
DiaGdkRenderer *renderer = DIA_GDK_RENDERER (ren);
if (renderer->pixmap != NULL)
- gdk_pixmap_unref(renderer->pixmap);
+ g_object_unref(renderer->pixmap);
if (renderer->gc != NULL)
gdk_gc_unref(renderer->gc);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]