diff options
| author | Ted Gould <ted@gould.cx> | 2010-03-04 14:41:48 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-03-04 14:41:48 -0600 |
| commit | ace1ea5b32a539c2afe0feacd47033c3a7d1098b (patch) | |
| tree | 4a0974ac812556add397a6f42bd980c945b7242a | |
| parent | 2a150efd56a7ed9c64614cb4bc6295ec29faa6bd (diff) | |
| download | ayatana-indicator-messages-ace1ea5b32a539c2afe0feacd47033c3a7d1098b.tar.gz ayatana-indicator-messages-ace1ea5b32a539c2afe0feacd47033c3a7d1098b.tar.bz2 ayatana-indicator-messages-ace1ea5b32a539c2afe0feacd47033c3a7d1098b.zip | |
Using the default icon in the application indicator as well.
| -rw-r--r-- | src/app-menu-item.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/app-menu-item.c b/src/app-menu-item.c index f792128..7db72bf 100644 --- a/src/app-menu-item.c +++ b/src/app-menu-item.c @@ -314,10 +314,15 @@ desktop_cb (IndicateListener * listener, IndicateListenerServer * server, gchar update_label(self); - GIcon * icon = g_app_info_get_icon(priv->appinfo); - gchar * iconstr = g_icon_to_string(icon); - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_ICON_NAME, iconstr); - g_free(iconstr); + const gchar * def_icon = get_default_icon(priv->desktop); + if (def_icon == NULL) { + GIcon * icon = g_app_info_get_icon(priv->appinfo); + gchar * iconstr = g_icon_to_string(icon); + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_ICON_NAME, iconstr); + g_free(iconstr); + } else { + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_ICON_NAME, def_icon); + } g_signal_emit(G_OBJECT(self), signals[NAME_CHANGED], 0, app_menu_item_get_name(self), TRUE); |