1 files changed, 100 insertions, 50 deletions

diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index 3cddb78..8867abd 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -89,6 +89,7 @@ static gboolean value_changed_event_cb(GtkRange *range, gpointer user_data);
 static gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer data);
 static void slider_grabbed(GtkWidget *widget, gpointer user_data);
 static void slider_released(GtkWidget *widget, gpointer user_data);
+static void style_changed_cb(GtkWidget *widget, gpointer user_data);
 
 // DBUS communication
 static DBusGProxy *sound_dbus_proxy = NULL;
@@ -132,8 +133,10 @@ static GList * blocked_iter = NULL;
 static void prepare_blocked_animation();
 static gboolean fade_back_to_mute_image();
 static gboolean start_animation();
+static void reset_mute_blocking_animation();
+static void free_the_animation_list();
+
 
-// Construction
 static void
 indicator_sound_class_init (IndicatorSoundClass *klass)
 {
@@ -153,7 +156,8 @@ indicator_sound_class_init (IndicatorSoundClass *klass)
 	return;
 }
 
-static void indicator_sound_init (IndicatorSound *self)
+static void
+indicator_sound_init (IndicatorSound *self)
 {
 	self->service = NULL;
 	self->service = indicator_service_manager_new_version(INDICATOR_SOUND_DBUS_NAME, INDICATOR_SOUND_DBUS_VERSION);
@@ -181,13 +185,20 @@ indicator_sound_dispose (GObject *object)
 	}
     g_hash_table_destroy(volume_states);
 
+    free_the_animation_list();
+
+	G_OBJECT_CLASS (indicator_sound_parent_class)->dispose (object);
+	return;
+}
+
+static void 
+free_the_animation_list()
+{
     if(blocked_animation_list != NULL){
         g_list_foreach (blocked_animation_list, (GFunc)g_object_unref, NULL);
         g_list_free(blocked_animation_list);
+        blocked_animation_list = NULL;
     }
-
-	G_OBJECT_CLASS (indicator_sound_parent_class)->dispose (object);
-	return;
 }
 
 static void
