Messaging Menu

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

  1. ubuntu
  2. Merge into ubuntu
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~indicator-applet-developers/indicator-messages/ubuntu
Merge into: lp:~ubuntu-desktop/indicator-messages/ubuntu
Diff against target: 157 lines (+46/-12)
7 files modified
configure.ac (+2/-2)
debian/changelog (+34/-0)
debian/control (+2/-2)
src/im-menu-item.c (+1/-1)
src/indicator-messages.c (+4/-4)
src/launcher-menu-item.c (+1/-1)
src/messages-service.c (+2/-2)
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-messages/ubuntu
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+17034@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Release 0.3.0

lp:~indicator-applet-developers/indicator-messages/ubuntu updated
186. By Ted Gould

Merging in ubuntu-desktop branch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2009-11-06 04:33:59 +0000
3+++ configure.ac 2010-01-08 18:15:24 +0000
4@@ -4,7 +4,7 @@
5 AC_PREREQ(2.53)
6
7 AM_CONFIG_HEADER(config.h)
8-AM_INIT_AUTOMAKE(indicator-messages, 0.2.6)
9+AM_INIT_AUTOMAKE(indicator-messages, 0.3.0)
10
11 AM_MAINTAINER_MODE
12
13@@ -31,7 +31,7 @@
14 PANEL_REQUIRED_VERSION=2.0.0
15 INDICATE_REQUIRED_VERSION=0.2.0
16 INDICATOR_REQUIRED_VERSION=0.3.0
17-DBUSMENUGTK_REQUIRED_VERSION=0.1.1
18+DBUSMENUGTK_REQUIRED_VERSION=0.2.0
19
20 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
21 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
22
23=== modified file 'debian/changelog'
24--- debian/changelog 2009-12-15 16:58:16 +0000
25+++ debian/changelog 2010-01-08 18:15:24 +0000
26@@ -1,3 +1,37 @@
27+indicator-messages (0.3.0-0ubuntu1~ppa1) karmic; urgency=low
28+
29+ * Upstream release 0.3.0
30+
31+ -- Ted Gould <ted@ubuntu.com> Fri, 08 Jan 2010 12:05:25 -0600
32+
33+indicator-messages (0.3.0~dev-0ubuntu1~ppa3) karmic; urgency=low
34+
35+ * Upgrading to dbusmenu 0.2.0
36+ * debian/control: Updating dbusmenu dependency to 0.2.0~dev
37+
38+ -- Ted Gould <ted@ubuntu.com> Tue, 22 Dec 2009 14:49:49 -0600
39+
40+indicator-messages (0.3.0~dev-0ubuntu1~ppa2) karmic; urgency=low
41+
42+ * Disabling static builds.
43+
44+ -- Ted Gould <ted@ubuntu.com> Mon, 16 Nov 2009 11:44:37 -0600
45+
46+indicator-messages (0.3.0~dev-0ubuntu1~ppa1) karmic; urgency=low
47+
48+ * Porting to libindicator 0.3.0
49+ * debian/control: Increasing libindicator-dev dependency to
50+ 0.3.0~dev
51+
52+ -- Ted Gould <ted@ubuntu.com> Thu, 05 Nov 2009 09:30:58 -0600
53+
54+indicator-messages (0.2.6-0ubuntu2~ppa1) karmic; urgency=low
55+
56+ * Adding translator comments from hours and minutes strings.
57+ (LP: #456437)
58+
59+ -- Ted Gould <ted@ubuntu.com> Mon, 26 Oct 2009 21:06:26 -0500
60+
61 indicator-messages (0.2.6+r156-0ubuntu2) lucid; urgency=low
62
63 * debian/control
64
65=== modified file 'debian/control'
66--- debian/control 2009-12-15 16:58:16 +0000
67+++ debian/control 2010-01-08 18:15:24 +0000
68@@ -12,8 +12,8 @@
69 libindicate-dev (>= 0.2.0),
70 libindicate-gtk-dev (>= 0.2.0),
71 libindicator-dev (>= 0.3.0),
72- libdbusmenu-gtk-dev (>= 0.1.1),
73- libdbusmenu-glib-dev (>= 0.1.1)
74+ libdbusmenu-gtk-dev (>= 0.2.0~dev),
75+ libdbusmenu-glib-dev (>= 0.2.0~dev)
76 Standards-Version: 3.8.0
77 Homepage: https://launchpad.net/indicator-applet
78 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu
79
80=== modified file 'src/im-menu-item.c'
81--- src/im-menu-item.c 2009-10-26 21:45:17 +0000
82+++ src/im-menu-item.c 2010-01-08 18:15:24 +0000
83@@ -442,7 +442,7 @@
84 priv->attention = FALSE;
85 priv->show = TRUE;
86
87- dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), "type", INDICATOR_MENUITEM_TYPE);
88+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, INDICATOR_MENUITEM_TYPE);
89
90 indicate_listener_displayed(listener, server, indicator, TRUE);
91
92
93=== modified file 'src/indicator-messages.c'
94--- src/indicator-messages.c 2009-11-04 21:20:36 +0000
95+++ src/indicator-messages.c 2010-01-08 18:15:24 +0000
96@@ -218,14 +218,14 @@
97 /* Whenever we have a property change on a DbusmenuMenuitem
98 we need to be responsive to that. */
99 static void
100-indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, gchar * value, indicator_item_t * mi_data)
101+indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, indicator_item_t * mi_data)
102 {
103 if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_LABEL)) {
104 /* Set the main label */
105- gtk_label_set_text(GTK_LABEL(mi_data->label), value);
106+ gtk_label_set_text(GTK_LABEL(mi_data->label), g_value_get_string(value));
107 } else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_RIGHT)) {
108 /* Set the right label */
109- gtk_label_set_text(GTK_LABEL(mi_data->right), value);
110+ gtk_label_set_text(GTK_LABEL(mi_data->right), g_value_get_string(value));
111 } else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_ICON)) {
112 /* We don't use the value here, which is probably less efficient,
113 but it's easier to use the easy function. And since th value
114@@ -351,7 +351,7 @@
115 GtkWidget * app_label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, LAUNCHER_MENUITEM_PROP_APP_NAME));
116 gtk_misc_set_alignment(GTK_MISC(app_label), 0.0, 0.5);
117 GtkWidget * dsc_label = gtk_label_new("");
118- gtk_misc_set_alignment(GTK_MISC(dsc_label), 0.05, 0.5);
119+ gtk_misc_set_alignment(GTK_MISC(dsc_label), 0.0, 0.5);
120 gtk_label_set_ellipsize(GTK_LABEL(dsc_label), PANGO_ELLIPSIZE_END);
121 gtk_widget_set_size_request(dsc_label, 200, -1);
122 gchar * markup = g_markup_printf_escaped("<span font-size=\"smaller\">%s</span>", dbusmenu_menuitem_property_get(newitem, LAUNCHER_MENUITEM_PROP_APP_DESC));
123
124=== modified file 'src/launcher-menu-item.c'
125--- src/launcher-menu-item.c 2009-09-23 16:48:09 +0000
126+++ src/launcher-menu-item.c 2010-01-08 18:15:24 +0000
127@@ -131,7 +131,7 @@
128 priv->desktop = g_strdup(desktop_file);
129
130 g_debug("\tName: %s", launcher_menu_item_get_name(self));
131- dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), "type", LAUNCHER_MENUITEM_TYPE);
132+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, LAUNCHER_MENUITEM_TYPE);
133 dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), LAUNCHER_MENUITEM_PROP_APP_NAME, launcher_menu_item_get_name(self));
134 dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), LAUNCHER_MENUITEM_PROP_APP_DESC, launcher_menu_item_get_description(self));
135
136
137=== modified file 'src/messages-service.c'
138--- src/messages-service.c 2009-10-04 20:30:48 +0000
139+++ src/messages-service.c 2010-01-08 18:15:24 +0000
140@@ -488,7 +488,7 @@
141
142 /* Build a separator */
143 sl_item->separator = dbusmenu_menuitem_new();
144- dbusmenu_menuitem_property_set(sl_item->separator, "type", DBUSMENU_CLIENT_TYPES_SEPARATOR);
145+ dbusmenu_menuitem_property_set(sl_item->separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
146
147 /* Incase we got an indicator first */
148 GList * alreadythere = g_list_find_custom(serverList, sl_item, serverList_equal);
149@@ -1139,7 +1139,7 @@
150
151 /* Build a separator */
152 ll->separator = dbusmenu_menuitem_new();
153- dbusmenu_menuitem_property_set(ll->separator, "type", DBUSMENU_CLIENT_TYPES_SEPARATOR);
154+ dbusmenu_menuitem_property_set(ll->separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
155
156 /* Add it to the list */
157 launcherList = g_list_insert_sorted(launcherList, ll, launcherList_sort);

Subscribers

People subscribed via source and target branches

to all changes: