From 7c7c408e9fe4e1cddedae9a6882c714ac3e161d3 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Tue, 27 Nov 2012 16:18:18 +0100
Subject: Move 'activate' signal into MessagingMenuMessage

And add parameters 'action' and 'parameter' (though they are not set yet).
---
 libmessaging-menu/messaging-menu-app.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 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 491c123..cea0eb9 100644
--- a/libmessaging-menu/messaging-menu-app.c
+++ b/libmessaging-menu/messaging-menu-app.c
@@ -126,7 +126,6 @@ enum {
 
 enum {
   ACTIVATE_SOURCE,
-  ACTIVATE_MESSAGE,
   STATUS_CHANGED,
   N_SIGNALS
 };
@@ -365,27 +364,6 @@ messaging_menu_app_class_init (MessagingMenuAppClass *class)
                                            g_cclosure_marshal_VOID__STRING,
                                            G_TYPE_NONE, 1, G_TYPE_STRING);
 
-  /**
-   * MessagingMenuApp::activate-message:
-   * @mmapp: the #MessagingMenuApp
-   * @message: the activated #MessagingMenuMessage
-   *
-   * Emitted when the user has activated a message.  The message is
-   * immediately removed from the application's menu, handlers of this
-   * signal do not need to call messaging_menu_app_remove_message().
-   *
-   * To get notified about the activation of a specific message, set the
-   * signal's detail to the message id.
-   */
-  signals[ACTIVATE_MESSAGE] = g_signal_new ("activate-message",
-                                            MESSAGING_MENU_TYPE_APP,
-                                            G_SIGNAL_RUN_FIRST |
-                                            G_SIGNAL_DETAILED,
-                                            0,
-                                            NULL, NULL,
-                                            g_cclosure_marshal_VOID__OBJECT,
-                                            G_TYPE_NONE, 1, MESSAGING_MENU_TYPE_MESSAGE);
-
   /**
    * MessagingMenuApp::status-changed:
    * @mmapp: the #MessagingMenuApp
@@ -576,7 +554,7 @@ messaging_menu_app_activate_message (IndicatorMessagesApplication *app_interface
   msg = g_hash_table_lookup (app->messages, message_id);
   if (msg)
     {
-      g_signal_emit (app, signals[ACTIVATE_MESSAGE], g_quark_from_string (message_id), msg);
+      g_signal_emit_by_name (msg, "activate", NULL, NULL);
 
       /* Activate implies removing the message, no need for MessageRemoved  */
       messaging_menu_app_remove_message_internal (app, message_id);
-- 
cgit v1.2.3