Import upstream version 0.6.0

5 files changed, 30 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 03614f8..894568c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,29 @@
 # Generated by Makefile. Do not edit.
 
+2012-04-11  Charles Kerr  <charles.kerr@canonical.com>
+
+	0.6.0
+
+2012-04-10  Charles Kerr  <charles.kerr@canonical.com>
+
+	merge lp:~larsu/indicator-messages/lp956147 to make the menu display a blank icon when appropriate
+
+2012-04-10  Lars Uebernickel  <lars.uebernickel@canonical.com>
+
+	Use "blank-icon" instead of "" to make the menu display a blank icon
+
+2012-04-10  Lars Uebernickel  <lars.uebernickel@canonical.com>
+
+	Revert fix for lp:956147, the same service binary is used for gtk2 and gk3 packages
+
+2012-04-09  Charles Kerr  <charles.kerr@canonical.com>
+
+	merge lp:~ted/indicator-messages/telepathy-offline to make it so that when your session launches you're offline instead of disconnected. That way the items are visible and you can go online.
+
+2012-04-06  Ted Gould  <ted@gould.cx>
+
+	Instead of using disconnected in MC5 use offline
+
 2012-04-05  Charles Kerr  <charles.kerr@canonical.com>
 
 	0.5.95
diff --git a/configure b/configure
index fd58995..1a2dfd4 100755
--- a/configure
+++ b/configure
@@ -3017,7 +3017,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-messages
- VERSION=0.5.95
+ VERSION=0.6.0
 
 
 cat >>confdefs.h <<_ACEOF
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
 
diff --git a/src/messages-service.c b/src/messages-service.c
index 8e85da2..078cee3 100644
--- a/src/messages-service.c
+++ b/src/messages-service.c
@@ -29,7 +29,6 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <libindicator/indicator-service.h>
 #include <gio/gio.h>
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
 #include <libdbusmenu-glib/client.h>
 #include <libdbusmenu-glib/server.h>
@@ -665,9 +664,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_property_set (mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, DBUSMENU_MENUITEM_ICON_NAME_BLANK);
 		dbusmenu_menuitem_child_append(shell, mi);
 	}
 	resort_menu(shell);
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;