From 194c8bf9e07b10fb4857aeb5366b3aaee07dd9a2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 15 Aug 2013 12:50:16 -0500 Subject: Really we should set status on the application list --- src/im-application-list.c | 9 +++++++++ src/im-application-list.h | 4 ++++ src/im-menu.c | 16 ---------------- src/im-menu.h | 5 ----- src/messages-service.c | 8 +------- 5 files changed, 14 insertions(+), 28 deletions(-) diff --git a/src/im-application-list.c b/src/im-application-list.c index dd868df..33b9d4a 100644 --- a/src/im-application-list.c +++ b/src/im-application-list.c @@ -978,3 +978,12 @@ im_application_list_get_application (ImApplicationList *list, app = g_hash_table_lookup (list->applications, id); return app ? app->info : NULL; } + +void +im_application_list_set_status (ImApplicationList * list, const gchar * id, const gchar *status) +{ + + + return; +} + diff --git a/src/im-application-list.h b/src/im-application-list.h index 53dac50..f1de220 100644 --- a/src/im-application-list.h +++ b/src/im-application-list.h @@ -55,4 +55,8 @@ GList * im_application_list_get_applications (ImApplicationLi GDesktopAppInfo * im_application_list_get_application (ImApplicationList *list, const gchar *id); +void im_application_list_set_status (ImApplicationList *list, + const gchar *id, + const gchar *status); + #endif diff --git a/src/im-menu.c b/src/im-menu.c index 931d998..ac23a29 100644 --- a/src/im-menu.c +++ b/src/im-menu.c @@ -189,19 +189,3 @@ im_menu_insert_section (ImMenu *menu, g_object_unref (item); } - -void -im_menu_set_status (ImMenu * menu, - const gchar *id, - const gchar *status_str) -{ - g_return_if_fail(IM_IS_MENU(menu)); - g_return_if_fail(id != NULL); - g_return_if_fail(status_str != NULL); - - ImMenuClass * klass = IM_MENU_GET_CLASS(menu); - if (klass->set_status != NULL) - klass->set_status(menu, id, status_str); - - return; -} diff --git a/src/im-menu.h b/src/im-menu.h index 633a444..d3775ad 100644 --- a/src/im-menu.h +++ b/src/im-menu.h @@ -37,7 +37,6 @@ typedef struct _ImMenuPrivate ImMenuPrivate; struct _ImMenuClass { GObjectClass parent_class; - void (*set_status) (ImMenu * menu, const gchar * id, const gchar * status_str); }; struct _ImMenu @@ -62,8 +61,4 @@ void im_menu_insert_section (ImMenu const gchar *namespace, GMenuModel *section); -void im_menu_set_status (ImMenu * menu, - const gchar *id, - const gchar *status_str); - #endif diff --git a/src/messages-service.c b/src/messages-service.c index 92a3f99..6423cd5 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -85,7 +85,6 @@ set_status (IndicatorMessagesService *service, { GDesktopAppInfo *appinfo; const gchar *id; - GList * menulist, * menu; g_return_if_fail (g_str_equal (status_str, "available") || g_str_equal (status_str, "away")|| @@ -101,16 +100,11 @@ set_status (IndicatorMessagesService *service, id = g_app_info_get_id (G_APP_INFO (appinfo)); - menulist = g_hash_table_get_values(menus); - for (menu = menulist; menu != NULL; menu = g_list_next(menu)) { - ImMenu * immenu = IM_MENU(menu->data); - im_menu_set_status(immenu, id, status_str); - } + im_application_list_set_status(applications, id, status_str); indicator_messages_service_complete_set_status (service, invocation); g_object_unref (appinfo); - g_list_free(menulist); } -- cgit v1.2.3