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
=== modified file 'configure.ac'
--- configure.ac 2009-11-06 04:33:59 +0000
+++ configure.ac 2010-01-08 18:15:24 +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.2.6)7AM_INIT_AUTOMAKE(indicator-messages, 0.3.0)
88
9AM_MAINTAINER_MODE9AM_MAINTAINER_MODE
1010
@@ -31,7 +31,7 @@
31PANEL_REQUIRED_VERSION=2.0.031PANEL_REQUIRED_VERSION=2.0.0
32INDICATE_REQUIRED_VERSION=0.2.032INDICATE_REQUIRED_VERSION=0.2.0
33INDICATOR_REQUIRED_VERSION=0.3.033INDICATOR_REQUIRED_VERSION=0.3.0
34DBUSMENUGTK_REQUIRED_VERSION=0.1.134DBUSMENUGTK_REQUIRED_VERSION=0.2.0
3535
36PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION36PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
37 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION37 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
3838
=== modified file 'debian/changelog'
--- debian/changelog 2009-12-15 16:58:16 +0000
+++ debian/changelog 2010-01-08 18:15:24 +0000
@@ -1,3 +1,37 @@
1indicator-messages (0.3.0-0ubuntu1~ppa1) karmic; urgency=low
2
3 * Upstream release 0.3.0
4
5 -- Ted Gould <ted@ubuntu.com> Fri, 08 Jan 2010 12:05:25 -0600
6
7indicator-messages (0.3.0~dev-0ubuntu1~ppa3) karmic; urgency=low
8
9 * Upgrading to dbusmenu 0.2.0
10 * debian/control: Updating dbusmenu dependency to 0.2.0~dev
11
12 -- Ted Gould <ted@ubuntu.com> Tue, 22 Dec 2009 14:49:49 -0600
13
14indicator-messages (0.3.0~dev-0ubuntu1~ppa2) karmic; urgency=low
15
16 * Disabling static builds.
17
18 -- Ted Gould <ted@ubuntu.com> Mon, 16 Nov 2009 11:44:37 -0600
19
20indicator-messages (0.3.0~dev-0ubuntu1~ppa1) karmic; urgency=low
21
22 * Porting to libindicator 0.3.0
23 * debian/control: Increasing libindicator-dev dependency to
24 0.3.0~dev
25
26 -- Ted Gould <ted@ubuntu.com> Thu, 05 Nov 2009 09:30:58 -0600
27
28indicator-messages (0.2.6-0ubuntu2~ppa1) karmic; urgency=low
29
30 * Adding translator comments from hours and minutes strings.
31 (LP: #456437)
32
33 -- Ted Gould <ted@ubuntu.com> Mon, 26 Oct 2009 21:06:26 -0500
34
1indicator-messages (0.2.6+r156-0ubuntu2) lucid; urgency=low35indicator-messages (0.2.6+r156-0ubuntu2) lucid; urgency=low
236
3 * debian/control37 * debian/control
438
=== modified file 'debian/control'
--- debian/control 2009-12-15 16:58:16 +0000
+++ debian/control 2010-01-08 18:15:24 +0000
@@ -12,8 +12,8 @@
12 libindicate-dev (>= 0.2.0),12 libindicate-dev (>= 0.2.0),
13 libindicate-gtk-dev (>= 0.2.0),13 libindicate-gtk-dev (>= 0.2.0),
14 libindicator-dev (>= 0.3.0),14 libindicator-dev (>= 0.3.0),
15 libdbusmenu-gtk-dev (>= 0.1.1),15 libdbusmenu-gtk-dev (>= 0.2.0~dev),
16 libdbusmenu-glib-dev (>= 0.1.1)16 libdbusmenu-glib-dev (>= 0.2.0~dev)
17Standards-Version: 3.8.017Standards-Version: 3.8.0
18Homepage: https://launchpad.net/indicator-applet18Homepage: https://launchpad.net/indicator-applet
19Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu19Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu
2020
=== modified file 'src/im-menu-item.c'
--- src/im-menu-item.c 2009-10-26 21:45:17 +0000
+++ src/im-menu-item.c 2010-01-08 18:15:24 +0000
@@ -442,7 +442,7 @@
442 priv->attention = FALSE;442 priv->attention = FALSE;
443 priv->show = TRUE;443 priv->show = TRUE;
444444
445 dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), "type", INDICATOR_MENUITEM_TYPE);445 dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, INDICATOR_MENUITEM_TYPE);
446446
447 indicate_listener_displayed(listener, server, indicator, TRUE);447 indicate_listener_displayed(listener, server, indicator, TRUE);
448448
449449
=== modified file 'src/indicator-messages.c'
--- src/indicator-messages.c 2009-11-04 21:20:36 +0000
+++ src/indicator-messages.c 2010-01-08 18:15:24 +0000
@@ -218,14 +218,14 @@
218/* Whenever we have a property change on a DbusmenuMenuitem218/* Whenever we have a property change on a DbusmenuMenuitem
219 we need to be responsive to that. */219 we need to be responsive to that. */
220static void220static void
221indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, gchar * value, indicator_item_t * mi_data)221indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, indicator_item_t * mi_data)
222{222{
223 if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_LABEL)) {223 if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_LABEL)) {
224 /* Set the main label */224 /* Set the main label */
225 gtk_label_set_text(GTK_LABEL(mi_data->label), value);225 gtk_label_set_text(GTK_LABEL(mi_data->label), g_value_get_string(value));
226 } else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_RIGHT)) {226 } else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_RIGHT)) {
227 /* Set the right label */227 /* Set the right label */
228 gtk_label_set_text(GTK_LABEL(mi_data->right), value);228 gtk_label_set_text(GTK_LABEL(mi_data->right), g_value_get_string(value));
229 } else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_ICON)) {229 } else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_ICON)) {
230 /* We don't use the value here, which is probably less efficient, 230 /* We don't use the value here, which is probably less efficient,
231 but it's easier to use the easy function. And since th value231 but it's easier to use the easy function. And since th value
@@ -351,7 +351,7 @@
351 GtkWidget * app_label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, LAUNCHER_MENUITEM_PROP_APP_NAME));351 GtkWidget * app_label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, LAUNCHER_MENUITEM_PROP_APP_NAME));
352 gtk_misc_set_alignment(GTK_MISC(app_label), 0.0, 0.5);352 gtk_misc_set_alignment(GTK_MISC(app_label), 0.0, 0.5);
353 GtkWidget * dsc_label = gtk_label_new("");353 GtkWidget * dsc_label = gtk_label_new("");
354 gtk_misc_set_alignment(GTK_MISC(dsc_label), 0.05, 0.5);354 gtk_misc_set_alignment(GTK_MISC(dsc_label), 0.0, 0.5);
355 gtk_label_set_ellipsize(GTK_LABEL(dsc_label), PANGO_ELLIPSIZE_END);355 gtk_label_set_ellipsize(GTK_LABEL(dsc_label), PANGO_ELLIPSIZE_END);
356 gtk_widget_set_size_request(dsc_label, 200, -1);356 gtk_widget_set_size_request(dsc_label, 200, -1);
357 gchar * markup = g_markup_printf_escaped("<span font-size=\"smaller\">%s</span>", dbusmenu_menuitem_property_get(newitem, LAUNCHER_MENUITEM_PROP_APP_DESC));357 gchar * markup = g_markup_printf_escaped("<span font-size=\"smaller\">%s</span>", dbusmenu_menuitem_property_get(newitem, LAUNCHER_MENUITEM_PROP_APP_DESC));
358358
=== modified file 'src/launcher-menu-item.c'
--- src/launcher-menu-item.c 2009-09-23 16:48:09 +0000
+++ src/launcher-menu-item.c 2010-01-08 18:15:24 +0000
@@ -131,7 +131,7 @@
131 priv->desktop = g_strdup(desktop_file);131 priv->desktop = g_strdup(desktop_file);
132132
133 g_debug("\tName: %s", launcher_menu_item_get_name(self));133 g_debug("\tName: %s", launcher_menu_item_get_name(self));
134 dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), "type", LAUNCHER_MENUITEM_TYPE);134 dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, LAUNCHER_MENUITEM_TYPE);
135 dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), LAUNCHER_MENUITEM_PROP_APP_NAME, launcher_menu_item_get_name(self));135 dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), LAUNCHER_MENUITEM_PROP_APP_NAME, launcher_menu_item_get_name(self));
136 dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), LAUNCHER_MENUITEM_PROP_APP_DESC, launcher_menu_item_get_description(self));136 dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), LAUNCHER_MENUITEM_PROP_APP_DESC, launcher_menu_item_get_description(self));
137137
138138
=== modified file 'src/messages-service.c'
--- src/messages-service.c 2009-10-04 20:30:48 +0000
+++ src/messages-service.c 2010-01-08 18:15:24 +0000
@@ -488,7 +488,7 @@
488488
489 /* Build a separator */489 /* Build a separator */
490 sl_item->separator = dbusmenu_menuitem_new();490 sl_item->separator = dbusmenu_menuitem_new();
491 dbusmenu_menuitem_property_set(sl_item->separator, "type", DBUSMENU_CLIENT_TYPES_SEPARATOR);491 dbusmenu_menuitem_property_set(sl_item->separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
492492
493 /* Incase we got an indicator first */493 /* Incase we got an indicator first */
494 GList * alreadythere = g_list_find_custom(serverList, sl_item, serverList_equal);494 GList * alreadythere = g_list_find_custom(serverList, sl_item, serverList_equal);
@@ -1139,7 +1139,7 @@
11391139
1140 /* Build a separator */1140 /* Build a separator */
1141 ll->separator = dbusmenu_menuitem_new();1141 ll->separator = dbusmenu_menuitem_new();
1142 dbusmenu_menuitem_property_set(ll->separator, "type", DBUSMENU_CLIENT_TYPES_SEPARATOR);1142 dbusmenu_menuitem_property_set(ll->separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
11431143
1144 /* Add it to the list */1144 /* Add it to the list */
1145 launcherList = g_list_insert_sorted(launcherList, ll, launcherList_sort);1145 launcherList = g_list_insert_sorted(launcherList, ll, launcherList_sort);

Subscribers

People subscribed via source and target branches

to all changes: