aboutsummaryrefslogtreecommitdiff
path: root/src/indicator-sound.c
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-01-24 17:29:31 -0600
committerConor Curran <conor.curran@canonical.com>2011-01-24 17:29:31 -0600
commit729ff587783dcf571b4a94132b57bce695a5e30f (patch)
treedb454dd51efa8d226389e00a42f1d189751f89ba /src/indicator-sound.c
parenteb2c1d7fc7ba7f8d2ae35141b2bf13ef69795b1d (diff)
downloadayatana-indicator-sound-729ff587783dcf571b4a94132b57bce695a5e30f.tar.gz
ayatana-indicator-sound-729ff587783dcf571b4a94132b57bce695a5e30f.tar.bz2
ayatana-indicator-sound-729ff587783dcf571b4a94132b57bce695a5e30f.zip
compiling ...
Diffstat (limited to 'src/indicator-sound.c')
-rw-r--r--src/indicator-sound.c23
1 files changed, 7 insertions, 16 deletions
diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index 97a4c07..b3f19bc 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -98,12 +98,6 @@ static void create_connection_to_service (GObject *source_object,
static void connection_changed (IndicatorServiceManager * sm,
gboolean connected,
gpointer userdata);
-static void g_signal_cb ( GDBusProxy* proxy,
- gchar* sender_name,
- gchar* signal_name,
- GVariant* parameters,
- gpointer user_data);
-
static void
@@ -148,16 +142,12 @@ static void
indicator_sound_dispose (GObject *object)
{
IndicatorSound * self = INDICATOR_SOUND(object);
+ IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(self);
if (self->service != NULL) {
g_object_unref(G_OBJECT(self->service));
self->service = NULL;
}
- g_hash_table_destroy(volume_states);
-
- free_the_animation_list();
-
- IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(INDICATOR_SOUND (self));
g_list_free ( priv->transport_widgets_list );
@@ -182,10 +172,10 @@ static GtkImage *
get_icon (IndicatorObject * io)
{
IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(INDICATOR_SOUND (io));
- speaker_image = sound_state_manager_get_current_icon (priv->state_manager));
- gtk_widget_show(GTK_WIDGET(speaker_image));
+ //speaker_image = sound_state_manager_get_current_icon (priv->state_manager));
+ gtk_widget_show( GTK_WIDGET(sound_state_manager_get_current_icon (priv->state_manager)) );
- return speaker_image;
+ return sound_state_manager_get_current_icon (priv->state_manager);
}
/* Indicator based function to get the menu for the whole
@@ -742,10 +732,11 @@ indicator_sound_scroll (IndicatorObject *io, gint delta,
IndicatorScrollDirection direction)
{
//g_debug("indicator-sound-scroll - current slider value");
+ IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(INDICATOR_SOUND (io));
+ SoundState current_state = sound_state_manager_get_current_state (priv->state_manager);
- if (device_available == FALSE || current_state == STATE_MUTED)
+ if (current_state == UNAVAILABLE || current_state == MUTED)
return;
- IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(INDICATOR_SOUND (io));
GtkWidget* slider_widget = volume_widget_get_ido_slider(VOLUME_WIDGET(priv->volume_widget));
GtkWidget* slider = ido_scale_menu_item_get_scale((IdoScaleMenuItem*)slider_widget);