GNOME.org
 

[gtk/file-conflict2] Rename all settings schemas to avoid conflict

commit 5c31c721af45a3cf884575c41c5e14899b3a0c08
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Apr 2 19:22:48 2019 +0000

    Rename all settings schemas to avoid conflict
    
    Rename all our settings schemas to the org.gtk.gtk4
    prefix to avoid conflicting with the gtk3 schemas.

 gtk/gtkcolorchooserwidget.c                        |  2 +-
 gtk/gtkemojichooser.c                              |  2 +-
 gtk/gtkfilechooserutils.c                          |  2 +-
 gtk/gtkwindow.c                                    |  4 ++--
 gtk/meson.build                                    |  8 +++----
 ...org.gtk.gtk4.Settings.ColorChooser.gschema.xml} |  2 +-
 ...xml => org.gtk.gtk4.Settings.Debug.gschema.xml} |  2 +-
 ...org.gtk.gtk4.Settings.EmojiChooser.gschema.xml} |  2 +-
 ... org.gtk.gtk4.Settings.FileChooser.gschema.xml} | 26 +++++++++++-----------
 9 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c
index 8ba5df0d17..24598b370e 100644
--- a/gtk/gtkcolorchooserwidget.c
+++ b/gtk/gtkcolorchooserwidget.c
@@ -551,7 +551,7 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc)
   gtk_color_swatch_set_selectable (GTK_COLOR_SWATCH (button), FALSE);
   gtk_container_add (GTK_CONTAINER (box), button);
 
-  cc->priv->settings = g_settings_new ("org.gtk.Settings.ColorChooser");
+  cc->priv->settings = g_settings_new ("org.gtk.gtk4.Settings.ColorChooser");
   variant = g_settings_get_value (cc->priv->settings, I_("custom-colors"));
   g_variant_iter_init (&iter, variant);
   i = 0;
diff --git a/gtk/gtkemojichooser.c b/gtk/gtkemojichooser.c
index 26fdfb3584..17822e8b90 100644
--- a/gtk/gtkemojichooser.c
+++ b/gtk/gtkemojichooser.c
@@ -609,7 +609,7 @@ gtk_emoji_chooser_init (GtkEmojiChooser *chooser)
   GtkAdjustment *adj;
   GtkText *text;
 
-  chooser->settings = g_settings_new ("org.gtk.Settings.EmojiChooser");
+  chooser->settings = g_settings_new ("org.gtk.gtk4.Settings.EmojiChooser");
 
   gtk_widget_init_template (GTK_WIDGET (chooser));
 
