diff options
| author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2012-11-21 11:25:20 +0100 |
|---|---|---|
| committer | Lars Uebernickel <lars.uebernickel@canonical.com> | 2012-11-21 11:25:20 +0100 |
| commit | 7d78b08907c94be166da15adc9b7dad3c282d0f2 (patch) | |
| tree | 64cc4b746d41b667816491d4787ce26b900493b8 | |
| parent | 0a9533c90d46c4bfda4e0527f5475ce8c22c08e7 (diff) | |
| download | ayatana-indicator-messages-7d78b08907c94be166da15adc9b7dad3c282d0f2.tar.gz ayatana-indicator-messages-7d78b08907c94be166da15adc9b7dad3c282d0f2.tar.bz2 ayatana-indicator-messages-7d78b08907c94be166da15adc9b7dad3c282d0f2.zip | |
ImApplicationList: no need to include the dynamic data in the signals
This data can (and should) always be retrieved via actions.
| -rw-r--r-- | src/im-application-list.c | 22 | ||||
| -rw-r--r-- | src/im-phone-menu.c | 5 | ||||
| -rw-r--r-- | src/im-phone-menu.h | 5 |
3 files changed, 8 insertions, 24 deletions
diff --git a/src/im-application-list.c b/src/im-application-list.c index 9e9df9d..05d3a52 100644 --- a/src/im-application-list.c +++ b/src/im-application-list.c @@ -115,15 +115,11 @@ im_application_list_class_init (ImApplicationListClass *klass) NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, - 8, + 4, G_TYPE_DESKTOP_APP_INFO, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_UINT, - G_TYPE_INT64, - G_TYPE_STRING, - G_TYPE_BOOLEAN); + G_TYPE_STRING); signals[SOURCE_CHANGED] = g_signal_new ("source-changed", IM_TYPE_APPLICATION_LIST, @@ -132,15 +128,11 @@ im_application_list_class_init (ImApplicationListClass *klass) NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, - 8, + 4, G_TYPE_DESKTOP_APP_INFO, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_UINT, - G_TYPE_INT64, - G_TYPE_STRING, - G_TYPE_BOOLEAN); + G_TYPE_STRING); signals[SOURCE_REMOVED] = g_signal_new ("source-removed", IM_TYPE_APPLICATION_LIST, @@ -277,8 +269,7 @@ im_application_list_source_added (Application *app, action = g_simple_action_new_stateful (id, NULL, g_variant_new_uint32 (count)); g_simple_action_group_insert (app->actions, G_ACTION (action)); - g_signal_emit (app->list, signals[SOURCE_ADDED], 0, - app->info, id, label, iconstr, count, time, string, draws_attention); + g_signal_emit (app->list, signals[SOURCE_ADDED], 0, app->info, id, label, iconstr); g_object_unref (action); } @@ -301,8 +292,7 @@ im_application_list_source_changed (Application *app, g_action_group_change_action_state (G_ACTION_GROUP (app->actions), id, g_variant_new_uint32 (count)); - g_signal_emit (app->list, signals[SOURCE_CHANGED], 0, - app->info, id, label, iconstr, count, time, string, draws_attention); + g_signal_emit (app->list, signals[SOURCE_CHANGED], 0, app->info, id, label, iconstr); } static void diff --git a/src/im-phone-menu.c b/src/im-phone-menu.c index 43b7a6c..0ba41c4 100644 --- a/src/im-phone-menu.c +++ b/src/im-phone-menu.c @@ -172,10 +172,7 @@ im_phone_menu_add_source (ImPhoneMenu *menu, GDesktopAppInfo *app, const gchar *id, const gchar *label, - const gchar *iconstr, - guint32 count, - gint64 time, - const gchar *string) + const gchar *iconstr) { GMenuItem *item; gchar *action_name; diff --git a/src/im-phone-menu.h b/src/im-phone-menu.h index 91aae2c..b0b6b4f 100644 --- a/src/im-phone-menu.h +++ b/src/im-phone-menu.h @@ -55,10 +55,7 @@ void im_phone_menu_add_source (ImPhoneMenu *men GDesktopAppInfo *app, const gchar *id, const gchar *label, - const gchar *iconstr, - guint32 count, - gint64 time, - const gchar *string); + const gchar *iconstr); void im_phone_menu_remove_source (ImPhoneMenu *menu, GDesktopAppInfo *app, |