[dia] Don't use deprecated function gdk_bitmap_unref().



commit 650eab86920389fa7f8ee96f7ccf92c3bd99bf40
Author: Adam Buchbinder <adam buchbinder gmail com>
Date:   Mon May 4 11:21:37 2009 -0400

    Don't use deprecated function gdk_bitmap_unref().
    
    Replaced gdk_bitmap_unref() with g_object_unref():
    http://library.gnome.org/devel/gdk/stable/gdk-Bitmaps-and-Pixmaps.html#gdk-bitmap-unref
    
    Signed-off-by: Adam Buchbinder <adam buchbinder gmail com>
    Signed-off-by: Hans Breuer <hans breuer org>
---
 app/cursor.c        |    4 ++--
 app/diapagelayout.c |    4 ++--
 app/interface.c     |    4 ++--
 app/splash.c        |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/cursor.c b/app/cursor.c
index ac60f03..86ffa90 100644
--- a/app/cursor.c
+++ b/app/cursor.c
@@ -121,8 +121,8 @@ create_cursor(GdkWindow *window,
   cursor = gdk_cursor_new_from_pixmap(dbit, mbit, &white, &black, hot_x,hot_y);
   g_assert(cursor != NULL);
 
-  gdk_bitmap_unref(dbit);
-  gdk_bitmap_unref(mbit);
+  g_object_unref(dbit);
+  g_object_unref(mbit);
 
   return cursor;
 }
diff --git a/app/diapagelayout.c b/app/diapagelayout.c
index af217f8..a9c9a3a 100644
--- a/app/diapagelayout.c
+++ b/app/diapagelayout.c
@@ -199,7 +199,7 @@ dia_page_layout_init(DiaPageLayout *self)
 		portrait_xpm);
   wid = gtk_pixmap_new(pix, mask);
   g_object_unref(pix);
-  gdk_bitmap_unref(mask);
+  g_object_unref(mask);
   gtk_container_add(GTK_CONTAINER(self->orient_portrait), wid);
   gtk_widget_show(wid);
 
@@ -213,7 +213,7 @@ dia_page_layout_init(DiaPageLayout *self)
 		landscape_xpm);
   wid = gtk_pixmap_new(pix, mask);
   g_object_unref(pix);
-  gdk_bitmap_unref(mask);
+  g_object_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 e9ff6ba..002ba88 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -1169,7 +1169,7 @@ create_tools(GtkWidget *parent)
 			     pixmap, mask);
 
     if (pixmap) g_object_unref(pixmap);
-    if (mask) gdk_bitmap_unref(mask);
+    if (mask) g_object_unref(mask);
 
     tool_data[i].callback_data.widget = button;
 
@@ -1286,7 +1286,7 @@ fill_sheet_wbox(Sheet *sheet)
     if (pixmap) {
       pixmapwidget = gtk_pixmap_new(pixmap, mask);
       g_object_unref(pixmap);
-      if (mask) gdk_bitmap_unref(mask);
+      if (mask) g_object_unref(mask);
     } else {
       pixmapwidget = gtk_type_new(gtk_pixmap_get_type());
     }
diff --git a/app/splash.c b/app/splash.c
index 8b3e1fe..e0c6a1f 100644
--- a/app/splash.c
+++ b/app/splash.c
@@ -27,7 +27,7 @@ get_logo_pixmap (void)
     gdk_pixbuf_render_pixmap_and_mask(logo, &pixmap, &bitmap, 128);
     gpixmap = gtk_pixmap_new(pixmap, bitmap);
     g_object_unref(pixmap);
-    if (bitmap) gdk_bitmap_unref(bitmap);
+    if (bitmap) g_object_unref(bitmap);
     g_object_unref (logo);
   }
   return gpixmap;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]