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

Proposed by Charles Kerr on 2012-04-11
Status: Merged
Merged at revision: 230
Proposed branch: lp:~indicator-applet-developers/ubuntu/precise/indicator-messages/upstream
Merge into: lp:~ubuntu-desktop/indicator-messages/ubuntu
Diff against target: 119 lines (+38/-6)
6 files modified
ChangeLog (+24/-0)
configure (+1/-1)
configure.ac (+1/-1)
debian/changelog (+8/-0)
src/messages-service.c (+1/-1)
src/status-provider-mc5.c (+3/-3)
To merge this branch: bzr merge lp:~indicator-applet-developers/ubuntu/precise/indicator-messages/upstream
Reviewer Review Type Date Requested Status
Ken VanDine 2012-04-11 Pending
Review via email: mp+101600@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2012-04-05 17:21:03 +0000
+++ ChangeLog 2012-04-11 16:29:47 +0000
@@ -1,5 +1,29 @@
1# Generated by Makefile. Do not edit.1# Generated by Makefile. Do not edit.
22
32012-04-11 Charles Kerr <charles.kerr@canonical.com>
4
5 0.6.0
6
72012-04-10 Charles Kerr <charles.kerr@canonical.com>
8
9 merge lp:~larsu/indicator-messages/lp956147 to make the menu display a blank icon when appropriate
10
112012-04-10 Lars Uebernickel <lars.uebernickel@canonical.com>
12
13 Use "blank-icon" instead of "" to make the menu display a blank icon
14
152012-04-10 Lars Uebernickel <lars.uebernickel@canonical.com>
16
17 Revert fix for lp:956147, the same service binary is used for gtk2 and gk3 packages
18
192012-04-09 Charles Kerr <charles.kerr@canonical.com>
20
21 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.
22
232012-04-06 Ted Gould <ted@gould.cx>
24
25 Instead of using disconnected in MC5 use offline
26
32012-04-05 Charles Kerr <charles.kerr@canonical.com>272012-04-05 Charles Kerr <charles.kerr@canonical.com>
428
5 0.5.9529 0.5.95
630
=== modified file 'configure'
--- configure 2012-04-05 17:27:42 +0000
+++ configure 2012-04-11 16:29:47 +0000
@@ -3017,7 +3017,7 @@
30173017
3018# Define the identity of the package.3018# Define the identity of the package.
3019 PACKAGE=indicator-messages3019 PACKAGE=indicator-messages
3020 VERSION=0.5.953020 VERSION=0.6.0
30213021
30223022
3023cat >>confdefs.h <<_ACEOF3023cat >>confdefs.h <<_ACEOF
30243024
=== 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 @@
4AC_PREREQ(2.53)4AC_PREREQ(2.53)
55
6AM_CONFIG_HEADER(config.h)6AM_CONFIG_HEADER(config.h)
7AM_INIT_AUTOMAKE(indicator-messages, 0.5.95)7AM_INIT_AUTOMAKE(indicator-messages, 0.6.0)
88
9AM_MAINTAINER_MODE9AM_MAINTAINER_MODE
1010
1111
=== 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 @@
1indicator-messages (0.6.0-0ubuntu1~ppa1) precise; urgency=low
2
3 * New upstream release.
4 * Handle blank icons properly (LP: #956147)
5 * Fix telepathy offline/disconnected state bug
6
7 -- Charles Kerr <charles.kerr@canonical.com> Wed, 11 Apr 2012 11:09:46 -0500
8
1indicator-messages (0.5.95-0ubuntu1) precise; urgency=low9indicator-messages (0.5.95-0ubuntu1) precise; urgency=low
210
3 [ Charles Kerr ]11 [ Charles Kerr ]
412
=== 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 @@
664 g_debug("Application Shortcut added: %s", mi != NULL ? dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_LABEL) : "none");664 g_debug("Application Shortcut added: %s", mi != NULL ? dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_LABEL) : "none");
665 DbusmenuMenuitem * shell = DBUSMENU_MENUITEM(data);665 DbusmenuMenuitem * shell = DBUSMENU_MENUITEM(data);
666 if (mi != NULL) {666 if (mi != NULL) {
667 dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, "");667 dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, DBUSMENU_MENUITEM_ICON_NAME_BLANK);
668 dbusmenu_menuitem_child_append(shell, mi);668 dbusmenu_menuitem_child_append(shell, mi);
669 }669 }
670 resort_menu(shell);670 resort_menu(shell);
671671
=== 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 @@
137{137{
138 StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(self);138 StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(self);
139139
140 priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED;140 priv->status = STATUS_PROVIDER_STATUS_OFFLINE;
141 priv->manager = NULL;141 priv->manager = NULL;
142142
143 DBusGConnection * bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);143 DBusGConnection * bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
@@ -219,7 +219,7 @@
219 priv->manager = NULL;219 priv->manager = NULL;
220 }220 }
221221
222 priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED;222 priv->status = STATUS_PROVIDER_STATUS_OFFLINE;
223 g_signal_emit(G_OBJECT(self), STATUS_PROVIDER_SIGNAL_STATUS_CHANGED_ID, 0, priv->status, TRUE);223 g_signal_emit(G_OBJECT(self), STATUS_PROVIDER_SIGNAL_STATUS_CHANGED_ID, 0, priv->status, TRUE);
224 }224 }
225225
@@ -282,7 +282,7 @@
282 StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(sp);282 StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(sp);
283283
284 if (priv->manager == NULL) {284 if (priv->manager == NULL) {
285 return STATUS_PROVIDER_STATUS_DISCONNECTED;285 return STATUS_PROVIDER_STATUS_OFFLINE;
286 }286 }
287287
288 return priv->status;288 return priv->status;

Subscribers

People subscribed via source and target branches