diff options
| author | Ted Gould <ted@gould.cx> | 2010-03-23 15:01:56 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-03-23 15:01:56 -0500 |
| commit | 69cdd18f4308cdaa19159c199a667d36c9f19bcf (patch) | |
| tree | 4943c89b17b77691ffdbb337d972794b59817ab0 /src/launcher-menu-item.c | |
| parent | c02292c7020477df40431dbbadfa30e79ed6a79a (diff) | |
| parent | bf2af66c70b116d0abd483b82b5a1e43a0dedd5f (diff) | |
| download | ayatana-indicator-messages-69cdd18f4308cdaa19159c199a667d36c9f19bcf.tar.gz ayatana-indicator-messages-69cdd18f4308cdaa19159c199a667d36c9f19bcf.tar.bz2 ayatana-indicator-messages-69cdd18f4308cdaa19159c199a667d36c9f19bcf.zip | |
updating to trunk
Diffstat (limited to 'src/launcher-menu-item.c')
| -rw-r--r-- | src/launcher-menu-item.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/launcher-menu-item.c b/src/launcher-menu-item.c index 07b0546..279d167 100644 --- a/src/launcher-menu-item.c +++ b/src/launcher-menu-item.c @@ -30,6 +30,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libindicator/indicator-desktop-shortcuts.h> #include "launcher-menu-item.h" #include "dbus-data.h" +#include "default-applications.h" enum { NAME_CHANGED, @@ -161,8 +162,20 @@ launcher_menu_item_new (const gchar * desktop_file) /* Set the appropriate values on this menu item based on the app info that we've parsed */ g_debug("\tName: %s", launcher_menu_item_get_name(self)); - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_LABEL, launcher_menu_item_get_name(self)); - gchar * iconstr = launcher_menu_item_get_icon(self); + + const gchar * default_name = get_default_name(desktop_file); + if (default_name == NULL) { + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_LABEL, launcher_menu_item_get_name(self)); + } else { + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_LABEL, _(default_name)); + } + + gchar * iconstr; + if (default_name == NULL) { + iconstr = launcher_menu_item_get_icon(self); + } else { + iconstr = g_strdup(get_default_icon(desktop_file)); + } dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_ICON_NAME, iconstr); g_free(iconstr); dbusmenu_menuitem_property_set_bool(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE); |