From b8711e8f8c3c45681ffd6ca3c398b91ab3db1537 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 22 Nov 2012 09:42:27 +0100 Subject: libmessaging-menu: fix crash in _draws_attention The format string passed to g_variant_get calls for four parameters, but only three were given. --- libmessaging-menu/messaging-menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmessaging-menu') diff --git a/libmessaging-menu/messaging-menu.c b/libmessaging-menu/messaging-menu.c index 38883f8..04f8d1d 100644 --- a/libmessaging-menu/messaging-menu.c +++ b/libmessaging-menu/messaging-menu.c @@ -715,7 +715,7 @@ messaging_menu_app_set_draws_attention (MessagingMenuApp *app, return; state = g_action_get_state (G_ACTION (action)); - g_variant_get (state, "(ux&sb)", &count, &time, &string); + g_variant_get (state, "(ux&sb)", &count, &time, &string, NULL); new_state = g_variant_new ("(uxsb)", count, time, string, TRUE); g_simple_action_set_state (action, new_state); -- cgit v1.2.3 From f6d3e793ec923be629f26cab087a6a995a2d0c61 Mon Sep 17 00:00:00 2001 From: Jason Conti Date: Tue, 12 Feb 2013 14:41:16 -0500 Subject: libmessaging-menu: Set correct boolean value in _remove_attention and _set_draws_attention --- libmessaging-menu/messaging-menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libmessaging-menu') diff --git a/libmessaging-menu/messaging-menu.c b/libmessaging-menu/messaging-menu.c index 04f8d1d..1fa1033 100644 --- a/libmessaging-menu/messaging-menu.c +++ b/libmessaging-menu/messaging-menu.c @@ -717,7 +717,7 @@ messaging_menu_app_set_draws_attention (MessagingMenuApp *app, state = g_action_get_state (G_ACTION (action)); g_variant_get (state, "(ux&sb)", &count, &time, &string, NULL); - new_state = g_variant_new ("(uxsb)", count, time, string, TRUE); + new_state = g_variant_new ("(uxsb)", count, time, string, draws_attention); g_simple_action_set_state (action, new_state); g_variant_unref (state); @@ -1191,5 +1191,5 @@ void messaging_menu_app_remove_attention (MessagingMenuApp *app, const gchar *source_id) { - messaging_menu_app_set_draws_attention (app, source_id, TRUE); + messaging_menu_app_set_draws_attention (app, source_id, FALSE); } -- cgit v1.2.3 From 8249e264e0f426d6702d21a690477be495045f90 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 19 Feb 2013 19:21:43 -0500 Subject: Notify the service when an app unrefs its MessagingMenuApp Prior to this patch, the messaging menu only marked apps as "not running" when they quit (i.e. disappeared from the bus). This was okay, since most applications only ever release the ref to their MessagingMenuApp when they quit, or after calling _unregister explicitely (which removes them from the menu entirely). However, this is according to libmessagingmenu's documentation, and at least indicator-telepathy relies on it. --- libmessaging-menu/messaging-menu.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libmessaging-menu') diff --git a/libmessaging-menu/messaging-menu.c b/libmessaging-menu/messaging-menu.c index 04f8d1d..a51695a 100644 --- a/libmessaging-menu/messaging-menu.c +++ b/libmessaging-menu/messaging-menu.c @@ -277,6 +277,10 @@ messaging_menu_app_dispose (GObject *object) if (app->messages_service) { + indicator_messages_service_call_application_stopped_running (app->messages_service, + g_app_info_get_id (G_APP_INFO (app->appinfo)), + NULL, NULL, NULL); + g_signal_handlers_disconnect_by_func (app->messages_service, global_status_changed, app); -- cgit v1.2.3 From 1312f9108e64a9b4f33986b877a90e418bf5cdfb Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 15 May 2013 12:09:18 -0400 Subject: libmessaging-menu: don't use detailed action names Detailed action names are of the form action::target or action(target), so they can't have colons or parens in them. This restriction does not apply to messaging menu ids. --- libmessaging-menu/messaging-menu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libmessaging-menu') diff --git a/libmessaging-menu/messaging-menu.c b/libmessaging-menu/messaging-menu.c index 1fa1033..acf3d90 100644 --- a/libmessaging-menu/messaging-menu.c +++ b/libmessaging-menu/messaging-menu.c @@ -644,7 +644,8 @@ messaging_menu_app_insert_source_action (MessagingMenuApp *app, g_simple_action_group_insert (app->source_actions, G_ACTION (action)); g_object_unref (action); - menuitem = g_menu_item_new (label, id); + menuitem = g_menu_item_new (label, NULL); + g_menu_item_set_action_and_target_value (menuitem, id, NULL); g_menu_item_set_attribute (menuitem, "x-canonical-type", "s", "ImSourceMenuItem"); if (icon) { -- cgit v1.2.3