[ekiga] Fix another compilation error with GTK 2.24



commit c47570afae08ab2f8445499d5a179632facae8e7
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Tue May 3 16:45:03 2011 +0200

    Fix another compilation error with GTK 2.24
    
    Completes commit 38d2f3a1.

 src/gui/assistant.cpp |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/src/gui/assistant.cpp b/src/gui/assistant.cpp
index 463bedd..9d9dfb1 100644
--- a/src/gui/assistant.cpp
+++ b/src/gui/assistant.cpp
@@ -1201,17 +1201,14 @@ prepare_video_devices_page (EkigaAssistant *assistant)
 static void
 apply_video_devices_page (EkigaAssistant *assistant)
 {
+  gchar *device;
+  GtkTreeIter citer;
 
-  GtkComboBox *combo_box;
-  gchar *video_device;
-
-  combo_box = GTK_COMBO_BOX (assistant->priv->video_device);
-  video_device = gtk_combo_box_get_active_text (combo_box);
-
-  if (video_device) {
-    gm_conf_set_string (VIDEO_DEVICES_KEY "input_device", video_device);
-    g_free (video_device);
-  }
+  if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (assistant->priv->video_device), &citer))
+    g_warn_if_reached ();
+  gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (assistant->priv->video_device)), &citer, 0, &device, -1);
+  gm_conf_set_string (VIDEO_DEVICES_KEY "input_device", device);
+  g_free (device);
 }
 
 



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