diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2012-03-20 16:41:42 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2012-03-20 16:41:42 -0400 |
| commit | 2ac0106d8114b81b86bfaeabf8746375425563a2 (patch) | |
| tree | cbca4ffcf3bea98adff7a7293dd9f0f18aa96fb6 | |
| parent | 7a8f356fd09cf213f7ce85cb42b8b64e5f84535f (diff) | |
| download | ayatana-indicator-messages-2ac0106d8114b81b86bfaeabf8746375425563a2.tar.gz ayatana-indicator-messages-2ac0106d8114b81b86bfaeabf8746375425563a2.tar.bz2 ayatana-indicator-messages-2ac0106d8114b81b86bfaeabf8746375425563a2.zip | |
releasing version 0.5.93-0ubuntu2
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/im-menu-item.c | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 2c6f909..4426e3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-messages (0.5.93-0ubuntu2) precise; urgency=low + + * src/im-menu-item.c + - cherry picked fix for missing icons in the messaging menu (LP: #960553) + + -- Ken VanDine <ken.vandine@canonical.com> Tue, 20 Mar 2012 16:41:13 -0400 + indicator-messages (0.5.93-0ubuntu1) precise; urgency=low * debian/control: diff --git a/src/im-menu-item.c b/src/im-menu-item.c index f07fff9..7466d3e 100644 --- a/src/im-menu-item.c +++ b/src/im-menu-item.c @@ -175,7 +175,11 @@ im_menu_item_finalize (GObject *object) static void icon_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, const gchar * propertydata, gpointer data) { - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(data), INDICATOR_MENUITEM_PROP_ICON, propertydata); + gsize len; + guchar *icon; + icon = g_base64_decode (propertydata, &len); + dbusmenu_menuitem_property_set_byte_array(DBUSMENU_MENUITEM(data), INDICATOR_MENUITEM_PROP_ICON, icon, len); + g_free (icon); return; } |