From 8de1359af1cf50acdd5a9b8a6f470d5f00d332c5 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Fri, 12 Mar 2010 10:56:56 +0000 Subject: properly cleaned up the makefile and includes, fixed seg-fault on clearlooks --- src/Makefile.am | 2 -- src/indicator-sound.c | 36 ++++++++++-------------------------- src/sound-service-dbus.c | 1 - src/sound-service.c | 4 ++-- 4 files changed, 12 insertions(+), 31 deletions(-) (limited to 'src') 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..1490d7c 100644 --- a/src/indicator-sound.c +++ b/src/indicator-sound.c @@ -40,7 +40,6 @@ with this program. If not, see . #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 ()) @@ -323,32 +322,18 @@ 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; + // sample 22 snapshots - range : 0-256 for(i = 0; i < 23; i++) { @@ -356,7 +341,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)); } } 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 diff --git a/src/sound-service.c b/src/sound-service.c index 403b2b0..9e967c2 100644 --- a/src/sound-service.c +++ b/src/sound-service.c @@ -44,8 +44,8 @@ service_shutdown (IndicatorService *service, gpointer user_data) if (mainloop != NULL) { g_debug("Service shutdown !"); // TODO: uncomment for release !! - close_pulse_activites(); - g_main_loop_quit(mainloop); +/* close_pulse_activites();*/ +/* g_main_loop_quit(mainloop);*/ } return; } -- cgit v1.2.3