Merge lp:~indicator-applet-developers/ubuntu/precise/indicator-messages/upstream into lp:~ubuntu-desktop/indicator-messages/ubuntu

[Charles Kerr]

=== modified file 'ChangeLog'
--- ChangeLog	2012-04-05 17:21:03 +0000
+++ ChangeLog	2012-04-11 16:29:47 +0000
@@ -1,5 +1,29 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Charles Kerr  <[e-mail]>
+
+	0.6.0
+
[phone]  Charles Kerr  <[e-mail]>
+
+	merge lp:~larsu/indicator-messages/lp956147 to make the menu display a blank icon when appropriate
+
[phone]  Lars Uebernickel  <[e-mail]>
+
+	Use "blank-icon" instead of "" to make the menu display a blank icon
+
[phone]  Lars Uebernickel  <[e-mail]>
+
+	Revert fix for lp:956147, the same service binary is used for gtk2 and gk3 packages
+
[phone]  Charles Kerr  <[e-mail]>
+
+	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.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Instead of using disconnected in MC5 use offline
+
 2012-04-05  Charles Kerr  <[e-mail]>
 
 	0.5.95
 
=== modified file 'configure'
--- configure	2012-04-05 17:27:42 +0000
+++ configure	2012-04-11 16:29:47 +0000
@@ -3017,7 +3017,7 @@
 
 # Define the identity of the package.
  PACKAGE=indicator-messages
- VERSION=0.5.95
+ VERSION=0.6.0
 
 
 cat >>confdefs.h <<_ACEOF
 
=== modified file 'configure.ac'
--- configure.ac	2012-04-05 17:06:21 +0000
+++ configure.ac	2012-04-11 16:29:47 +0000
@@ -4,7 +4,7 @@
 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
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-04-05 20:47:57 +0000
+++ debian/changelog	2012-04-11 16:29:47 +0000
@@ -1,3 +1,11 @@
+indicator-messages (0.6.0-0ubuntu1~ppa1) precise; urgency=low
+
+  * New upstream release.
+    * Handle blank icons properly (LP: #956147)
+    * Fix telepathy offline/disconnected state bug 
+
+ -- Charles Kerr <[e-mail]>  Wed, 11 Apr 2012 11:09:46 -0500
+
 indicator-messages (0.5.95-0ubuntu1) precise; urgency=low
 
   [ Charles Kerr ]
 
=== modified file 'src/messages-service.c'
--- src/messages-service.c	2012-04-05 20:47:57 +0000
+++ src/messages-service.c	2012-04-11 16:29:47 +0000
@@ -664,7 +664,7 @@
 	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, DBUSMENU_MENUITEM_ICON_NAME_BLANK);
 		dbusmenu_menuitem_child_append(shell, mi);
 	}
 	resort_menu(shell);
 
=== modified file 'src/status-provider-mc5.c'
--- src/status-provider-mc5.c	2011-07-02 12:15:22 +0000
+++ src/status-provider-mc5.c	2012-04-11 16:29:47 +0000
@@ -137,7 +137,7 @@
 {
 	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 @@
 			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 @@
 	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;