[ekiga] Fixed warnings when there is no audio button.



commit 7aa90c65baa90e575e80bbeecb0a7db96b62a7db
Author: Damien Sandras <dsandras seconix com>
Date:   Sat Oct 31 18:50:11 2009 +0100

    Fixed warnings when there is no audio button.
    
    Having no audio button occurs with pulseaudio. People should handle
    the volume using native pulseaudio tools.

 src/gui/main_window.cpp |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index 17ee134..1d63825 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -1187,7 +1187,8 @@ on_audioinput_device_opened_cb (Ekiga::AudioInputManager & /* manager */,
   EkigaMainWindow *mw = EKIGA_MAIN_WINDOW (self);
 
   gtk_widget_set_sensitive (mw->priv->audio_input_volume_frame, settings.modifyable);
-  gtk_widget_set_sensitive (mw->priv->audio_settings_button, settings.modifyable);
+  if (mw->priv->audio_settings_button)
+    gtk_widget_set_sensitive (mw->priv->audio_settings_button, settings.modifyable);
   GTK_ADJUSTMENT (mw->priv->adj_input_volume)->value = settings.volume;
   
   gtk_widget_queue_draw (mw->priv->audio_input_volume_frame);
@@ -1202,7 +1203,8 @@ on_audioinput_device_closed_cb (Ekiga::AudioInputManager & /* manager */,
 {
   EkigaMainWindow *mw = EKIGA_MAIN_WINDOW (self);
 
-  gtk_widget_set_sensitive (mw->priv->audio_settings_button, FALSE);
+  if (mw->priv->audio_settings_button)
+    gtk_widget_set_sensitive (mw->priv->audio_settings_button, FALSE);
   gtk_widget_set_sensitive (mw->priv->audio_input_volume_frame, FALSE);
 }
 
@@ -1293,7 +1295,8 @@ on_audiooutput_device_opened_cb (Ekiga::AudioOutputManager & /*manager*/,
   if (ps == Ekiga::secondary)
     return;
 
-  gtk_widget_set_sensitive (mw->priv->audio_settings_button, settings.modifyable);
+  if (mw->priv->audio_settings_button)
+    gtk_widget_set_sensitive (mw->priv->audio_settings_button, settings.modifyable);
   gtk_widget_set_sensitive (mw->priv->audio_output_volume_frame, settings.modifyable);
   GTK_ADJUSTMENT (mw->priv->adj_output_volume)->value = settings.volume;
 
@@ -1313,7 +1316,8 @@ on_audiooutput_device_closed_cb (Ekiga::AudioOutputManager & /*manager*/,
   if (ps == Ekiga::secondary)
     return;
 
-  gtk_widget_set_sensitive (mw->priv->audio_settings_button, FALSE);
+  if (mw->priv->audio_settings_button)
+    gtk_widget_set_sensitive (mw->priv->audio_settings_button, FALSE);
   gtk_widget_set_sensitive (mw->priv->audio_output_volume_frame, FALSE);
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]