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
=== modified file 'autogen.sh'
--- autogen.sh 2009-08-18 15:24:53 +0000
+++ autogen.sh 2010-03-18 17:48:28 +0000
@@ -8,4 +8,4 @@
8}8}
99
10USE_GNOME2_MACROS=1 \10USE_GNOME2_MACROS=1 \
11gnome-autogen.sh11. gnome-autogen.sh
1212
=== modified file 'configure.ac'
--- configure.ac 2010-01-21 18:47:15 +0000
+++ configure.ac 2010-03-18 17:48:28 +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-applet, 0.3.2)7AM_INIT_AUTOMAKE(indicator-applet, 0.3.4)
88
9AM_MAINTAINER_MODE9AM_MAINTAINER_MODE
10m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])10m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
1111
=== modified file 'debian/changelog'
--- debian/changelog 2010-03-09 13:52:09 +0000
+++ debian/changelog 2010-03-18 17:48:28 +0000
@@ -1,3 +1,20 @@
1indicator-applet (0.3.4-0ubuntu1~ppa1) lucid; urgency=low
2
3 * Upstream release 0.3.4
4 * Add in scrolling support (LP: #521046)
5 * Fix autogen.sh to allow parameters (LP: #539767)
6 * debian/control: libindicator requirement to 0.3.6
7
8 -- Ted Gould <ted@ubuntu.com> Thu, 18 Mar 2010 12:46:36 -0500
9
10indicator-applet (0.3.3-0ubuntu1~ppa1) lucid; urgency=low
11
12 * Upstream release 0.3.3
13 * Add libsoundmenu.so to the ordering to place it next
14 to the messaging menu.
15
16 -- Ted Gould <ted@ubuntu.com> Thu, 11 Mar 2010 15:26:37 -0600
17
1indicator-applet (0.3.2-0ubuntu4) UNRELEASED; urgency=low18indicator-applet (0.3.2-0ubuntu4) UNRELEASED; urgency=low
219
3 [ Loïc Minier ]20 [ Loïc Minier ]
421
=== modified file 'debian/control'
--- debian/control 2010-03-09 13:52:09 +0000
+++ debian/control 2010-03-18 17:48:28 +0000
@@ -12,7 +12,7 @@
12 intltool,12 intltool,
13 libxml2-dev,13 libxml2-dev,
14 gtk-doc-tools,14 gtk-doc-tools,
15 libindicator-dev (>= 0.3.1)15 libindicator-dev (>= 0.3.6)
16Standards-Version: 3.8.416Standards-Version: 3.8.4
17Homepage: https://launchpad.net/indicator-applet17Homepage: https://launchpad.net/indicator-applet
18Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-applet/ubuntu18Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-applet/ubuntu
1919
=== modified file 'src/applet-main.c'
--- src/applet-main.c 2010-01-20 14:20:04 +0000
+++ src/applet-main.c 2010-03-18 17:48:28 +0000
@@ -7,16 +7,16 @@
7Authors:7Authors:
8 Ted Gould <ted@canonical.com>8 Ted Gould <ted@canonical.com>
99
10This program is free software: you can redistribute it and/or modify it 10This program is free software: you can redistribute it and/or modify it
11under the terms of the GNU General Public License version 3, as published 11under the terms of the GNU General Public License version 3, as published
12by the Free Software Foundation.12by the Free Software Foundation.
1313
14This program is distributed in the hope that it will be useful, but 14This program is distributed in the hope that it will be useful, but
15WITHOUT ANY WARRANTY; without even the implied warranties of 15WITHOUT ANY WARRANTY; without even the implied warranties of
16MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 16MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
17PURPOSE. See the GNU General Public License for more details.17PURPOSE. See the GNU General Public License for more details.
1818
19You should have received a copy of the GNU General Public License along 19You should have received a copy of the GNU General Public License along
20with this program. If not, see <http://www.gnu.org/licenses/>.20with this program. If not, see <http://www.gnu.org/licenses/>.
21*/21*/
2222
@@ -29,6 +29,7 @@
2929
30static gchar * indicator_order[] = {30static gchar * indicator_order[] = {
31 "libapplication.so",31 "libapplication.so",
32 "libsoundmenu.so",
32 "libmessaging.so",33 "libmessaging.so",
33 "libdatetime.so",34 "libdatetime.so",
34 "libme.so",35 "libme.so",
@@ -170,6 +171,8 @@
170 GtkWidget * menuitem = gtk_menu_item_new();171 GtkWidget * menuitem = gtk_menu_item_new();
171 GtkWidget * hbox = gtk_hbox_new(FALSE, 3);172 GtkWidget * hbox = gtk_hbox_new(FALSE, 3);
172173
174 g_object_set_data (G_OBJECT (menuitem), "indicator", io);
175
173 if (entry->image != NULL) {176 if (entry->image != NULL) {
174 gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entry->image), FALSE, FALSE, 0);177 gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entry->image), FALSE, FALSE, 0);
175 }178 }
@@ -213,7 +216,7 @@
213 return;216 return;
214}217}
215218
216static void 219static void
217entry_removed (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data)220entry_removed (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data)
218{221{
219 g_debug("Signal: Entry Removed");222 g_debug("Signal: Entry Removed");
@@ -242,7 +245,7 @@
242}245}
243246
244/* Gets called when an entry for an object was moved. */247/* Gets called when an entry for an object was moved. */
245static void 248static void
246entry_moved (IndicatorObject * io, IndicatorObjectEntry * entry, gint old, gint new, gpointer user_data)249entry_moved (IndicatorObject * io, IndicatorObjectEntry * entry, gint old, gint new, gpointer user_data)
247{250{
248 GtkWidget * menu = GTK_WIDGET(user_data);251 GtkWidget * menu = GTK_WIDGET(user_data);
@@ -327,6 +330,20 @@
327}330}
328331
329static gboolean332static gboolean
333menubar_scroll (GtkWidget *widget,
334 GdkEventScroll *event,
335 gpointer data)
336{
337 GtkWidget *menuitem;
338 GtkWidget *parent;
339
340 menuitem = gtk_get_event_widget ((GdkEvent *)event);
341
342 IndicatorObject *io = g_object_get_data (G_OBJECT (menuitem), "indicator");
343 g_signal_emit_by_name (io, "scroll", 1, event->direction);
344}
345
346static gboolean
330menubar_on_expose (GtkWidget * widget,347menubar_on_expose (GtkWidget * widget,
331 GdkEventExpose *event,348 GdkEventExpose *event,
332 GtkWidget * menubar)349 GtkWidget * menubar)
@@ -432,7 +449,7 @@
432449
433 log_file = g_io_stream_get_output_stream(G_IO_STREAM(io));450 log_file = g_io_stream_get_output_stream(G_IO_STREAM(io));
434 }451 }
435 452
436 gchar * outputstring = g_strdup_printf("%s\n", message);453 gchar * outputstring = g_strdup_printf("%s\n", message);
437 g_output_stream_write_async(log_file,454 g_output_stream_write_async(log_file,
438 outputstring, /* data */455 outputstring, /* data */
@@ -452,7 +469,7 @@
452 BONOBO_UI_VERB ("IndicatorAppletAbout", about_cb),469 BONOBO_UI_VERB ("IndicatorAppletAbout", about_cb),
453 BONOBO_UI_VERB_END470 BONOBO_UI_VERB_END
454 };471 };
455 static const gchar * menu_xml = 472 static const gchar * menu_xml =
456 "<popup name=\"button3\">"473 "<popup name=\"button3\">"
457 "<menuitem name=\"About Item\" verb=\"IndicatorAppletAbout\" _label=\"" N_("_About") "\" pixtype=\"stock\" pixname=\"gtk-about\"/>"474 "<menuitem name=\"About Item\" verb=\"IndicatorAppletAbout\" _label=\"" N_("_About") "\" pixtype=\"stock\" pixname=\"gtk-about\"/>"
458 "</popup>";475 "</popup>";
@@ -509,7 +526,7 @@
509 atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),526 atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
510 "indicator-applet-complete");527 "indicator-applet-complete");
511#endif528#endif
512 529
513 /* Init some theme/icon stuff */530 /* Init some theme/icon stuff */
514 gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),531 gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
515 INDICATOR_ICONS_DIR);532 INDICATOR_ICONS_DIR);
@@ -547,6 +564,7 @@
547 GTK_WIDGET_SET_FLAGS (menubar, GTK_WIDGET_FLAGS(menubar) | GTK_CAN_FOCUS);564 GTK_WIDGET_SET_FLAGS (menubar, GTK_WIDGET_FLAGS(menubar) | GTK_CAN_FOCUS);
548 gtk_widget_set_name(GTK_WIDGET (menubar), "fast-user-switch-menubar");565 gtk_widget_set_name(GTK_WIDGET (menubar), "fast-user-switch-menubar");
549 g_signal_connect(menubar, "button-press-event", G_CALLBACK(menubar_press), NULL);566 g_signal_connect(menubar, "button-press-event", G_CALLBACK(menubar_press), NULL);
567 g_signal_connect(menubar, "scroll-event", G_CALLBACK (menubar_scroll), NULL);
550 g_signal_connect_after(menubar, "expose-event", G_CALLBACK(menubar_on_expose), menubar);568 g_signal_connect_after(menubar, "expose-event", G_CALLBACK(menubar_on_expose), menubar);
551 gtk_container_set_border_width(GTK_CONTAINER(menubar), 0);569 gtk_container_set_border_width(GTK_CONTAINER(menubar), 0);
552570
@@ -586,17 +604,17 @@
586 panel_applet_set_background_widget(applet, menubar);604 panel_applet_set_background_widget(applet, menubar);
587 gtk_widget_show(menubar);605 gtk_widget_show(menubar);
588 }606 }
589 607
590 /* Background of applet */608 /* Background of applet */
591 g_signal_connect(applet, "change-background",609 g_signal_connect(applet, "change-background",
592 G_CALLBACK(cw_panel_background_changed), menubar);610 G_CALLBACK(cw_panel_background_changed), menubar);
593 611
594 gtk_widget_show(GTK_WIDGET(applet));612 gtk_widget_show(GTK_WIDGET(applet));
595613
596 return TRUE;614 return TRUE;
597}615}
598616
599static void 617static void
600cw_panel_background_changed (PanelApplet *applet,618cw_panel_background_changed (PanelApplet *applet,
601 PanelAppletBackgroundType type,619 PanelAppletBackgroundType type,
602 GdkColor *colour,620 GdkColor *colour,
@@ -614,7 +632,7 @@
614 gtk_widget_modify_style(menubar, rc_style);632 gtk_widget_modify_style(menubar, rc_style);
615 gtk_rc_style_unref(rc_style);633 gtk_rc_style_unref(rc_style);
616634
617 switch (type) 635 switch (type)
618 {636 {
619 case PANEL_NO_BACKGROUND:637 case PANEL_NO_BACKGROUND:
620 break;638 break;
@@ -622,7 +640,7 @@
622 gtk_widget_modify_bg(GTK_WIDGET (applet), GTK_STATE_NORMAL, colour);640 gtk_widget_modify_bg(GTK_WIDGET (applet), GTK_STATE_NORMAL, colour);
623 gtk_widget_modify_bg(menubar, GTK_STATE_NORMAL, colour);641 gtk_widget_modify_bg(menubar, GTK_STATE_NORMAL, colour);
624 break;642 break;
625 643
626 case PANEL_PIXMAP_BACKGROUND:644 case PANEL_PIXMAP_BACKGROUND:
627 style = gtk_style_copy(GTK_WIDGET (applet)->style);645 style = gtk_style_copy(GTK_WIDGET (applet)->style);
628 if (style->bg_pixmap[GTK_STATE_NORMAL])646 if (style->bg_pixmap[GTK_STATE_NORMAL])

Subscribers

People subscribed via source and target branches