ekiga r7454 - in trunk: . src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Thu Dec 11 19:50:05 2008
New Revision: 7454
URL: http://svn.gnome.org/viewvc/ekiga?rev=7454&view=rev

Log:
Moved more notifiers where they should be.


Modified:
   trunk/ChangeLog
   trunk/src/gui/assistant.cpp
   trunk/src/gui/conf.cpp

Modified: trunk/src/gui/assistant.cpp
==============================================================================
--- trunk/src/gui/assistant.cpp	(original)
+++ trunk/src/gui/assistant.cpp	Thu Dec 11 19:50:05 2008
@@ -308,6 +308,12 @@
   remove_combo_box (GTK_COMBO_BOX (assistant->priv->audio_ringer),  device_string.c_str());
 }
 
+static void kind_of_net_changed_nt (G_GNUC_UNUSED gpointer id,
+                                         GmConfEntry *, 
+                                         gpointer)
+{
+  gm_conf_set_int (GENERAL_KEY "kind_of_net", NET_CUSTOM);
+}
 
 static void
 create_welcome_page (EkigaAssistant *assistant)
@@ -1646,5 +1652,13 @@
   conn = audiooutput_core->device_removed.connect (sigc::bind (sigc::ptr_fun (on_audiooutput_device_removed_cb), assistant));
   assistant->priv->connections.push_back (conn);
 
+  /* Notifiers for the VIDEO_CODECS_KEY keys */
+  gm_conf_notifier_add (VIDEO_CODECS_KEY "enable_video",
+			kind_of_net_changed_nt, NULL);	     
+  gm_conf_notifier_add (VIDEO_CODECS_KEY "maximum_video_tx_bitrate", 
+			kind_of_net_changed_nt, NULL);
+  gm_conf_notifier_add (VIDEO_CODECS_KEY "temporal_spatial_tradeoff", 
+			kind_of_net_changed_nt, NULL);
+
   return GTK_WIDGET (assistant);
 }

Modified: trunk/src/gui/conf.cpp
==============================================================================
--- trunk/src/gui/conf.cpp	(original)
+++ trunk/src/gui/conf.cpp	Thu Dec 11 19:50:05 2008
@@ -64,10 +64,6 @@
 				    GmConfEntry *entry,
                                     gpointer data);
 
-static void network_settings_changed_nt (gpointer id,
-					 GmConfEntry *entry,
-                                         gpointer data);
-
 
 /* DESCRIPTION  :  This callback is called when the "stay_on_top" 
  *                 config value changes.
@@ -96,23 +92,6 @@
 }
 
 
-/* DESCRIPTION    : This is called when any setting related to the druid 
- *                  network speed selecion changes.
- * BEHAVIOR       : Just writes an entry in the config database registering 
- *                  that fact.
- * PRE            : None
- */
-static void 
-network_settings_changed_nt (G_GNUC_UNUSED gpointer id,
-                             GmConfEntry *, 
-                             gpointer)
-{
-  //gdk_threads_enter ();
-  gm_conf_set_int (GENERAL_KEY "kind_of_net", NET_CUSTOM);
-  //gdk_threads_leave ();
-}
-
-
 /* The functions */
 gboolean 
 gnomemeeting_conf_check ()
@@ -152,18 +131,6 @@
   /* Notifiers for the VIDEO_DISPLAY_KEY keys */
   gm_conf_notifier_add (VIDEO_DISPLAY_KEY "stay_on_top", 
 			stay_on_top_changed_nt, main_window);
- 
-  
-  /* Notifiers for the VIDEO_CODECS_KEY keys */
-  gm_conf_notifier_add (VIDEO_CODECS_KEY "enable_video",
-			network_settings_changed_nt, NULL);	     
-
-  gm_conf_notifier_add (VIDEO_CODECS_KEY "maximum_video_tx_bitrate", 
-			network_settings_changed_nt, NULL);
-
-
-  gm_conf_notifier_add (VIDEO_CODECS_KEY "temporal_spatial_tradeoff", 
-			network_settings_changed_nt, NULL);
 }