From e8e99703ef0c565f07a9d1eba03c1003d82ff697 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Tue, 27 Nov 2012 15:14:26 +0100
Subject: Allow adding actions to MessagingMenuMessage

---
 libmessaging-menu/messaging-menu-app.c | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

(limited to 'libmessaging-menu/messaging-menu-app.c')

diff --git a/libmessaging-menu/messaging-menu-app.c b/libmessaging-menu/messaging-menu-app.c
index d037da9..491c123 100644
--- a/libmessaging-menu/messaging-menu-app.c
+++ b/libmessaging-menu/messaging-menu-app.c
@@ -152,6 +152,9 @@ static void global_status_changed (IndicatorMessagesService *service,
                                    const gchar *status_str,
                                    gpointer user_data);
 
+/* in messaging-menu-message.c */
+GVariant * messaging_menu_message_to_variant (MessagingMenuMessage *msg);
+
 static void
 source_free (gpointer data)
 {
@@ -188,29 +191,6 @@ source_to_variant (Source *source)
   return v;
 }
 
-static GVariant *
-messaging_menu_message_to_variant (MessagingMenuMessage *message)
-{
-  GVariant *v;
-  GIcon *icon;
-  gchar *iconstr;
-
-  icon = messaging_menu_message_get_icon (message);
-  iconstr = icon ? g_icon_to_string (icon) : NULL;
-
-  v = g_variant_new ("(sssssxb)", messaging_menu_message_get_id (message),
-                                  iconstr ? iconstr : "",
-                                  messaging_menu_message_get_title (message),
-                                  messaging_menu_message_get_subtitle (message),
-                                  messaging_menu_message_get_body (message),
-                                  messaging_menu_message_get_time (message),
-                                  messaging_menu_message_get_draws_attention (message));
-
-  g_free (iconstr);
-
-  return v;
-}
-
 static gchar *
 messaging_menu_app_get_dbus_object_path (MessagingMenuApp *app)
 {
@@ -571,7 +551,7 @@ messaging_menu_app_list_messages (IndicatorMessagesApplication *app_interface,
   GHashTableIter iter;
   MessagingMenuMessage *message;
 
-  g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(sssssxb)"));
+  g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(sssssxa(ssgav)b)"));
 
   g_hash_table_iter_init (&iter, app->messages);
   while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &message))
-- 
cgit v1.2.3