diff options
| author | Ted Gould <ted@gould.cx> | 2010-03-24 10:04:52 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-03-24 10:04:52 -0500 |
| commit | 73a65b342dcb6a1608d1718ad395fc7a194e380c (patch) | |
| tree | 0fba5831ca24341f44a706e2f18fb6aba0874728 /src/app-menu-item.c | |
| parent | 6564d7dd105b7ce13dc3d33039206be19ecc2078 (diff) | |
| parent | a2598f3380d9f84c21a29c5fa48d94dfebadd922 (diff) | |
| download | ayatana-indicator-messages-73a65b342dcb6a1608d1718ad395fc7a194e380c.tar.gz ayatana-indicator-messages-73a65b342dcb6a1608d1718ad395fc7a194e380c.tar.bz2 ayatana-indicator-messages-73a65b342dcb6a1608d1718ad395fc7a194e380c.zip | |
* Upstream merge
* Show which applications are running with a small icon
next to their entry.
Diffstat (limited to 'src/app-menu-item.c')
| -rw-r--r-- | src/app-menu-item.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/app-menu-item.c b/src/app-menu-item.c index 7db72bf..a47c073 100644 --- a/src/app-menu-item.c +++ b/src/app-menu-item.c @@ -210,6 +210,8 @@ app_menu_item_new (IndicateListener * listener, IndicateListenerServer * server) /* Can not ref as not real GObject */ priv->server = server; + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, APPLICATION_MENUITEM_TYPE); + /* Set up listener signals */ g_signal_connect(G_OBJECT(listener), INDICATE_LISTENER_SIGNAL_SERVER_COUNT_CHANGED, G_CALLBACK(count_changed), self); @@ -244,10 +246,10 @@ update_label (AppMenuItem * self) /* TRANSLATORS: This is the name of the program and the number of indicators. So it would read something like "Mail Client (5)" */ gchar * label = g_strdup_printf(_("%s (%d)"), _(name), priv->unreadcount); - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_LABEL, label); + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), APPLICATION_MENUITEM_PROP_NAME, label); g_free(label); } else { - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_LABEL, _(name)); + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), APPLICATION_MENUITEM_PROP_NAME, _(name)); } return; @@ -318,10 +320,10 @@ desktop_cb (IndicateListener * listener, IndicateListenerServer * server, gchar 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); + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), APPLICATION_MENUITEM_PROP_ICON, iconstr); g_free(iconstr); } else { - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_ICON_NAME, def_icon); + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), APPLICATION_MENUITEM_PROP_ICON, def_icon); } g_signal_emit(G_OBJECT(self), signals[NAME_CHANGED], 0, app_menu_item_get_name(self), TRUE); |