aboutsummaryrefslogtreecommitdiff
path: root/src/im-application-list.c
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2012-12-04 18:33:55 +0000
committerLars Uebernickel <lars.uebernickel@canonical.com>2012-12-04 18:33:55 +0000
commit40b99f3e6fc6170da525c88cf79186cd9cb565de (patch)
treeb8aa0d2418bf492d0b19a779bbd1bf594447477e /src/im-application-list.c
parentb47db34e391990abaa2988700e2a83ca179e32c3 (diff)
downloadayatana-indicator-messages-40b99f3e6fc6170da525c88cf79186cd9cb565de.tar.gz
ayatana-indicator-messages-40b99f3e6fc6170da525c88cf79186cd9cb565de.tar.bz2
ayatana-indicator-messages-40b99f3e6fc6170da525c88cf79186cd9cb565de.zip
Only expose one application icon (the -symbolic one)
Diffstat (limited to 'src/im-application-list.c')
-rw-r--r--src/im-application-list.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/im-application-list.c b/src/im-application-list.c
index da78813..64b15e3 100644
--- a/src/im-application-list.c
+++ b/src/im-application-list.c
@@ -302,8 +302,7 @@ im_application_list_class_init (ImApplicationListClass *klass)
NULL, NULL,
g_cclosure_marshal_generic,
G_TYPE_NONE,
- 11,
- G_TYPE_STRING,
+ 10,
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_STRING,
@@ -578,7 +577,6 @@ im_application_list_message_added (Application *app,
GSimpleAction *action;
GIcon *app_icon;
gchar *app_iconstr = NULL;
- gchar *symbolic_app_iconstr = NULL;
GVariant *actions = NULL;
g_variant_get (message, "(&s&s&s&s&sxaa{sv}b)",
@@ -586,10 +584,7 @@ im_application_list_message_added (Application *app,
app_icon = g_app_info_get_icon (G_APP_INFO (app->info));
if (app_icon)
- {
- app_iconstr = g_icon_to_string (app_icon);
- symbolic_app_iconstr = get_symbolic_app_icon_string (app_icon);
- }
+ app_iconstr = get_symbolic_app_icon_string (app_icon);
action = g_simple_action_new (id, G_VARIANT_TYPE_BOOLEAN);
g_signal_connect (action, "activate", G_CALLBACK (im_application_list_message_activated), app);
@@ -662,12 +657,11 @@ im_application_list_message_added (Application *app,
}
g_signal_emit (app->list, signals[MESSAGE_ADDED], 0,
- app->id, app_iconstr, symbolic_app_iconstr, id,
- iconstr, title, subtitle, body, actions, time, draws_attention);
+ app->id, app_iconstr, id, iconstr, title,
+ subtitle, body, actions, time, draws_attention);
g_variant_iter_free (action_iter);
g_free (app_iconstr);
- g_free (symbolic_app_iconstr);
g_object_unref (action);
}