From b480c247e62e6e078afc7997922ac7d1a757bcb4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 6 Apr 2012 12:55:54 -0500 Subject: Instead of using disconnected in MC5 use offline --- src/status-provider-mc5.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/status-provider-mc5.c b/src/status-provider-mc5.c index e70496c..3f23565 100644 --- a/src/status-provider-mc5.c +++ b/src/status-provider-mc5.c @@ -137,7 +137,7 @@ status_provider_mc5_init (StatusProviderMC5 *self) { StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(self); - priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED; + priv->status = STATUS_PROVIDER_STATUS_OFFLINE; priv->manager = NULL; DBusGConnection * bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); @@ -219,7 +219,7 @@ dbus_namechange (DBusGProxy * proxy, const gchar * name, const gchar * prev, con priv->manager = NULL; } - priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED; + priv->status = STATUS_PROVIDER_STATUS_OFFLINE; g_signal_emit(G_OBJECT(self), STATUS_PROVIDER_SIGNAL_STATUS_CHANGED_ID, 0, priv->status, TRUE); } @@ -282,7 +282,7 @@ get_status (StatusProvider * sp) StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(sp); if (priv->manager == NULL) { - return STATUS_PROVIDER_STATUS_DISCONNECTED; + return STATUS_PROVIDER_STATUS_OFFLINE; } return priv->status; -- cgit v1.2.3 From 6c831abfb2346403915b1b641b6fdaca17ed2c6f Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 10 Apr 2012 18:06:41 +0200 Subject: Revert fix for lp:956147, the same service binary is used for gtk2 and gk3 packages --- src/messages-service.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/messages-service.c b/src/messages-service.c index 8f636b5..c975df1 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -29,7 +29,6 @@ with this program. If not, see . #include #include #include -#include #include #include @@ -621,9 +620,7 @@ server_shortcut_added (AppMenuItem * appitem, DbusmenuMenuitem * mi, gpointer da g_debug("Application Shortcut added: %s", mi != NULL ? dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_LABEL) : "none"); DbusmenuMenuitem * shell = DBUSMENU_MENUITEM(data); if (mi != NULL) { -#if GTK_CHECK_VERSION(3, 0, 0) dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, ""); -#endif dbusmenu_menuitem_child_append(shell, mi); } resort_menu(shell); -- cgit v1.2.3 From 89a4ee8235ec7c64a9667885d6f2542bb02bb6a8 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 10 Apr 2012 18:09:00 +0200 Subject: Use "blank-icon" instead of "" to make the menu display a blank icon --- src/messages-service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/messages-service.c b/src/messages-service.c index c975df1..4df5d1a 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -620,7 +620,7 @@ server_shortcut_added (AppMenuItem * appitem, DbusmenuMenuitem * mi, gpointer da g_debug("Application Shortcut added: %s", mi != NULL ? dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_LABEL) : "none"); DbusmenuMenuitem * shell = DBUSMENU_MENUITEM(data); if (mi != NULL) { - dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, ""); + dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, "blank-icon"); dbusmenu_menuitem_child_append(shell, mi); } resort_menu(shell); -- cgit v1.2.3 From b4f82a39f26fae8c72f02d717141df87bc866058 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 11 Apr 2012 11:00:45 -0500 Subject: 0.6.0 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3c8552c..6d286bb 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-messages.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.5.95) +AM_INIT_AUTOMAKE(indicator-messages, 0.6.0) AM_MAINTAINER_MODE -- cgit v1.2.3