From 51ecaad4b544f3ba4b757c7ebc31d5c10b8b3689 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Oct 2009 14:31:05 -0400 Subject: Use the shutdown icon in the disconnected state. --- src/status-service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/status-service.c b/src/status-service.c index a448ada..fc4e535 100644 --- a/src/status-service.c +++ b/src/status-service.c @@ -68,7 +68,7 @@ static const gchar * status_icons[STATUS_PROVIDER_STATUS_LAST] = { /* STATUS_PROVIDER_STATUS_DND, */ "user-busy", /* STATUS_PROVIDER_STATUS_INVISIBLE, */ "user-invisible", /* STATUS_PROVIDER_STATUS_OFFLINE */ "user-offline", - /* STATUS_PROVIDER_STATUS_DISCONNECTED */"user-offline" + /* STATUS_PROVIDER_STATUS_DISCONNECTED */"system-shutdown" }; -- cgit v1.2.3 From 5763f8c1c49af3c2435ee8b43fc4625eceb8b13f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Oct 2009 14:38:51 -0400 Subject: Setting the default icon as well. --- src/indicator-session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/indicator-session.c b/src/indicator-session.c index a4bb5e1..ef80033 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -76,8 +76,8 @@ get_label (void) GtkImage * get_icon (void) { - g_debug("Changing status icon: '%s'", "user-offline"); - status_image = GTK_IMAGE(gtk_image_new_from_icon_name("user-offline", GTK_ICON_SIZE_MENU)); + g_debug("Changing status icon: '%s'", "system-shutdown"); + status_image = GTK_IMAGE(gtk_image_new_from_icon_name("system-shutdown", GTK_ICON_SIZE_MENU)); gtk_widget_show(GTK_WIDGET(status_image)); return status_image; } -- cgit v1.2.3 From 74996e1b74e945ff90f9dfad68375e0b6f3a84d9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Oct 2009 15:01:54 -0400 Subject: Making it so that the manager only gets created if the status is set. --- src/status-provider-mc5.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/status-provider-mc5.c b/src/status-provider-mc5.c index 813ce3e..671e459 100644 --- a/src/status-provider-mc5.c +++ b/src/status-provider-mc5.c @@ -113,8 +113,8 @@ status_provider_mc5_init (StatusProviderMC5 *self) { StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(self); - priv->status = STATUS_PROVIDER_STATUS_OFFLINE; - priv->manager = EMPATHY_ACCOUNT_MANAGER(g_object_new(EMPATHY_TYPE_ACCOUNT_MANAGER, NULL)); + priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED; + priv->manager = NULL; g_signal_connect(G_OBJECT(priv->manager), "global-presence-changed", G_CALLBACK(presence_changed), self); @@ -169,8 +169,7 @@ set_status (StatusProvider * sp, StatusProviderStatus status) { StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(sp); if (priv->manager == NULL) { - priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED; - return; + priv->manager = EMPATHY_ACCOUNT_MANAGER(g_object_new(EMPATHY_TYPE_ACCOUNT_MANAGER, NULL)); } empathy_account_manager_request_global_presence(priv->manager, sp_to_tp_map[status], sp_to_mc_map[status], ""); -- cgit v1.2.3 From 7ffa07052dc783b5c49a006cc1a8d8ef03c08d9d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Oct 2009 17:34:05 -0400 Subject: Changing the icon name in the code. --- src/indicator-session.c | 4 ++-- src/status-service.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/indicator-session.c b/src/indicator-session.c index ef80033..197bd2f 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -76,8 +76,8 @@ get_label (void) GtkImage * get_icon (void) { - g_debug("Changing status icon: '%s'", "system-shutdown"); - status_image = GTK_IMAGE(gtk_image_new_from_icon_name("system-shutdown", GTK_ICON_SIZE_MENU)); + g_debug("Changing status icon: '%s'", "indicator-system-shutdown"); + status_image = GTK_IMAGE(gtk_image_new_from_icon_name("indicator-system-shutdown", GTK_ICON_SIZE_MENU)); gtk_widget_show(GTK_WIDGET(status_image)); return status_image; } diff --git a/src/status-service.c b/src/status-service.c index fc4e535..b49913c 100644 --- a/src/status-service.c +++ b/src/status-service.c @@ -68,7 +68,7 @@ static const gchar * status_icons[STATUS_PROVIDER_STATUS_LAST] = { /* STATUS_PROVIDER_STATUS_DND, */ "user-busy", /* STATUS_PROVIDER_STATUS_INVISIBLE, */ "user-invisible", /* STATUS_PROVIDER_STATUS_OFFLINE */ "user-offline", - /* STATUS_PROVIDER_STATUS_DISCONNECTED */"system-shutdown" + /* STATUS_PROVIDER_STATUS_DISCONNECTED */"indicator-system-shutdown" }; -- cgit v1.2.3 From 7bb2c92d05bac11fecb30d744632f4d581903fbb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Oct 2009 18:51:09 -0400 Subject: Changing icon name again. This is probably better WRT the icon naming spec. --- src/indicator-session.c | 4 ++-- src/status-service.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/indicator-session.c b/src/indicator-session.c index 197bd2f..62f3941 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -76,8 +76,8 @@ get_label (void) GtkImage * get_icon (void) { - g_debug("Changing status icon: '%s'", "indicator-system-shutdown"); - status_image = GTK_IMAGE(gtk_image_new_from_icon_name("indicator-system-shutdown", GTK_ICON_SIZE_MENU)); + g_debug("Changing status icon: '%s'", "system-shutdown-panel"); + status_image = GTK_IMAGE(gtk_image_new_from_icon_name("system-shutdown-panel", GTK_ICON_SIZE_MENU)); gtk_widget_show(GTK_WIDGET(status_image)); return status_image; } diff --git a/src/status-service.c b/src/status-service.c index b49913c..e3a9684 100644 --- a/src/status-service.c +++ b/src/status-service.c @@ -68,7 +68,7 @@ static const gchar * status_icons[STATUS_PROVIDER_STATUS_LAST] = { /* STATUS_PROVIDER_STATUS_DND, */ "user-busy", /* STATUS_PROVIDER_STATUS_INVISIBLE, */ "user-invisible", /* STATUS_PROVIDER_STATUS_OFFLINE */ "user-offline", - /* STATUS_PROVIDER_STATUS_DISCONNECTED */"indicator-system-shutdown" + /* STATUS_PROVIDER_STATUS_DISCONNECTED */"system-shutdown-panel" }; -- cgit v1.2.3