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(-) 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 fb0944b211fc298684bcc872c7c8102d35573285 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Oct 2009 14:35:36 -0400 Subject: releasing version 0.1.6-0ubuntu1~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c491d9d..7ffe071 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-session (0.1.6-0ubuntu1~ppa2) UNRELEASED; urgency=low +indicator-session (0.1.6-0ubuntu1~ppa2) karmic; urgency=low * Stupid, stupid, icon stuff - -- Ted Gould Tue, 06 Oct 2009 14:34:12 -0400 + -- Ted Gould Tue, 06 Oct 2009 14:35:34 -0400 indicator-session (0.1.6-0ubuntu1~ppa1) karmic; urgency=low -- 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(-) 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(-) 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 fba2cd7a0447689a20f128c80287ac37391e3c08 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Oct 2009 15:22:09 -0400 Subject: releasing version 0.1.6-0ubuntu1~ppa4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7602e90..f4411d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-session (0.1.6-0ubuntu1~ppa4) UNRELEASED; urgency=low +indicator-session (0.1.6-0ubuntu1~ppa4) karmic; urgency=low * Making it so that the Empathy account manager doesn't start unless you set the status. - -- Ted Gould Tue, 06 Oct 2009 15:20:43 -0400 + -- Ted Gould Tue, 06 Oct 2009 15:22:07 -0400 indicator-session (0.1.6-0ubuntu1~ppa3) karmic; urgency=low -- cgit v1.2.3 From df23d93731a05db7daa1abb34893f5cb5221c7b8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Oct 2009 17:32:12 -0400 Subject: Adding a new icon 'indicator-system-shutdown' --- data/icons/16x16/actions/Makefile.am | 1 + .../16x16/actions/indicator-system-shutdown.png | Bin 0 -> 699 bytes data/icons/22x22/actions/Makefile.am | 1 + .../22x22/actions/indicator-system-shutdown.png | Bin 0 -> 1339 bytes data/icons/24x24/actions/Makefile.am | 1 + .../24x24/actions/indicator-system-shutdown.png | Bin 0 -> 1355 bytes data/icons/scalable/actions/Makefile.am | 1 + .../scalable/actions/indicator-system-shutdown.svg | 247 +++++++++++++++++++++ 8 files changed, 251 insertions(+) create mode 100644 data/icons/16x16/actions/indicator-system-shutdown.png create mode 100644 data/icons/22x22/actions/indicator-system-shutdown.png create mode 100644 data/icons/24x24/actions/indicator-system-shutdown.png create mode 100644 data/icons/scalable/actions/indicator-system-shutdown.svg diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am index 5aa276c..da8d5c2 100644 --- a/data/icons/16x16/actions/Makefile.am +++ b/data/icons/16x16/actions/Makefile.am @@ -2,6 +2,7 @@ iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/actions icons_DATA = \ + indicator-system-shutdown.png \ system-shutdown.png \ system-restart.png \ system-log-out.png diff --git a/data/icons/16x16/actions/indicator-system-shutdown.png b/data/icons/16x16/actions/indicator-system-shutdown.png new file mode 100644 index 0000000..ef69a83 Binary files /dev/null and b/data/icons/16x16/actions/indicator-system-shutdown.png differ diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am index 73cdd09..40e243e 100644 --- a/data/icons/22x22/actions/Makefile.am +++ b/data/icons/22x22/actions/Makefile.am @@ -2,6 +2,7 @@ iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/actions icons_DATA = \ + indicator-system-shutdown.png \ system-shutdown.png \ system-restart.png \ system-log-out.png diff --git a/data/icons/22x22/actions/indicator-system-shutdown.png b/data/icons/22x22/actions/indicator-system-shutdown.png new file mode 100644 index 0000000..aef0e91 Binary files /dev/null and b/data/icons/22x22/actions/indicator-system-shutdown.png differ diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am index 55c63d1..8bd940b 100644 --- a/data/icons/24x24/actions/Makefile.am +++ b/data/icons/24x24/actions/Makefile.am @@ -2,6 +2,7 @@ iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/actions icons_DATA = \ + indicator-system-shutdown.png \ system-shutdown.png \ system-restart.png \ system-log-out.png diff --git a/data/icons/24x24/actions/indicator-system-shutdown.png b/data/icons/24x24/actions/indicator-system-shutdown.png new file mode 100644 index 0000000..c1cca10 Binary files /dev/null and b/data/icons/24x24/actions/indicator-system-shutdown.png differ diff --git a/data/icons/scalable/actions/Makefile.am b/data/icons/scalable/actions/Makefile.am index 39b4177..e6dd384 100644 --- a/data/icons/scalable/actions/Makefile.am +++ b/data/icons/scalable/actions/Makefile.am @@ -2,6 +2,7 @@ iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/actions icons_DATA = \ + indicator-system-shutdown.svg \ system-restart.svg \ system-log-out.svg \ system-shutdown.svg diff --git a/data/icons/scalable/actions/indicator-system-shutdown.svg b/data/icons/scalable/actions/indicator-system-shutdown.svg new file mode 100644 index 0000000..fc60baf --- /dev/null +++ b/data/icons/scalable/actions/indicator-system-shutdown.svg @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Shutdown + + + Jakub Steiner + + + + http://jimmac.musichall.cz + + + lock + key + secure + + + + + + + + + + + + + + + + + + + + + + -- 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(-) 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 06e6a3c279b5d7faea9e4e77781b9493c294bade Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Oct 2009 17:35:46 -0400 Subject: releasing version 0.1.6-0ubuntu1~ppa5 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8074319..c176485 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-session (0.1.6-0ubuntu1~ppa5) UNRELEASED; urgency=low +indicator-session (0.1.6-0ubuntu1~ppa5) karmic; urgency=low * Adding in a new icon name as apparently adding the icon wasn't good enough. - -- Ted Gould Tue, 06 Oct 2009 17:34:26 -0400 + -- Ted Gould Tue, 06 Oct 2009 17:35:44 -0400 indicator-session (0.1.6-0ubuntu1~ppa4) karmic; urgency=low -- 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. --- data/icons/16x16/actions/Makefile.am | 2 +- .../16x16/actions/indicator-system-shutdown.png | Bin 699 -> 0 bytes data/icons/16x16/actions/system-shutdown-panel.png | Bin 0 -> 699 bytes data/icons/22x22/actions/Makefile.am | 2 +- .../22x22/actions/indicator-system-shutdown.png | Bin 1339 -> 0 bytes data/icons/22x22/actions/system-shutdown-panel.png | Bin 0 -> 1339 bytes data/icons/24x24/actions/Makefile.am | 2 +- .../24x24/actions/indicator-system-shutdown.png | Bin 1355 -> 0 bytes data/icons/24x24/actions/system-shutdown-panel.png | Bin 0 -> 1355 bytes data/icons/scalable/actions/Makefile.am | 2 +- .../scalable/actions/indicator-system-shutdown.svg | 247 --------------------- .../scalable/actions/system-shutdown-panel.svg | 247 +++++++++++++++++++++ src/indicator-session.c | 4 +- src/status-service.c | 2 +- 14 files changed, 254 insertions(+), 254 deletions(-) delete mode 100644 data/icons/16x16/actions/indicator-system-shutdown.png create mode 100644 data/icons/16x16/actions/system-shutdown-panel.png delete mode 100644 data/icons/22x22/actions/indicator-system-shutdown.png create mode 100644 data/icons/22x22/actions/system-shutdown-panel.png delete mode 100644 data/icons/24x24/actions/indicator-system-shutdown.png create mode 100644 data/icons/24x24/actions/system-shutdown-panel.png delete mode 100644 data/icons/scalable/actions/indicator-system-shutdown.svg create mode 100644 data/icons/scalable/actions/system-shutdown-panel.svg diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am index da8d5c2..417ab60 100644 --- a/data/icons/16x16/actions/Makefile.am +++ b/data/icons/16x16/actions/Makefile.am @@ -2,7 +2,7 @@ iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/actions icons_DATA = \ - indicator-system-shutdown.png \ + system-shutdown-panel.png \ system-shutdown.png \ system-restart.png \ system-log-out.png diff --git a/data/icons/16x16/actions/indicator-system-shutdown.png b/data/icons/16x16/actions/indicator-system-shutdown.png deleted file mode 100644 index ef69a83..0000000 Binary files a/data/icons/16x16/actions/indicator-system-shutdown.png and /dev/null differ diff --git a/data/icons/16x16/actions/system-shutdown-panel.png b/data/icons/16x16/actions/system-shutdown-panel.png new file mode 100644 index 0000000..ef69a83 Binary files /dev/null and b/data/icons/16x16/actions/system-shutdown-panel.png differ diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am index 40e243e..029ad1c 100644 --- a/data/icons/22x22/actions/Makefile.am +++ b/data/icons/22x22/actions/Makefile.am @@ -2,7 +2,7 @@ iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/actions icons_DATA = \ - indicator-system-shutdown.png \ + system-shutdown-panel.png \ system-shutdown.png \ system-restart.png \ system-log-out.png diff --git a/data/icons/22x22/actions/indicator-system-shutdown.png b/data/icons/22x22/actions/indicator-system-shutdown.png deleted file mode 100644 index aef0e91..0000000 Binary files a/data/icons/22x22/actions/indicator-system-shutdown.png and /dev/null differ diff --git a/data/icons/22x22/actions/system-shutdown-panel.png b/data/icons/22x22/actions/system-shutdown-panel.png new file mode 100644 index 0000000..aef0e91 Binary files /dev/null and b/data/icons/22x22/actions/system-shutdown-panel.png differ diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am index 8bd940b..aebdf14 100644 --- a/data/icons/24x24/actions/Makefile.am +++ b/data/icons/24x24/actions/Makefile.am @@ -2,7 +2,7 @@ iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/actions icons_DATA = \ - indicator-system-shutdown.png \ + system-shutdown-panel.png \ system-shutdown.png \ system-restart.png \ system-log-out.png diff --git a/data/icons/24x24/actions/indicator-system-shutdown.png b/data/icons/24x24/actions/indicator-system-shutdown.png deleted file mode 100644 index c1cca10..0000000 Binary files a/data/icons/24x24/actions/indicator-system-shutdown.png and /dev/null differ diff --git a/data/icons/24x24/actions/system-shutdown-panel.png b/data/icons/24x24/actions/system-shutdown-panel.png new file mode 100644 index 0000000..c1cca10 Binary files /dev/null and b/data/icons/24x24/actions/system-shutdown-panel.png differ diff --git a/data/icons/scalable/actions/Makefile.am b/data/icons/scalable/actions/Makefile.am index e6dd384..26ee574 100644 --- a/data/icons/scalable/actions/Makefile.am +++ b/data/icons/scalable/actions/Makefile.am @@ -2,7 +2,7 @@ iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/actions icons_DATA = \ - indicator-system-shutdown.svg \ + system-shutdown-panel.svg \ system-restart.svg \ system-log-out.svg \ system-shutdown.svg diff --git a/data/icons/scalable/actions/indicator-system-shutdown.svg b/data/icons/scalable/actions/indicator-system-shutdown.svg deleted file mode 100644 index fc60baf..0000000 --- a/data/icons/scalable/actions/indicator-system-shutdown.svg +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Shutdown - - - Jakub Steiner - - - - http://jimmac.musichall.cz - - - lock - key - secure - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/scalable/actions/system-shutdown-panel.svg b/data/icons/scalable/actions/system-shutdown-panel.svg new file mode 100644 index 0000000..fc60baf --- /dev/null +++ b/data/icons/scalable/actions/system-shutdown-panel.svg @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Shutdown + + + Jakub Steiner + + + + http://jimmac.musichall.cz + + + lock + key + secure + + + + + + + + + + + + + + + + + + + + + + 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 From 04c5f5f83568ceca6dd178179bb1168c308f8c03 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Oct 2009 18:54:13 -0400 Subject: releasing version 0.1.6-0ubuntu1~ppa6 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 875ad97..ccff741 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-session (0.1.6-0ubuntu1~ppa6) UNRELEASED; urgency=low +indicator-session (0.1.6-0ubuntu1~ppa6) karmic; urgency=low * New icon name. - -- Ted Gould Tue, 06 Oct 2009 18:52:42 -0400 + -- Ted Gould Tue, 06 Oct 2009 18:54:11 -0400 indicator-session (0.1.6-0ubuntu1~ppa5) karmic; urgency=low -- cgit v1.2.3 From 8ec71fe8283925d4fb4dd0f59767d1c2eba75451 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 10:45:29 -0400 Subject: Better ignore --- .bzrignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.bzrignore b/.bzrignore index 8c2c2c7..0a49cb4 100644 --- a/.bzrignore +++ b/.bzrignore @@ -47,3 +47,10 @@ src/status-provider-telepathy-marshal.h src/status-provider-mc5-marshal.c src/status-provider-mc5-marshal.h data/indicator-session.schemas +src/users-service-client.h +src/users-service-marshal.c +src/users-service-marshal.h +indicator-session-[0-9].[0-9].[0-9].tar.gz +indicator-session-[0-9].[0-9].tar.gz +indicator-session-[0-9].[0-9].[0-9].tar.gz.asc +indicator-session-[0-9].[0-9].tar.gz.asc -- cgit v1.2.3