Merge lp:~ken-vandine/indicator-sound/libnotify_and_dbusmenu_change into lp:~indicator-applet-developers/indicator-sound/trunk_3

[Ken VanDine]

Ported to libnotify4-dev >= 0.7 and handle the Dbusmenu-Glib-0.4 rename to Dbusmenu-0.4

[Conor Curran (cjcurran)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2011-02-10 14:35:59 +0000
+++ configure.ac	2011-02-11 15:27:16 +0000
@@ -35,7 +35,7 @@
 INDICATOR_DISPLAY_OBJECTS=0.1.11
 DBUSMENUGLIB_REQUIRED_VERSION=0.3.9
 GIO_2_0_REQUIRED_VERSION=2.25.13
-LIBNOTIFY_REQUIRED_VERSION=0.5.0
+LIBNOTIFY_REQUIRED_VERSION=0.7.0
 
 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
                           indicator >= $INDICATOR_REQUIRED_VERSION
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-02-04 16:17:31 +0000
+++ src/Makefile.am	2011-02-11 15:27:16 +0000
@@ -65,7 +65,7 @@
   --vapidir=./ \
   --thread \
   --pkg gee-1.0 \
-  --pkg Dbusmenu-Glib-0.4 \
+  --pkg Dbusmenu-0.4 \
   --pkg common-defs \
 	--pkg gio-2.0 \
 	--pkg gio-unix-2.0 \
 
=== modified file 'src/indicator-sound.c'
--- src/indicator-sound.c	2011-02-02 19:05:50 +0000
+++ src/indicator-sound.c	2011-02-11 15:27:16 +0000
@@ -401,8 +401,6 @@
                                   newitem,
                                   menu_volume_item,
                                   parent);
-  sound_state_manager_attach_notification_to_volume_widget (priv->state_manager,
-                                                            volume_widget);
   return TRUE;
 }
 
 
=== modified file 'src/sound-state-manager.c'
--- src/sound-state-manager.c	2011-02-02 19:05:50 +0000
+++ src/sound-state-manager.c	2011-02-11 15:27:16 +0000
@@ -151,23 +151,13 @@
   }
 
   if (has_notify_osd) {
-    priv->notification = notify_notification_new(PACKAGE_NAME, NULL, NULL, NULL);
+    priv->notification = notify_notification_new(PACKAGE_NAME, NULL, NULL);
     notify_notification_set_hint_string(priv->notification,
                                         "x-canonical-private-synchronous", "");
   }
 }
 
 void
-sound_state_manager_attach_notification_to_volume_widget (SoundStateManager *self, 
-                                                          GtkWidget* volume_widget)
-{
-  SoundStateManagerPrivate* priv = SOUND_STATE_MANAGER_GET_PRIVATE(self);
-  if (priv->notification)
-    notify_notification_attach_to_widget(priv->notification, volume_widget);
-}
-
-
-void
 sound_state_manager_show_notification (SoundStateManager *self,
                                        double value)
 {
 
=== modified file 'src/sound-state-manager.h'
--- src/sound-state-manager.h	2011-02-02 19:05:50 +0000
+++ src/sound-state-manager.h	2011-02-11 15:27:16 +0000
@@ -61,8 +61,6 @@
 void sound_state_manager_show_notification (SoundStateManager *self,
                                             double value);
 
-void sound_state_manager_attach_notification_to_volume_widget (SoundStateManager *self, 
-                                                               GtkWidget* volume_widget);
 
 G_END_DECLS