@@ -243,7 +254,8 @@ slider_parent_changed (GtkWidget *widget,
 new_slider_item:
 Create a new dBusMenu Slider item.
 **/
-static gboolean new_slider_item(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
+static gboolean
+new_slider_item(DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
 {
     IndicatorObject *io = NULL;
 
@@ -271,6 +283,8 @@ static gboolean new_slider_item(DbusmenuMenuitem * newitem, DbusmenuMenuitem * p
     g_signal_connect(slider, "value-changed", G_CALLBACK(value_changed_event_cb), newitem);
     g_signal_connect(volume_slider, "slider-grabbed", G_CALLBACK(slider_grabbed), NULL);
     g_signal_connect(volume_slider, "slider-released", G_CALLBACK(slider_released), NULL);
+    g_signal_connect(slider, "style-set", G_CALLBACK(style_changed_cb), NULL);
+
 
     // Set images on the ido
     GtkWidget* primary_image = ido_scale_menu_item_get_primary_image((IdoScaleMenuItem*)volume_slider);
@@ -341,7 +355,8 @@ connection_changed (IndicatorServiceManager * sm, gboolean connected, gpointer u
 /*
 Prepare states Array.
 */
-void prepare_state_machine()
+void 
+prepare_state_machine()
 {
     volume_states = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, g_free);
     g_hash_table_insert(volume_states, GINT_TO_POINTER(STATE_MUTED), g_strdup("audio-volume-muted-panel"));
@@ -358,7 +373,8 @@ prepare_blocked_animation:
 Prepares the array of images to be used in the blocked animation.
 Only called at startup.
 */
-static void prepare_blocked_animation()
+static void
+prepare_blocked_animation()
 {
     gchar* blocked_name = g_hash_table_lookup(volume_states, GINT_TO_POINTER(STATE_MUTED_WHILE_INPUT));
     gchar* muted_name = g_hash_table_lookup(volume_states, GINT_TO_POINTER(STATE_MUTED));
@@ -391,28 +407,33 @@ static void prepare_blocked_animation()
 }
 
 
-gint get_state()
+gint
+get_state()
 {
     return current_state;
 }
 
-gchar* get_state_image_name(gint state)
+gchar*
+get_state_image_name(gint state)
 {
     return g_hash_table_lookup(volume_states, GINT_TO_POINTER(state));
 }
 
-void prepare_for_tests(IndicatorObject *io)
+void
+prepare_for_tests(IndicatorObject *io)
 {
     prepare_state_machine();
     get_icon(io);
 }
 
-void tidy_up_hash()
+void
+tidy_up_hash()
 {
     g_hash_table_destroy(volume_states);
 }
 
-static void update_state(const gint state)
+static void
+update_state(const gint state)
 {
 /*    g_debug("update state beginning - previous_state = %i", previous_state);*/
 
@@ -426,7 +447,8 @@ static void update_state(const gint state)
 }
 
 
-void determine_state_from_volume(gdouble volume_percent)
+void
+determine_state_from_volume(gdouble volume_percent)
 {
 /*    g_debug("determine_state_from_volume - previous_state = %i", previous_state);*/
     if (device_available == FALSE)
@@ -448,7 +470,8 @@ void determine_state_from_volume(gdouble volume_percent)
 }
 
 
-static gboolean start_animation()
+static gboolean
+start_animation()
 {
     blocked_iter = blocked_animation_list;
     blocked_id = 0;
@@ -457,7 +480,8 @@ static gboolean start_animation()
     return FALSE;
 }
 
-static gboolean fade_back_to_mute_image()
+static gboolean
+fade_back_to_mute_image()
 {
     if(blocked_iter != NULL)
     {
@@ -468,16 +492,16 @@ static gboolean fade_back_to_mute_image()
     }
     else{
         animation_id = 0;
-/*        update_state(STATE_MUTED);*/
-        g_debug("exit from animation\n");
+        g_debug("exit from animation now\n");
         return FALSE;
     }
 }
 
-/**
-DBus method handlers
-**/
-static void fetch_sink_availability_from_dbus()
+/*******************************************************************/
+//DBus method handlers
+/*******************************************************************/
+static void
+fetch_sink_availability_from_dbus()
 {
     GError * error = NULL;
     gboolean * available_input;
@@ -503,7 +527,8 @@ static void fetch_sink_availability_from_dbus()
 
 }
 
-static void fetch_volume_percent_from_dbus()
+static void 
+fetch_volume_percent_from_dbus()
 {
     GError * error = NULL;
     gdouble *volume_percent_input;
@@ -521,7 +546,8 @@ static void fetch_volume_percent_from_dbus()
     g_debug("at the indicator start up and the volume percent returned from dbus method is %f", initial_volume_percent);
 }
 
-static void fetch_mute_value_from_dbus()
+static void 
+fetch_mute_value_from_dbus()
 {
     GError * error = NULL;
     gboolean *mute_input;
@@ -540,10 +566,11 @@ static void fetch_mute_value_from_dbus()
     g_debug("at the indicator start up and the MUTE returned from dbus method is %i", initial_mute);
 }
 
-/**
-DBus signal catchers
-**/
-static void catch_signal_sink_input_while_muted(DBusGProxy * proxy, gboolean block_value, gpointer userdata)
+/*******************************************************************/
+//DBus signal catchers
+/*******************************************************************/
+static void
+catch_signal_sink_input_while_muted(DBusGProxy * proxy, gboolean block_value, gpointer userdata)
 {
     g_debug("signal caught - sink input while muted with value %i", block_value);
     if (block_value == 1 && blocked_id == 0 && animation_id == 0 && blocked_animation_list != NULL) {
@@ -554,7 +581,8 @@ static void catch_signal_sink_input_while_muted(DBusGProxy * proxy, gboolean blo
 }
 
 
-static void catch_signal_sink_volume_update(DBusGProxy *proxy, gdouble volume_percent, gpointer userdata)
+static void
+catch_signal_sink_volume_update(DBusGProxy *proxy, gdouble volume_percent, gpointer userdata)
 {
     if (slider_in_direct_use == FALSE){
         GtkWidget *slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)volume_slider);
@@ -569,7 +597,8 @@ static void catch_signal_sink_volume_update(DBusGProxy *proxy, gdouble volume_pe
     }
 }
 
-static void catch_signal_sink_mute_update(DBusGProxy *proxy, gboolean mute_value, gpointer userdata)
+static void
+catch_signal_sink_mute_update(DBusGProxy *proxy, gboolean mute_value, gpointer userdata)
 {
     //We can be sure the service won't send a mute signal unless it has changed !
     //UNMUTE's force a volume update therefore icon is updated appropriately => no need for unmute handling here.
@@ -578,22 +607,29 @@ static void catch_signal_sink_mute_update(DBusGProxy *proxy, gboolean mute_value
         update_state(STATE_MUTED);
     }
     else{
-        if(animation_id != 0){
-            g_debug("about to remove the animation_id callback from the mainloop!!**");
-            g_source_remove(animation_id);
-            animation_id = 0;
-        }
-        if(blocked_id != 0){
-            g_debug("about to remove the blocked_id callback from the mainloop!!**");
-            g_source_remove(blocked_id);
-            blocked_id = 0;            
-        }
+        reset_mute_blocking_animation();
     }
     g_debug("signal caught - sink mute update with mute value: %i", mute_value);
     gtk_widget_set_sensitive(volume_slider, !mute_value);
 }
 
-static void catch_signal_sink_availability_update(DBusGProxy *proxy, gboolean available_value, gpointer userdata)
+static void
+reset_mute_blocking_animation()
+{
+    if(animation_id != 0){
+        g_debug("about to remove the animation_id callback from the mainloop!!**");
+        g_source_remove(animation_id);
+        animation_id = 0;
+    }
+    if(blocked_id != 0){
+        g_debug("about to remove the blocked_id callback from the mainloop!!**");
+        g_source_remove(blocked_id);
+        blocked_id = 0;            
+    } 
+}
+
+static void
+catch_signal_sink_availability_update(DBusGProxy *proxy, gboolean available_value, gpointer userdata)
 {
     device_available  = available_value;
     if (device_available == FALSE){
@@ -602,15 +638,19 @@ static void catch_signal_sink_availability_update(DBusGProxy *proxy, gboolean av
     g_debug("signal caught - sink availability update with  value: %i", available_value);
 }
 
-/**
-UI callbacks
-**/
+
+
+
+/*******************************************************************/
+//UI callbacks
+/******************************************************************/
 
 /**
 value_changed_event_cb:
 This callback will get triggered irregardless of whether its a user change or a programmatic change.
 **/
-static gboolean value_changed_event_cb(GtkRange *range, gpointer user_data)
+static gboolean
+value_changed_event_cb(GtkRange *range, gpointer user_data)
 {
     gdouble current_value =  CLAMP(gtk_range_get_value(range), 0, 100);
     if(current_value == exterior_vol_update){   
@@ -630,13 +670,15 @@ static gboolean value_changed_event_cb(GtkRange *range, gpointer user_data)
 }
 
 
-static void slider_grabbed (GtkWidget *widget, gpointer user_data)
+static void
+slider_grabbed (GtkWidget *widget, gpointer user_data)
 {
     slider_in_direct_use = TRUE;
     g_debug ("!!!!!!  grabbed\n");
 }
 
-static void slider_released (GtkWidget *widget, gpointer user_data)
+static void
+slider_released (GtkWidget *widget, gpointer user_data)
 {
     slider_in_direct_use = FALSE;
     g_debug ("!!!!!! released\n");
@@ -646,7 +688,8 @@ static void slider_released (GtkWidget *widget, gpointer user_data)
 /**
 key_press_cb:
 **/
-static gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer data)
+static gboolean
+key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer data)
 {
     gboolean digested = FALSE;
 
@@ -707,6 +750,15 @@ static gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, gpointer dat
     return digested;
 }
 
+static void
+style_changed_cb(GtkWidget *widget, gpointer user_data)
+{
+    g_debug("Just caught a style change event");
+    reset_mute_blocking_animation();
+    update_state(current_state);
+    free_the_animation_list();
+    prepare_blocked_animation();
+}
 
 static void
 scroll (IndicatorObject *io, gint delta, IndicatorScrollDirection direction)
@@ -718,8 +770,6 @@ scroll (IndicatorObject *io, gint delta, IndicatorScrollDirection direction)
     GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (sound->slider));
     gdouble value = gtk_range_get_value (GTK_RANGE (sound->slider));
     
-    //g_debug("the scroll step size = %f", adj->step_increment);
-
     if (direction == INDICATOR_OBJECT_SCROLL_UP){
         value += adj->step_increment;
     }