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
1=== modified file 'ChangeLog'
2--- ChangeLog 2012-04-05 17:21:03 +0000
3+++ ChangeLog 2012-04-11 16:29:47 +0000
4@@ -1,5 +1,29 @@
5 # Generated by Makefile. Do not edit.
6
7+2012-04-11 Charles Kerr <charles.kerr@canonical.com>
8+
9+ 0.6.0
10+
11+2012-04-10 Charles Kerr <charles.kerr@canonical.com>
12+
13+ merge lp:~larsu/indicator-messages/lp956147 to make the menu display a blank icon when appropriate
14+
15+2012-04-10 Lars Uebernickel <lars.uebernickel@canonical.com>
16+
17+ Use "blank-icon" instead of "" to make the menu display a blank icon
18+
19+2012-04-10 Lars Uebernickel <lars.uebernickel@canonical.com>
20+
21+ Revert fix for lp:956147, the same service binary is used for gtk2 and gk3 packages
22+
23+2012-04-09 Charles Kerr <charles.kerr@canonical.com>
24+
25+ 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.
26+
27+2012-04-06 Ted Gould <ted@gould.cx>
28+
29+ Instead of using disconnected in MC5 use offline
30+
31 2012-04-05 Charles Kerr <charles.kerr@canonical.com>
32
33 0.5.95
34
35=== modified file 'configure'
36--- configure 2012-04-05 17:27:42 +0000
37+++ configure 2012-04-11 16:29:47 +0000
38@@ -3017,7 +3017,7 @@
39
40 # Define the identity of the package.
41 PACKAGE=indicator-messages
42- VERSION=0.5.95
43+ VERSION=0.6.0
44
45
46 cat >>confdefs.h <<_ACEOF
47
48=== modified file 'configure.ac'
49--- configure.ac 2012-04-05 17:06:21 +0000
50+++ configure.ac 2012-04-11 16:29:47 +0000
51@@ -4,7 +4,7 @@
52 AC_PREREQ(2.53)
53
54 AM_CONFIG_HEADER(config.h)
55-AM_INIT_AUTOMAKE(indicator-messages, 0.5.95)
56+AM_INIT_AUTOMAKE(indicator-messages, 0.6.0)
57
58 AM_MAINTAINER_MODE
59
60
61=== modified file 'debian/changelog'
62--- debian/changelog 2012-04-05 20:47:57 +0000
63+++ debian/changelog 2012-04-11 16:29:47 +0000
64@@ -1,3 +1,11 @@
65+indicator-messages (0.6.0-0ubuntu1~ppa1) precise; urgency=low
66+
67+ * New upstream release.
68+ * Handle blank icons properly (LP: #956147)
69+ * Fix telepathy offline/disconnected state bug
70+
71+ -- Charles Kerr <charles.kerr@canonical.com> Wed, 11 Apr 2012 11:09:46 -0500
72+
73 indicator-messages (0.5.95-0ubuntu1) precise; urgency=low
74
75 [ Charles Kerr ]
76
77=== modified file 'src/messages-service.c'
78--- src/messages-service.c 2012-04-05 20:47:57 +0000
79+++ src/messages-service.c 2012-04-11 16:29:47 +0000
80@@ -664,7 +664,7 @@
81 g_debug("Application Shortcut added: %s", mi != NULL ? dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_LABEL) : "none");
82 DbusmenuMenuitem * shell = DBUSMENU_MENUITEM(data);
83 if (mi != NULL) {
84- dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, "");
85+ dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, DBUSMENU_MENUITEM_ICON_NAME_BLANK);
86 dbusmenu_menuitem_child_append(shell, mi);
87 }
88 resort_menu(shell);
89
90=== modified file 'src/status-provider-mc5.c'
91--- src/status-provider-mc5.c 2011-07-02 12:15:22 +0000
92+++ src/status-provider-mc5.c 2012-04-11 16:29:47 +0000
93@@ -137,7 +137,7 @@
94 {
95 StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(self);
96
97- priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED;
98+ priv->status = STATUS_PROVIDER_STATUS_OFFLINE;
99 priv->manager = NULL;
100
101 DBusGConnection * bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
102@@ -219,7 +219,7 @@
103 priv->manager = NULL;
104 }
105
106- priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED;
107+ priv->status = STATUS_PROVIDER_STATUS_OFFLINE;
108 g_signal_emit(G_OBJECT(self), STATUS_PROVIDER_SIGNAL_STATUS_CHANGED_ID, 0, priv->status, TRUE);
109 }
110
111@@ -282,7 +282,7 @@
112 StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(sp);
113
114 if (priv->manager == NULL) {
115- return STATUS_PROVIDER_STATUS_DISCONNECTED;
116+ return STATUS_PROVIDER_STATUS_OFFLINE;
117 }
118
119 return priv->status;

Subscribers

People subscribed via source and target branches