diff options
| author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2013-10-04 15:29:10 +0200 |
|---|---|---|
| committer | Lars Uebernickel <lars.uebernickel@canonical.com> | 2013-10-04 15:29:10 +0200 |
| commit | 273973d1cefd90cae1f06d96531add5fea7dd5bd (patch) | |
| tree | c5c7d43a77d0affd59b468402e2ff6bee2ed7223 /src | |
| parent | f807fd4ebc109be261f5cbbe0e92b11805382c56 (diff) | |
| download | ayatana-indicator-messages-273973d1cefd90cae1f06d96531add5fea7dd5bd.tar.gz ayatana-indicator-messages-273973d1cefd90cae1f06d96531add5fea7dd5bd.tar.bz2 ayatana-indicator-messages-273973d1cefd90cae1f06d96531add5fea7dd5bd.zip | |
Add "visible" paramete to im-application-list-source-added
Diffstat (limited to 'src')
| -rw-r--r-- | src/im-application-list.c | 12 | ||||
| -rw-r--r-- | src/im-desktop-menu.c | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/im-application-list.c b/src/im-application-list.c index dbf6bb5..62699df 100644 --- a/src/im-application-list.c +++ b/src/im-application-list.c @@ -474,11 +474,12 @@ im_application_list_class_init (ImApplicationListClass *klass) NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, - 4, + 5, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_VARIANT); + G_TYPE_VARIANT, + G_TYPE_BOOLEAN); signals[SOURCE_CHANGED] = g_signal_new ("source-changed", IM_TYPE_APPLICATION_LIST, @@ -784,6 +785,7 @@ im_application_list_source_added (Application *app, gint64 time; const gchar *string; gboolean draws_attention; + gboolean visible; GVariant *serialized_icon = NULL; GVariant *state; GSimpleAction *action; @@ -794,15 +796,17 @@ im_application_list_source_added (Application *app, if (g_variant_n_children (maybe_serialized_icon) == 1) g_variant_get_child (maybe_serialized_icon, 0, "v", &serialized_icon); + visible = count > 0 || time != 0 || (string != NULL && string[0] != '\0'); + state = g_variant_new ("(uxsb)", count, time, string, draws_attention); action = g_simple_action_new_stateful (id, G_VARIANT_TYPE_BOOLEAN, state); g_signal_connect (action, "activate", G_CALLBACK (im_application_list_source_activated), app); g_action_map_add_action (G_ACTION_MAP(app->source_actions), G_ACTION (action)); - g_signal_emit (app->list, signals[SOURCE_ADDED], 0, app->id, id, label, serialized_icon); + g_signal_emit (app->list, signals[SOURCE_ADDED], 0, app->id, id, label, serialized_icon, visible); - if (draws_attention && app->draws_attention == FALSE) + if (visible && draws_attention && app->draws_attention == FALSE) { app->draws_attention = TRUE; im_application_list_update_draws_attention (app->list); diff --git a/src/im-desktop-menu.c b/src/im-desktop-menu.c index 775483e..68d8a2d 100644 --- a/src/im-desktop-menu.c +++ b/src/im-desktop-menu.c @@ -170,6 +170,7 @@ im_desktop_menu_source_added (ImApplicationList *applist, const gchar *source_id, const gchar *label, GVariant *serialized_icon, + gboolean visible, gpointer user_data) { ImDesktopMenu *menu = user_data; @@ -178,7 +179,8 @@ im_desktop_menu_source_added (ImApplicationList *applist, source_section = g_hash_table_lookup (menu->source_sections, app_id); g_return_if_fail (source_section != NULL); - im_desktop_menu_source_section_insert_source (source_section, source_id, label, serialized_icon, -1); + if (visible) + im_desktop_menu_source_section_insert_source (source_section, source_id, label, serialized_icon, -1); } static void |