Merge lp:~larsu/indicator-messages/update-root-action into lp:indicator-messages/15.10

[Ted Gould]

application list: update root action unconditionally

application list: update root action unconditionally

Until now, the _update_root_action() was only called when the draws_attention was set. That function now also sets the sensitive state of some other actions, which might change independently of the attention flag.

Simply call the function unconditionally. It's not doing a lot of work anyway and it only gets called when something in the source or message lists changes.

[Ted Gould (ted)]

Approve for 15.10 as well.

review: Approve

=== modified file 'src/im-application-list.c'
--- src/im-application-list.c	2015-04-03 14:51:51 +0000
+++ src/im-application-list.c	2015-05-05 14:37:33 +0000
@@ -352,8 +352,8 @@
   g_action_map_remove_action (G_ACTION_MAP(app->source_actions), action_name);
   g_signal_emit (app->list, signals[SOURCE_REMOVED], 0, app->id, action_name);
 
-  if (application_update_draws_attention(app))
-    im_application_list_update_root_action (app->list);
+  application_update_draws_attention (app);
+  im_application_list_update_root_action (app->list);
 }
 
 /* Remove a source from an application, signal up and update the status
@@ -410,8 +410,8 @@
   g_action_map_remove_action (G_ACTION_MAP(app->message_actions), action_name);
   g_action_muxer_remove (app->message_sub_actions, action_name);
 
-  if (application_update_draws_attention(app))
-    im_application_list_update_root_action (app->list);
+  application_update_draws_attention (app);
+  im_application_list_update_root_action (app->list);
 
   g_signal_emit (app->list, signals[MESSAGE_REMOVED], 0, app->id, action_name);
 }
@@ -912,10 +912,9 @@
   g_signal_emit (app->list, signals[SOURCE_ADDED], 0, app->id, action_name, label, serialized_icon, visible);
 
   if (visible && draws_attention && app->draws_attention == FALSE)
-    {
-      app->draws_attention = TRUE;
-      im_application_list_update_root_action (app->list);
-    }
+    app->draws_attention = TRUE;
+
+  im_application_list_update_root_action (app->list);
 
   g_free (action_name);
   g_object_unref (action);
@@ -954,8 +953,8 @@
 
   g_signal_emit (app->list, signals[SOURCE_CHANGED], 0, app->id, action_name, label, serialized_icon, visible);
 
-  if (application_update_draws_attention (app))
-    im_application_list_update_root_action (app->list);
+  application_update_draws_attention (app);
+  im_application_list_update_root_action (app->list);
 
   if (serialized_icon)
     g_variant_unref (serialized_icon);