From dbf5b1d9ea6aef0fb55ffcd3b6322fbfb20e5e73 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 8 Aug 2009 05:50:34 -0600 Subject: Better displose to free the proxy and ensuring that statuc changes get noted. --- src/status-provider-pidgin.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src') diff --git a/src/status-provider-pidgin.c b/src/status-provider-pidgin.c index 6a3f7a5..5e42ff2 100644 --- a/src/status-provider-pidgin.c +++ b/src/status-provider-pidgin.c @@ -129,6 +129,12 @@ status_provider_pidgin_init (StatusProviderPidgin *self) static void status_provider_pidgin_dispose (GObject *object) { + StatusProviderPidginPrivate * priv = STATUS_PROVIDER_PIDGIN_GET_PRIVATE(self); + + if (priv->proxy != NULL) { + g_object_unref(priv->proxy); + priv->proxy = NULL; + } G_OBJECT_CLASS (status_provider_pidgin_parent_class)->dispose (object); return; @@ -166,6 +172,7 @@ set_status (StatusProvider * sp, StatusProviderStatus status) StatusProviderPidginPrivate * priv = STATUS_PROVIDER_PIDGIN_GET_PRIVATE(sp); pg_status_t pg_status = sp_to_pg_map[status]; priv->pg_status = pg_status; + g_signal_emit(G_OBJECT(sp), signals[STATUS_CHANGED], 0, pg_to_sp_map[priv->pg_status], TRUE); return; } -- cgit v1.2.3 From d61f15d257b8d7e27d4cc7955e9b870d0e44d73b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 8 Aug 2009 05:55:49 -0600 Subject: Handling the signal better. Now in the header file as well. --- src/status-provider-pidgin.c | 4 ++-- src/status-provider.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/status-provider-pidgin.c b/src/status-provider-pidgin.c index 5e42ff2..aaa8732 100644 --- a/src/status-provider-pidgin.c +++ b/src/status-provider-pidgin.c @@ -129,7 +129,7 @@ status_provider_pidgin_init (StatusProviderPidgin *self) static void status_provider_pidgin_dispose (GObject *object) { - StatusProviderPidginPrivate * priv = STATUS_PROVIDER_PIDGIN_GET_PRIVATE(self); + StatusProviderPidginPrivate * priv = STATUS_PROVIDER_PIDGIN_GET_PRIVATE(object); if (priv->proxy != NULL) { g_object_unref(priv->proxy); @@ -172,7 +172,7 @@ set_status (StatusProvider * sp, StatusProviderStatus status) StatusProviderPidginPrivate * priv = STATUS_PROVIDER_PIDGIN_GET_PRIVATE(sp); pg_status_t pg_status = sp_to_pg_map[status]; priv->pg_status = pg_status; - g_signal_emit(G_OBJECT(sp), signals[STATUS_CHANGED], 0, pg_to_sp_map[priv->pg_status], TRUE); + g_signal_emit(G_OBJECT(sp), STATUS_PROVIDER_SIGNAL_STATUS_CHANGED_ID, 0, pg_to_sp_map[priv->pg_status], TRUE); return; } diff --git a/src/status-provider.h b/src/status-provider.h index f01a90e..9cc9885 100644 --- a/src/status-provider.h +++ b/src/status-provider.h @@ -47,7 +47,8 @@ typedef enum } StatusProviderStatus; -#define STATUS_PROVIDER_SIGNAL_STATUS_CHANGED "status-changed" +#define STATUS_PROVIDER_SIGNAL_STATUS_CHANGED "status-changed" +#define STATUS_PROVIDER_SIGNAL_STATUS_CHANGED_ID (g_signal_lookup(STATUS_PROVIDER_SIGNAL_STATUS_CHANGED, STATUS_PROVIDER_TYPE)) typedef struct _StatusProvider StatusProvider; struct _StatusProvider { -- cgit v1.2.3 From e36075a13c2e270b9a240032f8fca244614d6367 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 8 Aug 2009 06:04:11 -0600 Subject: Brining in the concept of global status --- src/status-service.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'src') diff --git a/src/status-service.c b/src/status-service.c index 4c48c72..3f25c4f 100644 --- a/src/status-service.c +++ b/src/status-service.c @@ -67,6 +67,27 @@ static DbusmenuMenuitem * root_menuitem = NULL; static DbusmenuMenuitem * status_menuitem = NULL; static GMainLoop * mainloop = NULL; static StatusServiceDbus * dbus_interface = NULL; +static StatusProviderStatus global_status = STATUS_PROVIDER_STATUS_OFFLINE; + +static void +status_update (void) { + StatusProviderStatus oldglobal = global_status; + global_status = STATUS_PROVIDER_STATUS_ONLINE; + + int i; + for (i = 0; i < STATUS_PROVIDER_CNT; i++) { + StatusProviderStatus localstatus = status_provider_get_status(status_providers[i]); + if (localstatus > global_status) { + global_status = localstatus; + } + } + + if (global_status != oldglobal) { + g_debug("Global status changed to: %s", _(status_strings[global_status])); + } + + return; +} /* A fun little function to actually lock the screen. If, that's what you want, let's do it! */ -- cgit v1.2.3 From 0788baad4bd4714e8361a99150046ba4fdb4513a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 8 Aug 2009 06:24:04 -0600 Subject: Global status being used and thrown over d' bus --- src/status-service-dbus.c | 7 +++++++ src/status-service-dbus.h | 1 + src/status-service.c | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/status-service-dbus.c b/src/status-service-dbus.c index a8e031c..2ac34af 100644 --- a/src/status-service-dbus.c +++ b/src/status-service-dbus.c @@ -172,3 +172,10 @@ _status_service_server_pretty_user_name (StatusServiceDbus * service, gchar ** u return TRUE; } + +void +status_service_dbus_set_status (StatusServiceDbus * self, const gchar * icon) +{ + g_signal_emit(G_OBJECT(self), signals[STATUS_ICONS_CHANGED], 0, icon, TRUE); + return; +} diff --git a/src/status-service-dbus.h b/src/status-service-dbus.h index 66c9206..34a9c3c 100644 --- a/src/status-service-dbus.h +++ b/src/status-service-dbus.h @@ -52,6 +52,7 @@ struct _StatusServiceDbus { }; GType status_service_dbus_get_type (void); +void status_service_dbus_set_status (StatusServiceDbus * self, const gchar * icon); G_END_DECLS diff --git a/src/status-service.c b/src/status-service.c index 3f25c4f..c1f06f5 100644 --- a/src/status-service.c +++ b/src/status-service.c @@ -84,6 +84,9 @@ status_update (void) { if (global_status != oldglobal) { g_debug("Global status changed to: %s", _(status_strings[global_status])); + + dbusmenu_menuitem_property_set(status_menuitem, "label", _(status_strings[global_status])); + status_service_dbus_set_status(dbus_interface, status_icons[global_status]); } return; @@ -175,7 +178,7 @@ build_menu (gpointer data) build_user_item(root); status_menuitem = dbusmenu_menuitem_new(); - dbusmenu_menuitem_property_set(status_menuitem, "label", "Status"); + dbusmenu_menuitem_property_set(status_menuitem, "label", _(status_strings[global_status])); dbusmenu_menuitem_child_append(root, status_menuitem); StatusProviderStatus i; -- cgit v1.2.3 From 255ccc8a16afc58cd56bca5880a706ac494c00ba Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 8 Aug 2009 06:33:22 -0600 Subject: Setting up signal handlers for the signal changing. We still ask everyone, they better cache a value :) --- src/status-service.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/status-service.c b/src/status-service.c index c1f06f5..0c7b7b2 100644 --- a/src/status-service.c +++ b/src/status-service.c @@ -138,8 +138,14 @@ build_providers (gpointer data) int i; for (i = 0; i < STATUS_PROVIDER_CNT; i++) { status_providers[i] = status_provider_newfuncs[i](); + + if (status_providers[i] != NULL) { + g_signal_connect(G_OBJECT(status_providers[i]), STATUS_PROVIDER_SIGNAL_STATUS_CHANGED, G_CALLBACK(status_update), NULL); + } } + status_update(); + return FALSE; } -- cgit v1.2.3 From 77c213e6d61847659df1271312e7398c696f9015 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 8 Aug 2009 06:46:28 -0600 Subject: Adding unistd.h header --- src/status-service.c | 1 + src/users-service.c | 1 + 2 files changed, 2 insertions(+) (limited to 'src') diff --git a/src/status-service.c b/src/status-service.c index 0c7b7b2..5a9d9b5 100644 --- a/src/status-service.c +++ b/src/status-service.c @@ -23,6 +23,7 @@ with this program. If not, see . #include #include +#include #include diff --git a/src/users-service.c b/src/users-service.c index a8a9c67..9ada91f 100644 --- a/src/users-service.c +++ b/src/users-service.c @@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#include #include -- cgit v1.2.3 From 07f10d43e04d0bd7b2e2f614416e43f7b5823f86 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 8 Aug 2009 06:47:27 -0600 Subject: Adding in -Wall and -Werror to things --- src/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index ab79f0f..39d360c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,7 @@ indicator_status_service_SOURCES = \ status-provider.c \ status-provider-pidgin.h \ status-provider-pidgin.c -indicator_status_service_CFLAGS = $(STATUSSERVICE_CFLAGS) +indicator_status_service_CFLAGS = $(STATUSSERVICE_CFLAGS) -Wall -Werror indicator_status_service_LDADD = $(STATUSSERVICE_LIBS) status-service-client.h: status-service.xml @@ -51,7 +51,7 @@ status-service-server.h: status-service.xml ############### indicator_users_service_SOURCES = users-service.c -indicator_users_service_CFLAGS = $(USERSSERVICE_CFLAGS) +indicator_users_service_CFLAGS = $(USERSSERVICE_CFLAGS) -Wall -Werror indicator_users_service_LDADD = $(USERSSERVICE_LIBS) ################# @@ -59,7 +59,7 @@ indicator_users_service_LDADD = $(USERSSERVICE_LIBS) ################# indicator_session_service_SOURCES = session-service.c -indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" +indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS) ############### -- cgit v1.2.3 From 4e06e6c3d31dbd3fdf23cbb5372f1d33fc09078b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 8 Aug 2009 06:47:51 -0600 Subject: Unused variable --- src/status-provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/status-provider.c b/src/status-provider.c index 1c9561b..83d44ac 100644 --- a/src/status-provider.c +++ b/src/status-provider.c @@ -43,7 +43,7 @@ G_DEFINE_TYPE (StatusProvider, status_provider, G_TYPE_OBJECT); static void status_provider_class_init (StatusProviderClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); + // GObjectClass *object_class = G_OBJECT_CLASS (klass); klass->status_changed = NULL; -- cgit v1.2.3 From 8f305c45c5993e38ca76261cbe4135a55b4cfa4d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 8 Aug 2009 06:48:06 -0600 Subject: Changing the icons to be singular for now. --- src/status-service.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/status-service.xml b/src/status-service.xml index 3807158..ba1f79f 100644 --- a/src/status-service.xml +++ b/src/status-service.xml @@ -7,7 +7,7 @@ - + @@ -18,7 +18,7 @@ - + -- cgit v1.2.3 From b3c64d972bbea808af72124e4b64005329292e4b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 8 Aug 2009 06:54:10 -0600 Subject: Changing the signal prototype to be strings instead of pointers. --- src/status-service-dbus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/status-service-dbus.c b/src/status-service-dbus.c index 2ac34af..09d2711 100644 --- a/src/status-service-dbus.c +++ b/src/status-service-dbus.c @@ -102,8 +102,8 @@ status_service_dbus_class_init (StatusServiceDbusClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(StatusServiceDbusClass, status_icons_changed), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, G_TYPE_POINTER); + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, G_TYPE_STRING); dbus_g_object_type_install_info(STATUS_SERVICE_DBUS_TYPE, &dbus_glib__status_service_server_object_info); -- cgit v1.2.3 From 5b09c56f508e40149d9a0bf52b491b0f9fd581ac Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 8 Aug 2009 09:08:33 -0600 Subject: Making dbus names valid, which is a little silly. --- src/dbus-shared-names.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h index 3ba21f8..9c828b1 100644 --- a/src/dbus-shared-names.h +++ b/src/dbus-shared-names.h @@ -26,7 +26,7 @@ with this program. If not, see . #define INDICATOR_STATUS_DBUS_NAME "org.ayatana.indicator.status" #define INDICATOR_STATUS_DBUS_OBJECT "/org/ayatana/indicator/status" -#define INDICATOR_STATUS_SERVICE_DBUS_OBJECT "/org/ayatana/indicator/status-service" +#define INDICATOR_STATUS_SERVICE_DBUS_OBJECT "/org/ayatana/indicator/statusservice" #define INDICATOR_USERS_DBUS_NAME "org.ayatana.indicator.users" #define INDICATOR_USERS_DBUS_OBJECT "/org/ayatana/indicator/users" -- cgit v1.2.3 From 839f57951591a4bf9d0ce4fd32b0c5b2d06bf73e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 8 Aug 2009 09:13:13 -0600 Subject: Showing the icon. Silly. --- src/indicator-sus.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/indicator-sus.c b/src/indicator-sus.c index e248e68..1ab810c 100644 --- a/src/indicator-sus.c +++ b/src/indicator-sus.c @@ -72,6 +72,7 @@ GtkImage * get_icon (void) { GtkImage * image = GTK_IMAGE(gtk_image_new_from_icon_name("user-offline", GTK_ICON_SIZE_MENU)); + gtk_widget_show(GTK_WIDGET(image)); return image; } -- cgit v1.2.3