From 629b28e7f86d13eb78274c51a9164bdcac4e2cd7 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Mon, 26 Nov 2012 11:49:17 +0100 Subject: ImApplicationList: listen to activate signal --- src/im-application-list.c | 76 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/im-application-list.c b/src/im-application-list.c index 24df19e..dc8c146 100644 --- a/src/im-application-list.c +++ b/src/im-application-list.c @@ -86,6 +86,60 @@ application_free (gpointer data) g_slice_free (Application, app); } +static void +im_application_list_source_removed (Application *app, + const gchar *id) +{ + g_simple_action_group_remove (app->actions, id); + + g_signal_emit (app->list, signals[SOURCE_REMOVED], 0, app->id, id); +} + +static void +im_application_list_source_activated (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) +{ + Application *app = user_data; + const gchar *source_id; + + source_id = g_action_get_name (G_ACTION (action)); + + indicator_messages_application_call_activate_source (app->proxy, + source_id, + app->cancellable, + NULL, NULL); + + im_application_list_source_removed (app, source_id); +} + +static void +im_application_list_message_removed (Application *app, + const gchar *id) +{ + g_simple_action_group_remove (app->actions, id); + + g_signal_emit (app->list, signals[MESSAGE_REMOVED], 0, app->id, id); +} + +static void +im_application_list_message_activated (GSimpleAction *action, + GVariant *parameter, + gpointer user_data) +{ + Application *app = user_data; + const gchar *message_id; + + message_id = g_action_get_name (G_ACTION (action)); + + indicator_messages_application_call_activate_message (app->proxy, + message_id, + app->cancellable, + NULL, NULL); + + im_application_list_message_removed (app, message_id); +} + static void im_application_list_dispose (GObject *object) { @@ -304,6 +358,8 @@ im_application_list_source_added (Application *app, state = g_variant_new ("(uxsb)", count, time, string, draws_attention); action = g_simple_action_new_stateful (id, NULL, state); + g_signal_connect (action, "activate", G_CALLBACK (im_application_list_source_activated), app); + g_simple_action_group_insert (app->actions, G_ACTION (action)); g_signal_emit (app->list, signals[SOURCE_ADDED], 0, app->id, id, label, iconstr); @@ -332,15 +388,6 @@ im_application_list_source_changed (Application *app, g_signal_emit (app->list, signals[SOURCE_CHANGED], 0, app->id, id, label, iconstr); } -static void -im_application_list_source_removed (Application *app, - const gchar *id) -{ - g_simple_action_group_remove (app->actions, id); - - g_signal_emit (app->list, signals[SOURCE_REMOVED], 0, app->id, id); -} - static void im_application_list_sources_listed (GObject *source_object, GAsyncResult *result, @@ -394,6 +441,8 @@ im_application_list_message_added (Application *app, app_iconstr = app_icon ? g_icon_to_string (app_icon) : NULL; action = g_simple_action_new (id, NULL); + g_signal_connect (action, "activate", G_CALLBACK (im_application_list_message_activated), app); + g_simple_action_group_insert (G_SIMPLE_ACTION_GROUP (app->actions), G_ACTION (action)); g_signal_emit (app->list, signals[MESSAGE_ADDED], 0, @@ -403,15 +452,6 @@ im_application_list_message_added (Application *app, g_object_unref (action); } -static void -im_application_list_message_removed (Application *app, - const gchar *id) -{ - g_simple_action_group_remove (app->actions, id); - - g_signal_emit (app->list, signals[MESSAGE_REMOVED], 0, app->id, id); -} - static void im_application_list_messages_listed (GObject *source_object, GAsyncResult *result, -- cgit v1.2.3