Indicator Applet

Merge lp:~indicator-applet-developers/indicator-applet/ubuntu into lp:~ubuntu-desktop/indicator-applet/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-applet/ubuntu
Merge into: lp:~ubuntu-desktop/indicator-applet/ubuntu
Diff against target: 217 lines (+54/-19)
5 files modified
autogen.sh (+1/-1)
configure.ac (+1/-1)
debian/changelog (+17/-0)
debian/control (+1/-1)
src/applet-main.c (+34/-16)
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-applet/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+21185@code.launchpad.net

Description of the change

0.3.3

To post a comment you must log in.
lp:~indicator-applet-developers/indicator-applet/ubuntu updated
274. By Ted Gould

* Upstream release 0.3.4
  * Add in scrolling support (LP: #521046)
  * Fix autogen.sh to allow parameters (LP: #539767)

275. By Ted Gould

debian/control: libindicator requirement to 0.3.6

276. By Ted Gould

releasing version 0.3.4-0ubuntu1~ppa1

Revision history for this message
Ted Gould (ted) wrote :

Now includes 0.3.4 as well.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autogen.sh'
2--- autogen.sh 2009-08-18 15:24:53 +0000
3+++ autogen.sh 2010-03-18 17:48:28 +0000
4@@ -8,4 +8,4 @@
5 }
6
7 USE_GNOME2_MACROS=1 \
8-gnome-autogen.sh
9+. gnome-autogen.sh
10
11=== modified file 'configure.ac'
12--- configure.ac 2010-01-21 18:47:15 +0000
13+++ configure.ac 2010-03-18 17:48:28 +0000
14@@ -4,7 +4,7 @@
15 AC_PREREQ(2.53)
16
17 AM_CONFIG_HEADER(config.h)
18-AM_INIT_AUTOMAKE(indicator-applet, 0.3.2)
19+AM_INIT_AUTOMAKE(indicator-applet, 0.3.4)
20
21 AM_MAINTAINER_MODE
22 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
23
24=== modified file 'debian/changelog'
25--- debian/changelog 2010-03-09 13:52:09 +0000
26+++ debian/changelog 2010-03-18 17:48:28 +0000
27@@ -1,3 +1,20 @@
28+indicator-applet (0.3.4-0ubuntu1~ppa1) lucid; urgency=low
29+
30+ * Upstream release 0.3.4
31+ * Add in scrolling support (LP: #521046)
32+ * Fix autogen.sh to allow parameters (LP: #539767)
33+ * debian/control: libindicator requirement to 0.3.6
34+
35+ -- Ted Gould <ted@ubuntu.com> Thu, 18 Mar 2010 12:46:36 -0500
36+
37+indicator-applet (0.3.3-0ubuntu1~ppa1) lucid; urgency=low
38+
39+ * Upstream release 0.3.3
40+ * Add libsoundmenu.so to the ordering to place it next
41+ to the messaging menu.
42+
43+ -- Ted Gould <ted@ubuntu.com> Thu, 11 Mar 2010 15:26:37 -0600
44+
45 indicator-applet (0.3.2-0ubuntu4) UNRELEASED; urgency=low
46
47 [ Loïc Minier ]
48
49=== modified file 'debian/control'
50--- debian/control 2010-03-09 13:52:09 +0000
51+++ debian/control 2010-03-18 17:48:28 +0000
52@@ -12,7 +12,7 @@
53 intltool,
54 libxml2-dev,
55 gtk-doc-tools,
56- libindicator-dev (>= 0.3.1)
57+ libindicator-dev (>= 0.3.6)
58 Standards-Version: 3.8.4
59 Homepage: https://launchpad.net/indicator-applet
60 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-applet/ubuntu
61
62=== modified file 'src/applet-main.c'
63--- src/applet-main.c 2010-01-20 14:20:04 +0000
64+++ src/applet-main.c 2010-03-18 17:48:28 +0000
65@@ -7,16 +7,16 @@
66 Authors:
67 Ted Gould <ted@canonical.com>
68
69-This program is free software: you can redistribute it and/or modify it
70-under the terms of the GNU General Public License version 3, as published
71+This program is free software: you can redistribute it and/or modify it
72+under the terms of the GNU General Public License version 3, as published
73 by the Free Software Foundation.
74
75-This program is distributed in the hope that it will be useful, but
76-WITHOUT ANY WARRANTY; without even the implied warranties of
77-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
78+This program is distributed in the hope that it will be useful, but
79+WITHOUT ANY WARRANTY; without even the implied warranties of
80+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
81 PURPOSE. See the GNU General Public License for more details.
82
83-You should have received a copy of the GNU General Public License along
84+You should have received a copy of the GNU General Public License along
85 with this program. If not, see <http://www.gnu.org/licenses/>.
86 */
87
88@@ -29,6 +29,7 @@
89
90 static gchar * indicator_order[] = {
91 "libapplication.so",
92+ "libsoundmenu.so",
93 "libmessaging.so",
94 "libdatetime.so",
95 "libme.so",
96@@ -170,6 +171,8 @@
97 GtkWidget * menuitem = gtk_menu_item_new();
98 GtkWidget * hbox = gtk_hbox_new(FALSE, 3);
99
100+ g_object_set_data (G_OBJECT (menuitem), "indicator", io);
101+
102 if (entry->image != NULL) {
103 gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entry->image), FALSE, FALSE, 0);
104 }
105@@ -213,7 +216,7 @@
106 return;
107 }
108
109-static void
110+static void
111 entry_removed (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data)
112 {
113 g_debug("Signal: Entry Removed");
114@@ -242,7 +245,7 @@
115 }
116
117 /* Gets called when an entry for an object was moved. */
118-static void
119+static void
120 entry_moved (IndicatorObject * io, IndicatorObjectEntry * entry, gint old, gint new, gpointer user_data)
121 {
122 GtkWidget * menu = GTK_WIDGET(user_data);
123@@ -327,6 +330,20 @@
124 }
125
126 static gboolean
127+menubar_scroll (GtkWidget *widget,
128+ GdkEventScroll *event,
129+ gpointer data)
130+{
131+ GtkWidget *menuitem;
132+ GtkWidget *parent;
133+
134+ menuitem = gtk_get_event_widget ((GdkEvent *)event);
135+
136+ IndicatorObject *io = g_object_get_data (G_OBJECT (menuitem), "indicator");
137+ g_signal_emit_by_name (io, "scroll", 1, event->direction);
138+}
139+
140+static gboolean
141 menubar_on_expose (GtkWidget * widget,
142 GdkEventExpose *event,
143 GtkWidget * menubar)
144@@ -432,7 +449,7 @@
145
146 log_file = g_io_stream_get_output_stream(G_IO_STREAM(io));
147 }
148-
149+
150 gchar * outputstring = g_strdup_printf("%s\n", message);
151 g_output_stream_write_async(log_file,
152 outputstring, /* data */
153@@ -452,7 +469,7 @@
154 BONOBO_UI_VERB ("IndicatorAppletAbout", about_cb),
155 BONOBO_UI_VERB_END
156 };
157- static const gchar * menu_xml =
158+ static const gchar * menu_xml =
159 "<popup name=\"button3\">"
160 "<menuitem name=\"About Item\" verb=\"IndicatorAppletAbout\" _label=\"" N_("_About") "\" pixtype=\"stock\" pixname=\"gtk-about\"/>"
161 "</popup>";
162@@ -509,7 +526,7 @@
163 atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
164 "indicator-applet-complete");
165 #endif
166-
167+
168 /* Init some theme/icon stuff */
169 gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
170 INDICATOR_ICONS_DIR);
171@@ -547,6 +564,7 @@
172 GTK_WIDGET_SET_FLAGS (menubar, GTK_WIDGET_FLAGS(menubar) | GTK_CAN_FOCUS);
173 gtk_widget_set_name(GTK_WIDGET (menubar), "fast-user-switch-menubar");
174 g_signal_connect(menubar, "button-press-event", G_CALLBACK(menubar_press), NULL);
175+ g_signal_connect(menubar, "scroll-event", G_CALLBACK (menubar_scroll), NULL);
176 g_signal_connect_after(menubar, "expose-event", G_CALLBACK(menubar_on_expose), menubar);
177 gtk_container_set_border_width(GTK_CONTAINER(menubar), 0);
178
179@@ -586,17 +604,17 @@
180 panel_applet_set_background_widget(applet, menubar);
181 gtk_widget_show(menubar);
182 }
183-
184+
185 /* Background of applet */
186 g_signal_connect(applet, "change-background",
187 G_CALLBACK(cw_panel_background_changed), menubar);
188-
189+
190 gtk_widget_show(GTK_WIDGET(applet));
191
192 return TRUE;
193 }
194
195-static void
196+static void
197 cw_panel_background_changed (PanelApplet *applet,
198 PanelAppletBackgroundType type,
199 GdkColor *colour,
200@@ -614,7 +632,7 @@
201 gtk_widget_modify_style(menubar, rc_style);
202 gtk_rc_style_unref(rc_style);
203
204- switch (type)
205+ switch (type)
206 {
207 case PANEL_NO_BACKGROUND:
208 break;
209@@ -622,7 +640,7 @@
210 gtk_widget_modify_bg(GTK_WIDGET (applet), GTK_STATE_NORMAL, colour);
211 gtk_widget_modify_bg(menubar, GTK_STATE_NORMAL, colour);
212 break;
213-
214+
215 case PANEL_PIXMAP_BACKGROUND:
216 style = gtk_style_copy(GTK_WIDGET (applet)->style);
217 if (style->bg_pixmap[GTK_STATE_NORMAL])

Subscribers

People subscribed via source and target branches