aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.am2
-rw-r--r--src/indicator-sound.c66
-rw-r--r--src/sound-service-dbus.c1
3 files changed, 30 insertions, 39 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 73bb259..b7de930 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,8 +43,6 @@ indicator_sound_service_SOURCES = \
sound-service-dbus.h \
sound-service-dbus.c \
sound-service-server.h \
- sound-service-marshal.c \
- sound-service-marshal.h \
slider-menu-item.h \
slider-menu-item.c
indicator_sound_service_CFLAGS = $(SOUNDSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror
diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index aecbe7a..105f00b 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -40,7 +40,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include "dbus-shared-names.h"
#include "sound-service-client.h"
#include "common-defs.h"
-#include "sound-service-marshal.h"
// GObject Boiler plate
#define INDICATOR_SOUND_TYPE (indicator_sound_get_type ())
@@ -170,8 +169,12 @@ indicator_sound_dispose (GObject *object)
self->service = NULL;
}
g_hash_table_destroy(volume_states);
- g_list_foreach (blocked_animation_list, (GFunc)g_object_unref, NULL);
- g_list_free(blocked_animation_list);
+
+ if(blocked_animation_list != NULL){
+ g_list_foreach (blocked_animation_list, (GFunc)g_object_unref, NULL);
+ g_list_free(blocked_animation_list);
+ }
+
G_OBJECT_CLASS (indicator_sound_parent_class)->dispose (object);
return;
}
@@ -323,32 +326,22 @@ Only called at startup.
*/
static void prepare_blocked_animation()
{
- GError* error= NULL;
- int i;
-
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));
- GtkIconTheme* theme = gtk_icon_theme_get_default();
- GdkPixbuf* mute_buf = gtk_icon_theme_load_icon(theme,
- muted_name,
- 22,
- GTK_ICON_LOOKUP_GENERIC_FALLBACK,
- &error);
- if(error != NULL){
- g_error("indicator-sound : prepare_blocked_animation - %s", error->message);
- g_error_free(error);
- return;
- }
-
- GdkPixbuf* blocked_buf = gtk_icon_theme_load_icon(theme, blocked_name,
- 22,
- GTK_ICON_LOOKUP_GENERIC_FALLBACK,
- &error);
- if(error != NULL){
- g_error("indicator-sound : prepare_blocked_animation - %s", error->message);
- g_error_free(error);
- return;
- }
+
+ GtkImage* temp_image = indicator_image_helper(muted_name);
+ GdkPixbuf* mute_buf = gtk_image_get_pixbuf(temp_image);
+
+ temp_image = indicator_image_helper(blocked_name);
+ GdkPixbuf* blocked_buf = gtk_image_get_pixbuf(temp_image);
+
+ int i;
+
+ if(mute_buf == NULL || blocked_buf == NULL){
+ g_debug("Don bother with the animation, the theme aint got the goods");
+ return;
+ }
+
// sample 22 snapshots - range : 0-256
for(i = 0; i < 23; i++)
{
@@ -356,7 +349,6 @@ static void prepare_blocked_animation()
gdk_pixbuf_get_width(mute_buf),
gdk_pixbuf_get_height(mute_buf),
0, 0, 1, 1, GDK_INTERP_BILINEAR, MIN(255, i * 11));
- g_debug("creating blocking animation - alpha value = %i", MIN(255, i * 11));
blocked_animation_list = g_list_append(blocked_animation_list, gdk_pixbuf_copy(blocked_buf));
}
}
@@ -482,14 +474,16 @@ static void catch_signal_sink_input_while_muted(DBusGProxy * proxy, gboolean blo
{
g_debug("signal caught - sink input while muted with value %i", block_value);
if (block_value == 1 && animation_id == 0 ) {
- // We can assume we are in the muted state !
- gchar* image_name = g_hash_table_lookup(volume_states, GINT_TO_POINTER(STATE_MUTED_WHILE_INPUT));
- GtkImage * tempimage = indicator_image_helper(image_name);
- gtk_image_set_from_pixbuf(speaker_image, gtk_image_get_pixbuf(tempimage));
- g_object_ref_sink(tempimage);
-
- blocked_iter = blocked_animation_list;
- animation_id = g_timeout_add_seconds(1, fade_back_to_mute_image, NULL);
+ if(blocked_animation_list != NULL)
+ {
+ gchar* image_name = g_hash_table_lookup(volume_states, GINT_TO_POINTER(STATE_MUTED_WHILE_INPUT));
+ GtkImage * tempimage = indicator_image_helper(image_name);
+ gtk_image_set_from_pixbuf(speaker_image, gtk_image_get_pixbuf(tempimage));
+ g_object_ref_sink(tempimage);
+
+ blocked_iter = blocked_animation_list;
+ animation_id = g_timeout_add_seconds(1, fade_back_to_mute_image, NULL);
+ }
}
}
diff --git a/src/sound-service-dbus.c b/src/sound-service-dbus.c
index 1cc5f0d..260e064 100644
--- a/src/sound-service-dbus.c
+++ b/src/sound-service-dbus.c
@@ -26,7 +26,6 @@
#include "dbus-shared-names.h"
#include "sound-service-dbus.h"
#include "common-defs.h"
-#include "sound-service-marshal.h"
#include "pulse-manager.h"
// DBUS methods