Merge lp:~cjcurran/indicator-sound/notifications-moved-service-side into lp:indicator-sound/fourth

[Conor Curran]

This moves the notification code service side, so as on a scroll the service triggers the notification and not the indicator.

Two benefits here:
1. The notifications are only triggered on a volume update confirmation from the pulse server. Before it was triggering the scroll on the GTK scroll event irregardless of whether the volume was updated or not. This breaks the MVC GUI pattern therefore no good.
2. Libnotify dependency is now on the service and not on the indicator in keeping with Ted's initial concept for how the indicator should be light.

[Conor Curran (cjcurran)]

I need to do some other work around this to actually send the notification.
Its in some other branch, I'll find it. Either way this should go in.

[Ted Gould (ted)]

It'd be nice to land both branches in the same release so that there isn't a feature regression. No issue in this change itself though.

review: Approve

[Conor Curran (cjcurran)]

Ill push this back till after we get the Oneiric release sorted.

Unmerged revisions

249. By Conor Curran on 2011-06-24

no whitespace in the handle event name please

248. By Conor Curran on 2011-06-24

stripped the notification stuff from the indicator and put in place the flag to determine when to send notifications from the device object

=== modified file 'configure.ac'
--- configure.ac	2011-06-28 13:50:44 +0000
+++ configure.ac	2011-07-07 09:28:32 +0000
@@ -52,15 +52,13 @@
     [PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                indicator3 >= $INDICATOR_REQUIRED_VERSION
                                dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                               libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= $LIBNOTIFY_REQUIRED_VERSION)
+                               libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS)
         ],
       [test "x$with_gtk" = x2],
     [PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                indicator >= $INDICATOR_REQUIRED_VERSION
                                dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                               libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
-                               libnotify >= $LIBNOTIFY_REQUIRED_VERSION)
+                               libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS)
         ],
     [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
 )

=== modified file 'src/device.c'
--- src/device.c	2011-05-18 09:45:49 +0000
+++ src/device.c	2011-07-07 09:28:32 +0000
@@ -34,6 +34,7 @@
   VoipInputMenuItem*  voip_input_menu_item;
   SoundState          current_sound_state;
   SoundServiceDbus*   service;
+  gboolean            scroll_update;
 };
 
 #define DEVICE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DEVICE_TYPE, DevicePrivate))
@@ -69,7 +70,8 @@
   priv->voip_input_menu_item = NULL;
   priv->current_sound_state = UNAVAILABLE;
   priv->service = NULL;
-
+  priv->scroll_update = FALSE;
+  
   // Init our menu items.
   priv->mute_menuitem = g_object_new (MUTE_MENU_ITEM_TYPE, NULL);
   priv->voip_input_menu_item = g_object_new (VOIP_INPUT_MENU_ITEM_TYPE, NULL);;
@@ -107,12 +109,22 @@
 }
 
 void
+device_set_scroll_update (Device* self, gboolean update)
+{
+  DevicePrivate* priv = DEVICE_GET_PRIVATE(self);
+  priv->scroll_update = update;
+}
+
+void
 device_sink_update (Device* self,
                     const pa_sink_info* update)
 {
   DevicePrivate* priv = DEVICE_GET_PRIVATE (self);
   slider_menu_item_update (priv->volume_slider_menuitem, update);
-
+  if (priv->scroll_update == TRUE ){
+    g_debug ("Send out a notification !!");
+    priv->scroll_update = FALSE;
+  }
   SoundState state = device_get_state_from_volume (self);
   if (priv->current_sound_state != state){
     priv->current_sound_state  = state;

=== modified file 'src/device.h'
--- src/device.h	2011-03-24 15:22:30 +0000
+++ src/device.h	2011-07-07 09:28:32 +0000
@@ -65,6 +65,7 @@
 void device_sink_deactivated (Device* self);
 void device_update_mute (Device* self, gboolean mute_update);
 void device_ensure_sink_is_unmuted (Device* self);
+void device_set_scroll_update (Device* self, gboolean scroll_update);
 
 // source and sinkinput/client related for VOIP functionality
 void device_update_voip_input_source (Device* sink, const pa_source_info* update);

=== modified file 'src/indicator-sound.c'
--- src/indicator-sound.c	2011-06-22 19:19:49 +0000
+++ src/indicator-sound.c	2011-07-07 09:28:32 +0000
@@ -672,9 +672,7 @@
     value -= gtk_adjustment_get_step_increment (adj);
   }
   //g_debug("indicator-sound-scroll - update slider with value %f", value);
-  volume_widget_update(VOLUME_WIDGET(priv->volume_widget), value, "scroll updates");
-
-  sound_state_manager_show_notification (priv->state_manager, value);
+  volume_widget_update(VOLUME_WIDGET(priv->volume_widget), value, "scroll-updates");
 }
 
 void

=== modified file 'src/slider-menu-item.c'
--- src/slider-menu-item.c	2011-03-22 19:53:19 +0000
+++ src/slider-menu-item.c	2011-07-07 09:28:32 +0000
@@ -111,7 +111,17 @@
            volume_input,
            name);
 */
-
+  /**
+  We want to send notifications only when we get a scroll update
+  We also only want these notifications to be sent when the server confirms the 
+  update => MVC
+  **/
+  g_debug ("Name handle on the handle event %s", name);
+  if (g_ascii_strncasecmp("scroll-updates", name, 14) == 0)
+  {
+    device_set_scroll_update (priv->a_sink, TRUE);
+  }
+  
   slider_menu_item_update_volume (SLIDER_MENU_ITEM (mi), volume_input);
   device_ensure_sink_is_unmuted (priv->a_sink);
 }
