ekiga r5983 - in trunk: . src/devices src/gui

[mschneid svn gnome org]

Author: mschneid
Date: Wed Feb 20 19:43:59 2008
New Revision: 5983
URL: http://svn.gnome.org/viewvc/ekiga?rev=5983&view=rev

Log:
Moved gconf initialization.


Modified:
   trunk/ChangeLog
   trunk/src/devices/videooutput.h
   trunk/src/gui/conf.cpp
   trunk/src/gui/main.cpp

Modified: trunk/src/devices/videooutput.h
==============================================================================
--- trunk/src/devices/videooutput.h	(original)
+++ trunk/src/devices/videooutput.h	Wed Feb 20 19:43:59 2008
@@ -37,8 +37,8 @@
  */
 
 
-#ifndef _EKIGAVIDEOIO_H_
-#define _EKIGAVIDEOIO_H_
+#ifndef _EKIGA_VIDEO_OUTPUT_H_
+#define _EKIGA_VIDEO_OUTPUT_H_
 
 #include "display-core.h"
 #include "common.h"

Modified: trunk/src/gui/conf.cpp
==============================================================================
--- trunk/src/gui/conf.cpp	(original)
+++ trunk/src/gui/conf.cpp	Wed Feb 20 19:43:59 2008
@@ -253,10 +253,6 @@
   main_window = GnomeMeeting::Process ()->GetMainWindow ();
 
 
-  /* Init gm_conf */
-  gm_conf_watch ();
-
-    
   /* There are in general 2 notifiers to attach to each widget :
    * - the notifier that will update the widget itself to the new key,
    *   that one is attached when creating the widget.

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Wed Feb 20 19:43:59 2008
@@ -4251,6 +4251,14 @@
   }
 #endif
 
+  /* Configuration database initialization */
+#ifdef HAVE_GCONF
+  if (!gnomemeeting_conf_check ()) 
+    error = 3;
+#endif
+  /* Init gm_conf */
+  gm_conf_watch ();
+
   /* Ekiga initialisation */
   static GnomeMeeting instance;
   GnomeMeeting::Process ()->InitEngine ();
@@ -4265,11 +4273,7 @@
     error = 1;
   GnomeMeeting::Process ()->BuildGUI ();
   
-  /* Configuration database initialization */
-#ifdef HAVE_GCONF
-  if (!gnomemeeting_conf_check ()) 
-    error = 3;
-#endif
+  /* Add depreciated notifiers */
   gnomemeeting_conf_init ();
 
   /* Show the window if there is no error, exit with a popup if there