diff options
| author | Ted Gould <ted@gould.cx> | 2010-01-12 08:24:11 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-01-12 08:24:11 -0600 |
| commit | 52ec4d6e206ec94457230df4a814f02a46d9c086 (patch) | |
| tree | 885e10ba44d86a37b8bd892a3aaea6a0bf63a55f | |
| parent | f2ad57086a3e1438f65f3cd09a3f363731d4a953 (diff) | |
| parent | 7bf3514b8d35add72aa121e36917887e4cc3c756 (diff) | |
| download | libdbusmenu-52ec4d6e206ec94457230df4a814f02a46d9c086.tar.gz libdbusmenu-52ec4d6e206ec94457230df4a814f02a46d9c086.tar.bz2 libdbusmenu-52ec4d6e206ec94457230df4a814f02a46d9c086.zip | |
* Upstream update
* Not deleting images that we're still using.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-gtk/genericmenuitem.c | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index ea15e53..c202229 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.2.0-0ubuntu2~ppa3) UNRELEASED; urgency=low + + * Upstream update + * Not deleting images that we're still using. + + -- Ted Gould <ted@ubuntu.com> Tue, 12 Jan 2010 08:23:55 -0600 + libdbusmenu (0.2.0-0ubuntu2~ppa2) karmic; urgency=low * Upstream update diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c index 3264e1d..8f40d93 100644 --- a/libdbusmenu-gtk/genericmenuitem.c +++ b/libdbusmenu-gtk/genericmenuitem.c @@ -404,6 +404,9 @@ genericmenuitem_set_image (Genericmenuitem * menu_item, GtkWidget * image) } } + 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) { |