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

Proposed by Ted Gould on 2012-04-04
Status: Merged
Merged at revision: 297
Proposed branch: lp:~indicator-applet-developers/ubuntu/precise/indicator-applet/upstream
Merge into: lp:~ubuntu-desktop/indicator-applet/ubuntu
Diff against target: 77 lines (+25/-2)
5 files modified
ChangeLog (+14/-0)
configure (+1/-1)
configure.ac (+1/-1)
debian/changelog (+7/-0)
src/applet-main.c (+2/-0)
To merge this branch: bzr merge lp:~indicator-applet-developers/ubuntu/precise/indicator-applet/upstream
Reviewer Review Type Date Requested Status
Ken VanDine 2012-04-04 Pending
Review via email: mp+100865@code.launchpad.net

Description of the Change

0.5.0

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 'ChangeLog'
2--- ChangeLog 2012-03-09 21:03:10 +0000
3+++ ChangeLog 2012-04-04 19:56:20 +0000
4@@ -1,5 +1,19 @@
5 # Generated by Makefile. Do not edit.
6
7+2012-04-04 Ted Gould <ted@gould.cx>
8+
9+ 0.5.0
10+
11+2012-04-04 Charles Kerr <charles.kerr@canonical.com>
12+
13+ Merge lp:~jconti/indicator-applet/fix_scroll_event to adds GDK_SCROLL_MASK to the indicator menu items when they're created.
14+
15+ By doing this, scroll-event signals are received on the widgets and scrolling in indicators such as indicator-sound to change the volume will work again.
16+
17+2012-04-04 Jason Conti <jason.conti@gmail.com>
18+
19+ Add GDK_SCROLL_MASK to the indicator menu items so scroll-events are received.
20+
21 2012-03-09 Ted Gould <ted@gould.cx>
22
23 0.4.92
24
25=== modified file 'configure'
26--- configure 2012-03-09 21:03:10 +0000
27+++ configure 2012-04-04 19:56:20 +0000
28@@ -2730,7 +2730,7 @@
29
30 # Define the identity of the package.
31 PACKAGE=indicator-applet
32- VERSION=0.4.92
33+ VERSION=0.5.0
34
35
36 cat >>confdefs.h <<_ACEOF
37
38=== modified file 'configure.ac'
39--- configure.ac 2012-03-09 21:03:10 +0000
40+++ configure.ac 2012-04-04 19:56:20 +0000
41@@ -4,7 +4,7 @@
42 AC_PREREQ(2.53)
43
44 AM_CONFIG_HEADER(config.h)
45-AM_INIT_AUTOMAKE(indicator-applet, 0.4.92)
46+AM_INIT_AUTOMAKE(indicator-applet, 0.5.0)
47
48 AM_MAINTAINER_MODE
49 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
50
51=== modified file 'debian/changelog'
52--- debian/changelog 2012-03-16 14:20:16 +0000
53+++ debian/changelog 2012-04-04 19:56:20 +0000
54@@ -1,3 +1,10 @@
55+indicator-applet (0.5.0-0ubuntu1~ppa1) precise; urgency=low
56+
57+ * New upstream release.
58+ * Fixing scroll mask (LP: #973538)
59+
60+ -- Ted Gould <ted@ubuntu.com> Wed, 04 Apr 2012 14:40:07 -0500
61+
62 indicator-applet (0.4.92-0ubuntu3) precise; urgency=low
63
64 * debian/indicator-applet.install:
65
66=== modified file 'src/applet-main.c'
67--- src/applet-main.c 2012-02-23 05:48:51 +0000
68+++ src/applet-main.c 2012-04-04 19:56:20 +0000
69@@ -374,6 +374,8 @@
70 GtkWidget * box = (packdirection == GTK_PACK_DIRECTION_LTR) ?
71 gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3) : gtk_box_new(GTK_ORIENTATION_VERTICAL, 3);
72
73+ gtk_widget_add_events(GTK_WIDGET(menuitem), GDK_SCROLL_MASK);
74+
75 g_object_set_data (G_OBJECT (menuitem), MENU_DATA_BOX, box);
76 g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_ENTRY, entry);
77 g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_OBJECT, io);

Subscribers

People subscribed via source and target branches