← Back to team overview

ayatana-commits team mailing list archive

[Merge] lp:~bratsche/dbusmenu/dont-destroy-current-image into lp:dbusmenu

 

Cody Russell has proposed merging lp:~bratsche/dbusmenu/dont-destroy-current-image into lp:dbusmenu.

    Requested reviews:
    DBus Menu Team (dbusmenu-team)


Check if the image we're setting is the same one that's already there.  If so, don't destroy it!
-- 
https://code.launchpad.net/~bratsche/dbusmenu/dont-destroy-current-image/+merge/17201
Your team ayatana-commits is subscribed to branch lp:dbusmenu.
=== modified file 'libdbusmenu-gtk/genericmenuitem.c'
--- libdbusmenu-gtk/genericmenuitem.c	2010-01-11 19:10:25 +0000
+++ libdbusmenu-gtk/genericmenuitem.c	2010-01-12 06:22:11 +0000
@@ -404,6 +404,9 @@
 		}
 	}
 
+        if (image == (GtkWidget *)imagew)
+          return;
+
 	/* No we can see if we need to ethier replace and image or
 	   just put ourselves into the structures */
 	if (imagew != NULL) {


Follow ups