diff options
| author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2013-09-09 14:32:02 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-09-09 14:32:02 +0000 |
| commit | bcb22de41454a1f8d7b7e5189c2590c94950f5c2 (patch) | |
| tree | c22bbf4620910bdca7bcbbe9c60257beadb2337c /src/im-phone-menu.c | |
| parent | 9b383fa4369926ac50e4999becad4e6af3650146 (diff) | |
| parent | 2b37622e83ae150320d6aa540c79e85a2574ffd5 (diff) | |
| download | ayatana-indicator-messages-bcb22de41454a1f8d7b7e5189c2590c94950f5c2.tar.gz ayatana-indicator-messages-bcb22de41454a1f8d7b7e5189c2590c94950f5c2.tar.bz2 ayatana-indicator-messages-bcb22de41454a1f8d7b7e5189c2590c94950f5c2.zip | |
Use g_icon_serialize() instead of g_icon_to_string().
Approved by Charles Kerr, PS Jenkins bot.
Diffstat (limited to 'src/im-phone-menu.c')
| -rw-r--r-- | src/im-phone-menu.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/im-phone-menu.c b/src/im-phone-menu.c index a9c5977..0f0a6da 100644 --- a/src/im-phone-menu.c +++ b/src/im-phone-menu.c @@ -151,9 +151,9 @@ im_phone_menu_get_message_time (GMenuModel *model, void im_phone_menu_add_message (ImPhoneMenu *menu, const gchar *app_id, - const gchar *app_icon, + GIcon *app_icon, const gchar *id, - const gchar *iconstr, + GVariant *serialized_icon, const gchar *title, const gchar *subtitle, const gchar *body, @@ -164,6 +164,7 @@ im_phone_menu_add_message (ImPhoneMenu *menu, gchar *action_name; gint n_messages; gint pos; + GVariant *serialized_app_icon; g_return_if_fail (IM_IS_PHONE_MENU (menu)); g_return_if_fail (app_id); @@ -179,11 +180,14 @@ im_phone_menu_add_message (ImPhoneMenu *menu, g_menu_item_set_attribute (item, "x-canonical-text", "s", body); g_menu_item_set_attribute (item, "x-canonical-time", "x", time); - if (iconstr) - g_menu_item_set_attribute (item, "icon", "s", iconstr); + if (serialized_icon) + g_menu_item_set_attribute_value (item, "icon", serialized_icon); - if (app_icon) - g_menu_item_set_attribute (item, "x-canonical-app-icon", "s", app_icon); + if (app_icon && (serialized_app_icon = g_icon_serialize (app_icon))) + { + g_menu_item_set_attribute_value (item, "x-canonical-app-icon", serialized_app_icon); + g_variant_unref (serialized_app_icon); + } if (actions) g_menu_item_set_attribute (item, "x-canonical-message-actions", "v", actions); |