[patch] 84.patch

84.patch (text/plain), 966 bytes, created by Wojciech Myrda on 2014-09-20 11:14:09 UTC

=== modified file 'src/toolbar.c'
--- src/toolbar.c	2010-12-13 12:45:43 +0000
+++ src/toolbar.c	2014-04-19 08:13:46 +0000
@@ -497,17 +497,15 @@
 static GtkWidget * 
 get_gtk_image ( GtkWidget *widget, gchar** xpm )
 {
-	GdkPixmap *gdkpixmap	= NULL;
-    GdkBitmap *mask 		= NULL;
-    GtkWidget *gtkimage 	= NULL;
-	gdkpixmap = gdk_pixmap_create_from_xpm_d(widget->window, &mask, NULL, xpm);
-	g_assert ( gdkpixmap );
-	gtkimage = gtk_image_new_from_pixmap(gdkpixmap, mask);
+    GdkPixbuf *gdkpixbuf    = NULL;
+    GtkWidget *gtkimage     = NULL;
+    gdkpixbuf = gdk_pixbuf_new_from_xpm_data(xpm);
+    g_assert ( gdkpixbuf );
+    gtkimage = gtk_image_new_from_pixbuf ( gdkpixbuf );
     g_assert ( gtkimage );
-	g_object_unref ( G_OBJECT(gdkpixmap) );
-    g_object_unref ( G_OBJECT(mask) ); 
-	gtk_widget_show(gtkimage);
-	return gtkimage;
+    g_object_unref ( (gpointer) gdkpixbuf );
+    gtk_widget_show(gtkimage);
+    return gtkimage;
 }
 
 static void