ekiga r7177 - trunk/src/gui

[sfre svn gnome org]

Author: sfre
Date: Wed Oct  8 18:49:19 2008
New Revision: 7177
URL: http://svn.gnome.org/viewvc/ekiga?rev=7177&view=rev

Log:
Drop the GConf schema version test.

This test is obsolete. Ekiga should just have sensible default values.

Modified:
   trunk/src/gui/conf.cpp
   trunk/src/gui/main.cpp

Modified: trunk/src/gui/conf.cpp
==============================================================================
--- trunk/src/gui/conf.cpp	(original)
+++ trunk/src/gui/conf.cpp	Wed Oct  8 18:49:19 2008
@@ -169,21 +169,6 @@
 
 
 /* The functions */
-gboolean 
-gnomemeeting_conf_check ()
-{
-  int conf_test = -1;
-  
-  /* Check the config is ok */
-  conf_test = gm_conf_get_int (GENERAL_KEY "gconf_test_age");
-  
-  if (conf_test != SCHEMA_AGE) 
-    return FALSE;
-
-  return TRUE;
-}
-
-
 void
 gnomemeeting_conf_init ()
 {

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Wed Oct  8 18:49:19 2008
@@ -4339,12 +4339,6 @@
   }
 #endif
 
-  /* Configuration database initialization */
-#ifdef HAVE_GCONF
-  if (!gnomemeeting_conf_check ()) 
-    error = 3;
-#endif
-
   /* Init gm_conf */
   gm_conf_watch ();
 
@@ -4395,16 +4389,6 @@
       title = g_strdup (_("No usable audio codecs detected"));
       msg = g_strdup (_("Ekiga didn't find any usable audio codec. Make sure that your installation is correct."));
       break;
-#ifdef HAVE_GCONF
-    case 3:
-      {
-	gchar *key_name = g_strdup ("\"/apps/" PACKAGE_NAME "/general/gconf_test_age\"");
-	title = g_strdup (_("Configuration database corruption"));
-	msg = g_strdup_printf (_("Ekiga got an invalid value for the configuration key %s.\n\nIt probably means that your configuration schemas have not been correctly installed or that the permissions are not correct.\n\nPlease check the FAQ (http://www.ekiga.org/), the troubleshooting section of the GConf site (http://www.gnome.org/projects/gconf/) or the mailing list archives for more information (http://mail.gnome.org) about this problem."), key_name);
-	g_free (key_name);
-      }
-      break;
-#endif
     default:
       break;
     }