diff --git a/gtk/gtkfilechooserutils.c b/gtk/gtkfilechooserutils.c
index 7965ab0f20..3d89ab6012 100644
--- a/gtk/gtkfilechooserutils.c
+++ b/gtk/gtkfilechooserutils.c
@@ -455,7 +455,7 @@ _gtk_file_chooser_get_settings_for_widget (GtkWidget *widget)
 
   if (G_UNLIKELY (settings == NULL))
     {
-      settings = g_settings_new ("org.gtk.Settings.FileChooser");
+      settings = g_settings_new ("org.gtk.gtk4.Settings.FileChooser");
       g_settings_delay (settings);
 
       g_object_set_qdata_full (G_OBJECT (gtksettings),
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 6b6e9148ca..650eac6c3b 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -9733,7 +9733,7 @@ inspector_keybinding_enabled (gboolean *warn)
   *warn = FALSE;
 
   schema = g_settings_schema_source_lookup (g_settings_schema_source_get_default (),
-                                            "org.gtk.Settings.Debug4",
+                                            "org.gtk.gtk4.Settings.Debug",
                                             TRUE);
 
   if (schema)
@@ -9755,7 +9755,7 @@ set_warn_again (gboolean warn)
   GSettings *settings;
 
   schema = g_settings_schema_source_lookup (g_settings_schema_source_get_default (),
-                                            "org.gtk.Settings.Debug4",
+                                            "org.gtk.gtk4.Settings.Debug",
                                             TRUE);
 
   if (schema)
diff --git a/gtk/meson.build b/gtk/meson.build
index 9ec10acd9a..36615fdbd1 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -965,10 +965,10 @@ endif
 gtk_deps += libintl_dep
 
 gtk_settings_schemas = [
-  'org.gtk.Settings.FileChooser.gschema.xml',
-  'org.gtk.Settings.ColorChooser.gschema.xml',
-  'org.gtk.Settings.EmojiChooser.gschema.xml',
-  'org.gtk.Settings.Debug4.gschema.xml',
+  'org.gtk.gtk4.Settings.FileChooser.gschema.xml',
+  'org.gtk.gtk4.Settings.ColorChooser.gschema.xml',
+  'org.gtk.gtk4.Settings.EmojiChooser.gschema.xml',
+  'org.gtk.gtk4.Settings.Debug.gschema.xml',
 ]
 install_data(gtk_settings_schemas, install_dir: gtk_schemasdir)
 gnome.compile_schemas(depend_files: files(gtk_settings_schemas),
diff --git a/gtk/org.gtk.Settings.ColorChooser.gschema.xml 
b/gtk/org.gtk.gtk4.Settings.ColorChooser.gschema.xml
similarity index 89%
rename from gtk/org.gtk.Settings.ColorChooser.gschema.xml
rename to gtk/org.gtk.gtk4.Settings.ColorChooser.gschema.xml
index 6270d33156..bedc7030b6 100644
--- a/gtk/org.gtk.Settings.ColorChooser.gschema.xml
+++ b/gtk/org.gtk.gtk4.Settings.ColorChooser.gschema.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
 
-  <schema id='org.gtk.Settings.ColorChooser' path='/org/gtk/settings/color-chooser/'>
+  <schema id='org.gtk.gtk4.Settings.ColorChooser' path='/org/gtk/gtk4/settings/color-chooser/'>
     <key name='custom-colors' type='a(dddd)'>
       <default>[]</default>
       <summary>Custom colors</summary>
diff --git a/gtk/org.gtk.Settings.Debug4.gschema.xml b/gtk/org.gtk.gtk4.Settings.Debug.gschema.xml
similarity index 90%
rename from gtk/org.gtk.Settings.Debug4.gschema.xml
rename to gtk/org.gtk.gtk4.Settings.Debug.gschema.xml
index 6b8b1c2924..0f7b4ba7d4 100644
--- a/gtk/org.gtk.Settings.Debug4.gschema.xml
+++ b/gtk/org.gtk.gtk4.Settings.Debug.gschema.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
 
-  <schema id='org.gtk.Settings.Debug4' path='/org/gtk/settings/debug4/'>
+  <schema id='org.gtk.gtk4.Settings.Debug' path='/org/gtk/gtk4/settings/debug/'>
     <key name='enable-inspector-keybinding' type='b'>
       <default>false</default>
       <summary>Enable inspector keybinding</summary>
diff --git a/gtk/org.gtk.Settings.EmojiChooser.gschema.xml 
b/gtk/org.gtk.gtk4.Settings.EmojiChooser.gschema.xml
similarity index 84%
rename from gtk/org.gtk.Settings.EmojiChooser.gschema.xml
rename to gtk/org.gtk.gtk4.Settings.EmojiChooser.gschema.xml
index 20e3db4f9d..1a0191fe5a 100644
--- a/gtk/org.gtk.Settings.EmojiChooser.gschema.xml
+++ b/gtk/org.gtk.gtk4.Settings.EmojiChooser.gschema.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
 
-  <schema id='org.gtk.Settings.EmojiChooser' path='/org/gtk/settings/emoji-chooser/'>
+  <schema id='org.gtk.gtk4.Settings.EmojiChooser' path='/org/gtk/gtk4/settings/emoji-chooser/'>
     <key name='recent-emoji' type='a((auss)u)'>
       <default>[]</default>
       <summary>Recently used Emoji</summary>
diff --git a/gtk/org.gtk.Settings.FileChooser.gschema.xml b/gtk/org.gtk.gtk4.Settings.FileChooser.gschema.xml
similarity index 82%
rename from gtk/org.gtk.Settings.FileChooser.gschema.xml
rename to gtk/org.gtk.gtk4.Settings.FileChooser.gschema.xml
index c3753f2f6a..713597a633 100644
--- a/gtk/org.gtk.Settings.FileChooser.gschema.xml
+++ b/gtk/org.gtk.gtk4.Settings.FileChooser.gschema.xml
@@ -17,42 +17,42 @@
 -->
 <schemalist>
 
-  <enum id='org.gtk.Settings.FileChooser.LocationMode'>
+  <enum id='org.gtk.gtk4.Settings.FileChooser.LocationMode'>
     <value nick='path-bar' value='0'/>
     <value nick='filename-entry' value='1'/>
   </enum>
 
-  <enum id='org.gtk.Settings.FileChooser.SortColumn'>
+  <enum id='org.gtk.gtk4.Settings.FileChooser.SortColumn'>
     <value nick='name' value='0'/>
     <value nick='size' value='1'/>
     <value nick='modified' value='2'/>
   </enum>
 
-  <enum id='org.gtk.Settings.FileChooser.SortOrder'>
+  <enum id='org.gtk.gtk4.Settings.FileChooser.SortOrder'>
     <value nick='ascending' value='0'/>
     <value nick='descending' value='1'/>
   </enum>
 
-  <enum id='org.gtk.Settings.FileChooser.StartupMode'>
+  <enum id='org.gtk.gtk4.Settings.FileChooser.StartupMode'>
     <value nick='recent' value='0'/>
     <value nick='cwd' value='1'/>
   </enum>
 
-  <enum id='org.gtk.Settings.FileChooser.ClockFormat'>
+  <enum id='org.gtk.gtk4.Settings.FileChooser.ClockFormat'>
     <value nick='24h' value='0'/>
     <value nick='12h' value='1'/>
   </enum>
 
-  <enum id='org.gtk.Settings.FileChooser.DateFormat'>
+  <enum id='org.gtk.gtk4.Settings.FileChooser.DateFormat'>
     <value nick='regular' value='0'/>
     <value nick='with-time' value='1'/>
   </enum>
 
-  <schema id='org.gtk.Settings.FileChooser' path='/org/gtk/settings/file-chooser/'>
+  <schema id='org.gtk.gtk4.Settings.FileChooser' path='/org/gtk/gtk4/settings/file-chooser/'>
     <key name='last-folder-uri' type='s'>
       <default>""</default>
     </key>
-    <key name='location-mode' enum='org.gtk.Settings.FileChooser.LocationMode'>
+    <key name='location-mode' enum='org.gtk.gtk4.Settings.FileChooser.LocationMode'>
       <default>'path-bar'</default>
       <summary>Location mode</summary>
       <description>
@@ -87,7 +87,7 @@
        Controls whether the file chooser shows a column with file sizes.
       </description>
     </key>
-    <key name='sort-column' enum='org.gtk.Settings.FileChooser.SortColumn'>
+    <key name='sort-column' enum='org.gtk.gtk4.Settings.FileChooser.SortColumn'>
       <default>'name'</default>
       <summary>Sort column</summary>
       <description>
@@ -96,7 +96,7 @@
        the list of files.
       </description>
     </key>
-    <key name='sort-order' enum='org.gtk.Settings.FileChooser.SortOrder'>
+    <key name='sort-order' enum='org.gtk.gtk4.Settings.FileChooser.SortOrder'>
       <default>'ascending'</default>
       <summary>Sort order</summary>
       <description>
@@ -118,7 +118,7 @@
        The size (width, height) of the GtkFileChooserDialog's window, in pixels.
       </description>
     </key>
-    <key name='startup-mode' enum='org.gtk.Settings.FileChooser.StartupMode'>
+    <key name='startup-mode' enum='org.gtk.gtk4.Settings.FileChooser.StartupMode'>
       <default>'recent'</default>
       <summary>Startup mode</summary>
       <description>
@@ -134,14 +134,14 @@
        Width in pixels of the file chooser's places sidebar.
       </description>
     </key>
-    <key name="clock-format" enum="org.gtk.Settings.FileChooser.ClockFormat">
+    <key name="clock-format" enum="org.gtk.gtk4.Settings.FileChooser.ClockFormat">
       <default>'24h'</default>
       <summary>Time format</summary>
       <description>
         Whether the time is shown in 24h or 12h format.
       </description>
     </key>
-    <key name="date-format" enum="org.gtk.Settings.FileChooser.DateFormat">
+    <key name="date-format" enum="org.gtk.gtk4.Settings.FileChooser.DateFormat">
       <default>'regular'</default>
       <summary>Date format</summary>
       <description>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]