Merge pull request #18 from bhull2010/master

Port mate-dictionary to Gsettings

1 files changed, 3 insertions, 15 deletions

diff --git a/mate-dictionary/src/gdict-app.c b/mate-dictionary/src/gdict-app.c
index 646fda3f..20a1ae06 100644
--- a/mate-dictionary/src/gdict-app.c
+++ b/mate-dictionary/src/gdict-app.c
@@ -320,7 +320,7 @@ gdict_look_up_word_and_quit (GdictApp *app)
 void
 gdict_init (int *argc, char ***argv)
 {
-  GError *mateconf_error, *err = NULL;
+  GError *err = NULL;
   GOptionContext *context;
   gchar *loader_path;
   gchar **lookup_words = NULL;
@@ -391,20 +391,8 @@ gdict_init (int *argc, char ***argv)
 
       exit (1);
     }
-  
-  mateconf_error = NULL;
-  singleton->mateconf_client = mateconf_client_get_default ();
-  mateconf_client_add_dir (singleton->mateconf_client,
-  			GDICT_MATECONF_DIR,
-  			MATECONF_CLIENT_PRELOAD_ONELEVEL,
-  			&mateconf_error);
-  if (mateconf_error)
-    {
-      g_warning ("Unable to access MateConf: %s\n", mateconf_error->message);
-      
-      g_error_free (mateconf_error);
-      g_object_unref (singleton->mateconf_client);
-    }
+
+  singleton->settings = g_settings_new ("org.mate.dictionary");
 
   /* add user's path for fetching dictionary sources */  
   singleton->loader = gdict_source_loader_new ();