@@ -158,7 +168,7 @@
   pa_cvolume_set(&new_volume, 1, new_volume_value);
 
   SliderMenuItemPrivate* priv = SLIDER_MENU_ITEM_GET_PRIVATE (self);
-
+    
   pa_cvolume_set(&priv->volume, priv->channel_map.channels, new_volume_value);
   pm_update_volume (priv->index, new_volume);
 }

=== modified file 'src/sound-state-manager.c'
--- src/sound-state-manager.c	2011-04-05 03:14:19 +0000
+++ src/sound-state-manager.c	2011-07-07 09:28:32 +0000
@@ -18,7 +18,6 @@
 */
 
 #include <libindicator/indicator-image-helper.h>
-#include <libnotify/notify.h>
 
 #include "config.h"
 
@@ -35,7 +34,6 @@
   GList* blocked_animation_list;
   SoundState current_state;
   GtkImage* speaker_image;
-  NotifyNotification* notification;  
   GSettings *settings_manager;  
 };
 
@@ -48,9 +46,6 @@
 static GList* blocked_iter = NULL;
 static gboolean can_animate = FALSE;
 
-//Notifications
-static void sound_state_manager_notification_init (SoundStateManager* self);
-
 //Animation/State related
 static void sound_state_manager_prepare_blocked_animation (SoundStateManager* self);
 static gboolean sound_state_manager_start_animation (gpointer user_data);
@@ -75,12 +70,9 @@
   priv->volume_states = NULL;
   priv->speaker_image = NULL;
   priv->blocked_animation_list = NULL;
-  priv->notification = NULL;  
   priv->settings_manager = NULL;
 
   priv->settings_manager = g_settings_new("com.canonical.indicators.sound");
-
-  sound_state_manager_notification_init (self);
   
   sound_state_manager_prepare_state_image_names (self);
   sound_state_manager_prepare_blocked_animation (self);
@@ -108,10 +100,6 @@
 
   sound_state_manager_free_the_animation_list (self);
 
-  if (priv->notification) {
-    notify_uninit();
-  }
-
   g_object_unref(priv->settings_manager);
   
   G_OBJECT_CLASS (sound_state_manager_parent_class)->dispose (object);
@@ -131,67 +119,6 @@
   design_team_size = gtk_icon_size_register("design-team-size", 22, 22);  
 }
 
-static void
-sound_state_manager_notification_init (SoundStateManager* self)
-{
-  SoundStateManagerPrivate* priv = SOUND_STATE_MANAGER_GET_PRIVATE(self);
-
-  if (!notify_init(PACKAGE_NAME))
-    return;
-
-  GList* caps = notify_get_server_caps();
-  gboolean has_notify_osd = FALSE;
-
-  if (caps) {
-    if (g_list_find_custom(caps, "x-canonical-private-synchronous",
-                           (GCompareFunc) g_strcmp0)) {
-      has_notify_osd = TRUE;
-    }
-    g_list_foreach(caps, (GFunc) g_free, NULL);
-    g_list_free(caps);
-  }
-
-  if (has_notify_osd) {
-    priv->notification = notify_notification_new(PACKAGE_NAME, NULL, NULL);
-    notify_notification_set_hint_string(priv->notification,
-                                        "x-canonical-private-synchronous", PACKAGE_NAME);
-  }
-}
-
-void
-sound_state_manager_show_notification (SoundStateManager *self,
-                                       double value)
-{
-  SoundStateManagerPrivate* priv = SOUND_STATE_MANAGER_GET_PRIVATE(self);
-
-  if (priv->notification == NULL || 
-      g_settings_get_boolean (priv->settings_manager, "show-notify-osd-on-scroll") == FALSE){
-    return;
-  }
-
-  char *icon;
-  const int notify_value = CLAMP((int)value, -1, 101);
-  
-  SoundState state = sound_state_get_from_volume ((int)value);
-      
-  if (state == ZERO_LEVEL) {
-    // Not available for all the themes
-    icon = "notification-audio-volume-off";
-  } else if (state == LOW_LEVEL) {
-    icon = "notification-audio-volume-low";
-  } else if (state == MEDIUM_LEVEL) {
-    icon = "notification-audio-volume-medium";
-  } else if (state == HIGH_LEVEL) {
-    icon = "notification-audio-volume-high";
-  } else {
-    icon = "notification-audio-volume-muted";
-  }
-
-  notify_notification_update(priv->notification, PACKAGE_NAME, NULL, icon);
-  notify_notification_set_hint_int32(priv->notification, "value", notify_value);
-  notify_notification_show(priv->notification, NULL);
-}
-
 
 /*
 Prepare states versus images names hash.

=== modified file 'src/sound-state-manager.h'
--- src/sound-state-manager.h	2011-02-11 15:21:00 +0000
+++ src/sound-state-manager.h	2011-07-07 09:28:32 +0000
@@ -58,8 +58,6 @@
 void sound_state_manager_get_state_cb (GObject *object,
                                        GAsyncResult *res,
                                        gpointer user_data);
-void sound_state_manager_show_notification (SoundStateManager *self,
-                                            double value);
 
 
 G_END_DECLS