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

[Ted Gould]

0.5.0

=== modified file 'ChangeLog'
--- ChangeLog	2012-03-09 21:03:10 +0000
+++ ChangeLog	2012-04-04 19:56:20 +0000
@@ -1,5 +1,19 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Ted Gould  <[e-mail]>
+
+	0.5.0
+
[phone]  Charles Kerr  <[e-mail]>
+
+	Merge lp:~jconti/indicator-applet/fix_scroll_event to adds GDK_SCROLL_MASK to the indicator menu items when they're created.
+	
+	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.
+
[phone]  Jason Conti  <[e-mail]>
+
+	Add GDK_SCROLL_MASK to the indicator menu items so scroll-events are received.
+
 2012-03-09  Ted Gould  <[e-mail]>
 
 	0.4.92
 
=== modified file 'configure'
--- configure	2012-03-09 21:03:10 +0000
+++ configure	2012-04-04 19:56:20 +0000
@@ -2730,7 +2730,7 @@
 
 # Define the identity of the package.
  PACKAGE=indicator-applet
- VERSION=0.4.92
+ VERSION=0.5.0
 
 
 cat >>confdefs.h <<_ACEOF
 
=== modified file 'configure.ac'
--- configure.ac	2012-03-09 21:03:10 +0000
+++ configure.ac	2012-04-04 19:56:20 +0000
@@ -4,7 +4,7 @@
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-applet, 0.4.92)
+AM_INIT_AUTOMAKE(indicator-applet, 0.5.0)
 
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-03-16 14:20:16 +0000
+++ debian/changelog	2012-04-04 19:56:20 +0000
@@ -1,3 +1,10 @@
+indicator-applet (0.5.0-0ubuntu1~ppa1) precise; urgency=low
+
+  * New upstream release.
+    * Fixing scroll mask (LP: #973538)
+
+ -- Ted Gould <[e-mail]>  Wed, 04 Apr 2012 14:40:07 -0500
+
 indicator-applet (0.4.92-0ubuntu3) precise; urgency=low
 
   * debian/indicator-applet.install:
 
=== modified file 'src/applet-main.c'
--- src/applet-main.c	2012-02-23 05:48:51 +0000
+++ src/applet-main.c	2012-04-04 19:56:20 +0000
@@ -374,6 +374,8 @@
   GtkWidget * box = (packdirection == GTK_PACK_DIRECTION_LTR) ?
       gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3) : gtk_box_new(GTK_ORIENTATION_VERTICAL, 3);
 
+  gtk_widget_add_events(GTK_WIDGET(menuitem), GDK_SCROLL_MASK);
+
   g_object_set_data (G_OBJECT (menuitem), MENU_DATA_BOX, box);
   g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_ENTRY,  entry);
   g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_OBJECT, io);