Merge authors:
Cody Russell (bratsche)
Related merge proposals:
https://code.launchpad.net/~bratsche/dbusmenu/dont-destroy-current-image/+merge/17201
proposed by: Cody Russell (bratsche)
------------------------------------------------------------
revno: 52 [merge]
author: Cody Russell <[email protected]>
committer: Ted Gould <[email protected]>
branch nick: trunk
timestamp: Tue 2010-01-12 08:22:44 -0600
message:
Fix to not destroy the image if we're still using it.
modified:
libdbusmenu-gtk/genericmenuitem.c
--
lp:dbusmenu
https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk
Your team ayatana-commits is subscribed to branch lp:dbusmenu.
To unsubscribe from this branch go to
https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk/+edit-subscription.
=== 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:19:14 +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) {
_______________________________________________
Mailing list: https://launchpad.net/~ayatana-commits
Post to : [email protected]
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
