From d7bba03dd7712cf2a5c60c4e99967525fbaab778 Mon Sep 17 00:00:00 2001 From: Pete Woods Date: Tue, 20 Aug 2013 11:25:22 +0100 Subject: Thunderbird e-mail notifications work again (forward ported fix from r344) --- src/im-desktop-menu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/im-desktop-menu.c') diff --git a/src/im-desktop-menu.c b/src/im-desktop-menu.c index 1040d62..ac480e1 100644 --- a/src/im-desktop-menu.c +++ b/src/im-desktop-menu.c @@ -114,7 +114,8 @@ im_desktop_menu_source_added (ImApplicationList *applist, g_return_if_fail (source_section != NULL); action = g_strconcat ("src.", source_id, NULL); - item = g_menu_item_new (label, action); + item = g_menu_item_new (label, NULL); + g_menu_item_set_action_and_target_value(item, action, NULL); g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.messages.source"); if (icon && *icon) g_menu_item_set_attribute (item, "icon", "s", icon); -- cgit v1.2.3 From 9f67d20d20f68e9512908c3f24ed79d85f120358 Mon Sep 17 00:00:00 2001 From: Pete Woods Date: Tue, 20 Aug 2013 12:57:16 +0100 Subject: "Clear" and "Clear All" now translatable --- src/im-desktop-menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/im-desktop-menu.c') diff --git a/src/im-desktop-menu.c b/src/im-desktop-menu.c index ac480e1..e68d086 100644 --- a/src/im-desktop-menu.c +++ b/src/im-desktop-menu.c @@ -228,7 +228,7 @@ im_desktop_menu_constructed (GObject *object) GMenu *clear_section; clear_section = g_menu_new (); - g_menu_append (clear_section, "Clear", "indicator.remove-all"); + g_menu_append (clear_section, _("Clear"), "indicator.remove-all"); im_menu_append_section (IM_MENU (menu), G_MENU_MODEL (clear_section)); g_object_unref (clear_section); -- cgit v1.2.3 From 3f6abe759b6976d606f97b894c02b68e1c0d9254 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 20 Aug 2013 16:16:34 -0500 Subject: Putting shortcuts into the menu --- src/im-desktop-menu.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'src/im-desktop-menu.c') diff --git a/src/im-desktop-menu.c b/src/im-desktop-menu.c index e68d086..3309dad 100644 --- a/src/im-desktop-menu.c +++ b/src/im-desktop-menu.c @@ -18,6 +18,7 @@ */ #include "im-desktop-menu.h" +#include "indicator-desktop-shortcuts.h" #include typedef ImMenuClass ImDesktopMenuClass; @@ -66,21 +67,28 @@ im_desktop_menu_app_added (ImApplicationList *applist, } /* application actions */ -#if 0 { - const gchar *const *actions; + const gchar * filename = NULL; + IndicatorDesktopShortcuts * shortcuts = NULL; + const gchar ** nicks = {NULL}; - for (actions = g_desktop_app_info_list_actions (app_info); *actions; actions++) - { - gchar *label; + filename = g_desktop_app_info_get_filename(app_info); + if (filename != NULL) + shortcuts = indicator_desktop_shortcuts_new(filename, "Messaging Menu"); - label = g_desktop_app_info_get_action_name (app_info, *actions); - g_menu_append (app_section, label, *actions); + if (shortcuts != NULL) + for (nicks = indicator_desktop_shortcuts_get_nicks(shortcuts); *nicks; nicks++) + { + gchar *label; - g_free (label); - } + label = indicator_desktop_shortcuts_nick_get_name (shortcuts, *nicks); + g_menu_append (app_section, label, *nicks); + + g_free (label); + } + + g_clear_object(&shortcuts); } -#endif source_section = g_menu_new (); -- cgit v1.2.3 From 046f655a8859e2e3eaa6015fc2ecd226c8b46b1f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 20 Aug 2013 21:03:18 -0500 Subject: Make it so that we sort based on application name to make the menu more sane --- src/im-desktop-menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/im-desktop-menu.c') diff --git a/src/im-desktop-menu.c b/src/im-desktop-menu.c index 3309dad..834a8c9 100644 --- a/src/im-desktop-menu.c +++ b/src/im-desktop-menu.c @@ -97,7 +97,7 @@ im_desktop_menu_app_added (ImApplicationList *applist, g_menu_append_section (section, NULL, G_MENU_MODEL (source_section)); namespace = g_strconcat ("indicator.", app_id, NULL); - im_menu_insert_section (IM_MENU (menu), -1, namespace, G_MENU_MODEL (section)); + im_menu_insert_section (IM_MENU (menu), g_app_info_get_name(G_APP_INFO(app_info)), namespace, G_MENU_MODEL (section)); g_hash_table_insert (menu->source_sections, g_strdup (app_id), source_section); g_free (namespace); -- cgit v1.2.3