AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Rename all settings schemas to avoid conflict

Browse Source 
Rename all our settings schemas to the org.gtk.gtk4
prefix to avoid conflicting with the gtk3 schemas.
This commit is contained in:
Matthias Clasen 2019-04-02 19:22:48 +00:00
parent 7a08177a3d
commit 5c31c721af
9 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkcolorchooserwidget.c
View File

@ -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;

2
gtk/gtkemojichooser.c
View File

@ -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));

2
gtk/gtkfilechooserutils.c
View File

@ -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),

4
gtk/gtkwindow.c
View File

@ -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)

8
gtk/meson.build
View File

@ -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),

2
gtk/org.gtk.Settings.ColorChooser.gschema.xml → gtk/org.gtk.gtk4.Settings.ColorChooser.gschema.xml
View File

@ -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>

2
gtk/org.gtk.Settings.Debug4.gschema.xml → gtk/org.gtk.gtk4.Settings.Debug.gschema.xml
View File

@ -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>

2
gtk/org.gtk.Settings.EmojiChooser.gschema.xml → gtk/org.gtk.gtk4.Settings.EmojiChooser.gschema.xml
View File

@ -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>

26
gtk/org.gtk.Settings.FileChooser.gschema.xml → gtk/org.gtk.gtk4.Settings.FileChooser.gschema.xml
View File

@ -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>