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: 203
Proposed branch: lp:~indicator-applet-developers/indicator-messages/ubuntu
Merge into: lp:~ubuntu-desktop/indicator-messages/ubuntu
Diff against target: 188 lines (+51/-17)
8 files modified
AUTHORS (+1/-0)
ChangeLog (+32/-0)
configure (+1/-1)
configure.ac (+1/-1)
debian/changelog (+9/-0)
debian/patches/lp_690668.patch (+1/-1)
src/indicator-messages.c (+5/-12)
src/messages-service.c (+1/-2)
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-messages/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+72905@code.launchpad.net

Description of the change

Fixes and love

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 'AUTHORS'
2--- AUTHORS 2011-08-18 15:54:40 +0000
3+++ AUTHORS 2011-08-25 14:29:23 +0000
4@@ -10,6 +10,7 @@
5 Luke Yelavich
6 Marco Trevisan (Treviño)
7 Michael Terry
8+ Omer Akram
9 Sebstien Bacher
10 Sven Baars
11 Ted Gould
12
13=== modified file 'ChangeLog'
14--- ChangeLog 2011-08-18 15:54:40 +0000
15+++ ChangeLog 2011-08-25 14:29:23 +0000
16@@ -1,5 +1,37 @@
17 # Generated by Makefile. Do not edit.
18
19+2011-08-25 Ted Gould <ted@gould.cx>
20+
21+ 0.4.95
22+
23+2011-08-25 Ted Gould <ted@gould.cx>
24+
25+ Fix the gutters
26+
27+2011-08-24 Ted Gould <ted@gould.cx>
28+
29+ Don't look up a style value we're not using
30+
31+2011-08-24 Ted Gould <ted@gould.cx>
32+
33+ Switching the padding to the toggle-spacing like the image menu item and using it at creation of the box
34+
35+2011-08-24 Ted Gould <ted@gould.cx>
36+
37+ Removing unneeded header
38+
39+2011-08-24 Ted Gould <ted@gould.cx>
40+
41+ Remove an unused hbox in the application menu item
42+
43+2011-08-22 Ted Gould <ted@gould.cx>
44+
45+ MPT's happiness is a feature
46+
47+2011-08-19 Omer Akram <om26er@ubuntu.com>
48+
49+ s/Clear Attention/Clear
50+
51 2011-08-18 Ted Gould <ted@gould.cx>
52
53 0.4.94
54
55=== modified file 'configure'
56--- configure 2011-08-18 15:55:35 +0000
57+++ configure 2011-08-25 14:29:23 +0000
58@@ -2758,7 +2758,7 @@
59
60 # Define the identity of the package.
61 PACKAGE=indicator-messages
62- VERSION=0.4.94
63+ VERSION=0.4.95
64
65
66 cat >>confdefs.h <<_ACEOF
67
68=== modified file 'configure.ac'
69--- configure.ac 2011-08-18 15:50:07 +0000
70+++ configure.ac 2011-08-25 14:29:23 +0000
71@@ -4,7 +4,7 @@
72 AC_PREREQ(2.53)
73
74 AM_CONFIG_HEADER(config.h)
75-AM_INIT_AUTOMAKE(indicator-messages, 0.4.94)
76+AM_INIT_AUTOMAKE(indicator-messages, 0.4.95)
77
78 AM_MAINTAINER_MODE
79
80
81=== modified file 'debian/changelog'
82--- debian/changelog 2011-08-18 19:25:32 +0000
83+++ debian/changelog 2011-08-25 14:29:23 +0000
84@@ -1,3 +1,12 @@
85+indicator-messages (0.4.95-0ubuntu1~ppa1) oneiric; urgency=low
86+
87+ * New upstream release.
88+ * Fix naming of "Clear" item
89+ * Fix alignment of items to there is a consistent gutter
90+ * debian/patches/lp_690668.patch: Updating
91+
92+ -- Ted Gould <ted@ubuntu.com> Thu, 25 Aug 2011 09:09:20 -0500
93+
94 indicator-messages (0.4.94-0ubuntu1) oneiric; urgency=low
95
96 * New upstream release.
97
98=== modified file 'debian/patches/lp_690668.patch'
99--- debian/patches/lp_690668.patch 2011-02-24 17:41:07 +0000
100+++ debian/patches/lp_690668.patch 2011-08-25 14:29:23 +0000
101@@ -40,5 +40,5 @@
102 + g_object_unref(resized_pixbuf);
103 }
104 gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5);
105- gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, padding);
106+ gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, 0);
107
108
109=== modified file 'src/indicator-messages.c'
110--- src/indicator-messages.c 2011-08-17 16:46:28 +0000
111+++ src/indicator-messages.c 2011-08-25 14:29:23 +0000
112@@ -581,11 +581,6 @@
113 GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new());
114 gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(gmi), TRUE);
115
116- gint padding = 4;
117- gtk_widget_style_get(GTK_WIDGET(gmi), "horizontal-padding", &padding, NULL);
118-
119- GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
120-
121 /* Set the minimum size, we always want it to take space */
122 gint width, height;
123 gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
124@@ -602,12 +597,10 @@
125 /* Application name in a label */
126 GtkWidget * label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME));
127 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
128- gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, padding);
129 gtk_widget_show(label);
130
131 /* Insert the hbox */
132- gtk_container_add(GTK_CONTAINER(gmi), hbox);
133- gtk_widget_show(hbox);
134+ gtk_container_add(GTK_CONTAINER(gmi), label);
135
136 /* Attach some of the standard GTK stuff */
137 dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
138@@ -698,9 +691,9 @@
139
140 gint padding = 4;
141 gint font_size = RIGHT_LABEL_FONT_SIZE;
142- gtk_widget_style_get(GTK_WIDGET(gmi), "horizontal-padding", &padding, NULL);
143+ gtk_widget_style_get(GTK_WIDGET(gmi), "toggle-spacing", &padding, NULL);
144
145- GtkWidget * hbox = gtk_hbox_new(FALSE, 0);
146+ GtkWidget * hbox = gtk_hbox_new(FALSE, padding);
147
148 /* Icon, probably someone's face or avatar on an IM */
149 mi_data->icon = gtk_image_new();
150@@ -735,7 +728,7 @@
151 }
152 }
153 gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5);
154- gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, padding);
155+ gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, 0);
156
157 if (pixbuf != NULL) {
158 gtk_widget_show(mi_data->icon);
159@@ -744,7 +737,7 @@
160 /* Label, probably a username, chat room or mailbox name */
161 mi_data->label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_LABEL));
162 gtk_misc_set_alignment(GTK_MISC(mi_data->label), 0.0, 0.5);
163- gtk_box_pack_start(GTK_BOX(hbox), mi_data->label, TRUE, TRUE, padding);
164+ gtk_box_pack_start(GTK_BOX(hbox), mi_data->label, TRUE, TRUE, 0);
165 gtk_widget_show(mi_data->label);
166
167 /* Usually either the time or the count on the individual
168
169=== modified file 'src/messages-service.c'
170--- src/messages-service.c 2011-07-22 17:15:29 +0000
171+++ src/messages-service.c 2011-08-25 14:29:23 +0000
172@@ -32,7 +32,6 @@
173
174 #include <libdbusmenu-glib/client.h>
175 #include <libdbusmenu-glib/server.h>
176-#include <libdbusmenu-glib/menuitem-proxy.h>
177
178 #include "im-menu-item.h"
179 #include "app-menu-item.h"
180@@ -1504,7 +1503,7 @@
181
182 /* Add in the clear attention item */
183 clear_attention = dbusmenu_menuitem_new();
184- dbusmenu_menuitem_property_set(clear_attention, DBUSMENU_MENUITEM_PROP_LABEL, _("Clear Attention"));
185+ dbusmenu_menuitem_property_set(clear_attention, DBUSMENU_MENUITEM_PROP_LABEL, _("Clear"));
186 dbusmenu_menuitem_child_append(root_menuitem, clear_attention);
187 g_signal_connect(G_OBJECT(dbus_interface), MESSAGE_SERVICE_DBUS_SIGNAL_ATTENTION_CHANGED, G_CALLBACK(clear_attention_handler), clear_attention);
188 g_signal_connect(G_OBJECT(clear_attention), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(clear_attention_activate), dbus_interface);

Subscribers

People subscribed via source and target branches

to all changes: