Merge lp:~mardy/metacity/command-line-conf into lp:~vcs-imports/metacity/master

[Alberto Mardegan]

Allow overriding GConf settings from command line

Accept a new --conf-file <conf-file> command line option, which loads a
GKeyFile containing overrides for keys stored in GConf.

[Alberto Mardegan (mardy)]

Note: these are the same patches sent to upstream ( https://bugzilla.gnome.org/show_bug.cgi?id=657308 ).

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 8/25/2011 11:15 AM, Alberto Mardegan wrote:
> Note: these are the same patches sent to upstream (
> https://bugzilla.gnome.org/show_bug.cgi?id=657308 ).

I think you wanted to target lp:ubuntu/metacity not lp:metacity.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk5WGmcACgkQJdeBCYSNAAPYFQCfSnAYNZVm086NQrX2Jxfxzv/K
t8UAn3ZAePZ0FotWjPQj1gYKMw8g1hwX
=V885
-----END PGP SIGNATURE-----

[lp:~mardy/metacity/command-line-conf]

120. By Alberto Mardegan on 2011-08-29

Allow overriding GConf settings from command line

Accept a new --conf-file <conf-file> command line option, which loads a
GKeyFile containing overrides for keys stored in GConf.

For a full rationale, please see
https://bugs.launchpad.net/unity-2d/+bug/791205

Unmerged revisions

120. By Alberto Mardegan on 2011-08-29

Allow overriding GConf settings from command line

Accept a new --conf-file <conf-file> command line option, which loads a
GKeyFile containing overrides for keys stored in GConf.

For a full rationale, please see
https://bugs.launchpad.net/unity-2d/+bug/791205

119. By Rodrigo Moya on 2011-08-18

releasing version 1:2.34.1-1ubuntu1

118. By Didier Roche-Tolomelli on 2011-07-04

releasing version 1:2.34.0-0ubuntu2

117. By Didier Roche-Tolomelli on 2011-07-04

debian/patches/16-capture-before-unmap.patch:
only retrieve scaling down of all the windows' pixmaps when compositor
is in effect (LP: #794080). Thanks Kaleo

116. By Martin Pitt on 2011-05-30

add bug number

115. By Martin Pitt on 2011-05-30

* New upstream release
* debian/patches:
  - 02_restart_hint.patch, 19_initialise_all_workspace_names.patch
    dropped, are upstream

114. By Oliver Grawert on 2011-05-23

releasing version 1:2.30.3-0ubuntu9

113. By Oliver Grawert on 2011-05-23

merge fixes from the unity-2d team

112. By Oliver Grawert on 2011-04-14

releasing version 1:2.30.3-0ubuntu8

111. By Oliver Grawert on 2011-04-14

merge lp:~uriboni/unity-2d/metacity-capture-before-unmap-not-default to set the proper default

=== modified file 'src/core/main.c'
--- src/core/main.c	2011-05-19 15:57:29 +0000
+++ src/core/main.c	2011-08-25 09:13:50 +0000
@@ -235,6 +235,7 @@
   gboolean composite;
   gboolean no_composite;
   gboolean no_force_fullscreen;
+  gchar *conf_file;
 } MetaArguments;
 
 #ifdef HAVE_COMPOSITE_EXTENSIONS
@@ -322,6 +323,12 @@
       N_("Don't make fullscreen windows that are maximized and have no decorations"),
       NULL
     },
+    {
+      "conf-file", 0, 0, G_OPTION_ARG_FILENAME,
+      &my_args.conf_file,
+      N_("Options from the given configuration file have precedence over GConf ones"),
+      NULL
+    },
     {NULL}
   };
   GOptionContext *ctx;
@@ -491,7 +498,7 @@
   meta_errors_init ();
 
   /* Load prefs */
-  meta_prefs_init ();
+  meta_prefs_init (meta_args.conf_file);
   meta_prefs_add_listener (prefs_changed_callback, NULL);
 
 
@@ -571,6 +578,7 @@
   g_free (meta_args.save_file);
   g_free (meta_args.display_name);
   g_free (meta_args.client_id);
+  g_free (meta_args.conf_file);
 
   if (meta_args.composite || meta_args.no_composite)
     meta_prefs_set_compositing_manager (meta_args.composite);

=== modified file 'src/core/prefs.c'
--- src/core/prefs.c	2011-01-15 22:49:19 +0000
+++ src/core/prefs.c	2011-08-25 09:13:50 +0000
@@ -71,6 +71,8 @@
 static GList *changes = NULL;
 static guint changed_idle;
 static GList *listeners = NULL;
+static GKeyFile *key_file = NULL;
+static const gchar conf_file_group_name[] = "general";
 #endif
 
 static gboolean use_system_font = FALSE;
@@ -475,6 +477,43 @@
     { NULL, 0, NULL, 0, 0, 0, },
   };
 
+static gchar *
+conf_get_string (const gchar *key, GError **error)
+{
+  if (key_file != NULL)
+    {
+      gchar *value = g_key_file_get_string (key_file,
+                                            conf_file_group_name,
+                                            key,
+                                            NULL);
+      if (value != NULL)
+        return value;
+    }
+  return gconf_client_get_string (default_client,
+                                  key,
+                                  error);
+}
+
+static gint
+conf_get_int (const gchar *key, GError **error)
+{
+  if (key_file != NULL)
+    {
+      GError *key_error = NULL;
+      gint value = g_key_file_get_integer (key_file,
+                                           conf_file_group_name,
+                                           key,
+                                           &key_error);
+      if (key_error != NULL)
+        g_error_free (key_error);
+      else
+        return value;
+    }
+  return gconf_client_get_int (default_client,
+                               key,
+                               error);
+}
+
 static void
 handle_preference_init_enum (void)
 {
@@ -491,9 +530,8 @@
           continue;
         }
 
-      value = gconf_client_get_string (default_client,
-                                       cursor->key,
-                                       &error);
+      value = conf_get_string (cursor->key,
+                               &error);
       cleanup_error (&error);
 
       if (value==NULL)
@@ -542,9 +580,8 @@
       gboolean dummy = TRUE;
 
       /* the string "value" will be newly allocated */
-      value = gconf_client_get_string (default_client,
-                                       cursor->key,
-                                       &error);
+      value = conf_get_string (cursor->key,
+                               &error);
       cleanup_error (&error);
 
       if (cursor->handler)
@@ -579,9 +616,8 @@
       gint value;
       GError *error = NULL;
 
-      value = gconf_client_get_int (default_client,
-                                    cursor->key,
-                                    &error);
+      value = conf_get_int (cursor->key,
+                            &error);
       cleanup_error (&error);
 
       if (value < cursor->minimum || value > cursor->maximum)
@@ -998,7 +1034,7 @@
 #endif
 
 void
-meta_prefs_init (void)
+meta_prefs_init (const gchar *conf_file)
 {
 #ifdef HAVE_GCONF
   GError *err = NULL;
@@ -1021,6 +1057,18 @@
       cleanup_error (&err);
     }
 
+  /* if a configuration file has been specified, settings written in that file
+   * will override those in GConf */
+  if (conf_file != NULL)
+    {
+      key_file = g_key_file_new ();
+      g_key_file_load_from_file (key_file,
+                                 conf_file,
+                                 G_KEY_FILE_NONE,
+                                 &err);
+      cleanup_error (&err);
+    }
+
   /* Pick up initial values. */
 
   handle_preference_init_enum ();
@@ -1203,6 +1251,22 @@
   GConfValue *value;
   gboolean    filled_in = FALSE;
 
+  if (key_file != NULL)
+    {
+      GError *key_error = NULL;
+      gboolean value = g_key_file_get_boolean (key_file,
+                                               conf_file_group_name,
+                                               key,
+                                               &key_error);
+      if (key_error != NULL)
+        g_error_free (key_error);
+      else
+        {
+          *val = value;
+          return TRUE;
+        }
+    }
+
   value = gconf_client_get (default_client, key, &err);
   cleanup_error (&err);
   if (value)

=== modified file 'src/include/prefs.h'
--- src/include/prefs.h	2009-07-06 11:51:45 +0000
+++ src/include/prefs.h	2011-08-25 09:13:50 +0000
@@ -71,7 +71,7 @@
 void meta_prefs_remove_listener (MetaPrefsChangedFunc func,
                                  gpointer             data);
 
-void meta_prefs_init (void);
+void meta_prefs_init (const gchar *conf_file);
 const char* meta_preference_to_string (MetaPreference pref);
 
 MetaVirtualModifier         meta_prefs_get_mouse_button_mods  (void);