DBus Menu

Merge lp:~bratsche/libdbusmenu/dont-destroy-current-image into lp:libdbusmenu/0.5

  1. dont-destroy-current-image
  2. Merge into trunk
Proposed by Cody Russell
Status: Merged
Merged at revision: not available
Proposed branch: lp:~bratsche/libdbusmenu/dont-destroy-current-image
Merge into: lp:libdbusmenu/0.5
Diff against target: 13 lines (+3/-0)
1 file modified
libdbusmenu-gtk/genericmenuitem.c (+3/-0)
To merge this branch: bzr merge lp:~bratsche/libdbusmenu/dont-destroy-current-image
Reviewer Review Type Date Requested Status
DBus Menu Team Pending
Review via email: mp+17201@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cody Russell (bratsche) wrote :

Check if the image we're setting is the same one that's already there. If so, don't destroy it!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdbusmenu-gtk/genericmenuitem.c'
2--- libdbusmenu-gtk/genericmenuitem.c 2010-01-11 19:10:25 +0000
3+++ libdbusmenu-gtk/genericmenuitem.c 2010-01-12 06:22:11 +0000
4@@ -404,6 +404,9 @@
5 }
6 }
7
8+ if (image == (GtkWidget *)imagew)
9+ return;
10+
11 /* No we can see if we need to ethier replace and image or
12 just put ourselves into the structures */
13 if (imagew != NULL) {

Subscribers

People subscribed via source and target branches