diff options
| author | Denis Gorodnichev <[email protected]> | 2023-05-17 06:56:21 +0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-05-17 03:56:21 +0000 |
| commit | 277418cea7b011520df9759301d416cd51709564 (patch) | |
| tree | 11b412b6aab737b8f22146ca67deac3e56737044 /libmate-panel-applet | |
| parent | 1a16bc12de9b45637445ca53ec81cfe0a26c831f (diff) | |
| download | mate-panel-277418cea7b011520df9759301d416cd51709564.tar.bz2 mate-panel-277418cea7b011520df9759301d416cd51709564.tar.xz | |
tell dconf-edit about relocatable schemas (#1355)
* tell dconf-edit about relocatable schemas
* self fix for incorrect and duplicated records
remove duplicated schemas for currect path
remove incorrect schemas for current path
* remove clock applet hack
* expose mate_panel_applet_settings_new to introspection
add "transfer full" annotation to make this method available throught
introspection
Diffstat (limited to 'libmate-panel-applet')
| -rw-r--r-- | libmate-panel-applet/mate-panel-applet-gsettings.c | 82 | ||||
| -rw-r--r-- | libmate-panel-applet/mate-panel-applet-gsettings.h | 8 |
2 files changed, 90 insertions, 0 deletions
diff --git a/libmate-panel-applet/mate-panel-applet-gsettings.c b/libmate-panel-applet/mate-panel-applet-gsettings.c index 1c0ac744..4679dc6d 100644 --- a/libmate-panel-applet/mate-panel-applet-gsettings.c +++ b/libmate-panel-applet/mate-panel-applet-gsettings.c @@ -29,6 +29,87 @@ #include "mate-panel-applet.h" #include "mate-panel-applet-gsettings.h" +static GVariant * +add_to_dict (GVariant *dict, const gchar *schema, const gchar *path) +{ + GVariantIter iter; + GVariantBuilder builder; + gboolean is_schema_found; + gboolean is_incorrect_schema; + gint path_counter; + + gchar *key; + gchar *value; + + g_variant_builder_init (&builder, (const GVariantType *) "a{ss}"); + g_variant_iter_init (&iter, dict); + + is_schema_found = FALSE; + is_incorrect_schema = FALSE; + path_counter = 0; + + while (g_variant_iter_next (&iter, "{ss}", &key, &value)) { + gboolean path_is_found = FALSE; + if (g_strcmp0 (value, path) == 0) { + path_is_found = TRUE; + path_counter++; + if (g_strcmp0 (key, schema) == 0) { + is_schema_found = TRUE; + } else { + // skip incoorect schema for path + is_incorrect_schema = TRUE; + g_free (key); + g_free (value); + continue; + } + } + + gboolean need_add_to_dict = !path_is_found || path_counter < 2; + + if (need_add_to_dict) { + g_variant_builder_add (&builder, "{ss}", key, value); + } + + g_free (key); + g_free (value); + } + + if (!is_schema_found) { + g_variant_builder_add (&builder, "{ss}", schema, path); + } + + if (!is_schema_found || is_incorrect_schema || (path_counter > 1)) { + return g_variant_ref_sink (g_variant_builder_end (&builder)); + } else { + g_variant_builder_clear (&builder); + // no changes + return NULL; + } +} + +static void +register_dconf_editor_relocatable_schema (const gchar *schema, const gchar *path) +{ + GSettings *dconf_editor_settings; + dconf_editor_settings = g_settings_new ("ca.desrt.dconf-editor.Settings"); + + if (dconf_editor_settings && g_settings_is_writable (dconf_editor_settings, "relocatable-schemas-user-paths")) { + GVariant *relocatable_schemas = g_settings_get_value (dconf_editor_settings, "relocatable-schemas-user-paths"); + + if (g_variant_is_of_type (relocatable_schemas, G_VARIANT_TYPE_DICTIONARY)) { + GVariant * new_relocatable_schemas = add_to_dict (relocatable_schemas, schema, path); + if (new_relocatable_schemas) { + g_settings_set_value (dconf_editor_settings, "relocatable-schemas-user-paths", new_relocatable_schemas); + g_variant_unref (new_relocatable_schemas); + } + } + + g_variant_unref (relocatable_schemas); + } + + g_object_unref (dconf_editor_settings); +} + GSettings * mate_panel_applet_settings_new (MatePanelApplet *applet, gchar *schema) { @@ -41,6 +122,7 @@ mate_panel_applet_settings_new (MatePanelApplet *applet, gchar *schema) if (path) { settings = g_settings_new_with_path (schema, path); + register_dconf_editor_relocatable_schema (schema, path); g_free (path); } diff --git a/libmate-panel-applet/mate-panel-applet-gsettings.h b/libmate-panel-applet/mate-panel-applet-gsettings.h index 0dbbdb01..152a73d2 100644 --- a/libmate-panel-applet/mate-panel-applet-gsettings.h +++ b/libmate-panel-applet/mate-panel-applet-gsettings.h @@ -35,7 +35,15 @@ G_BEGIN_DECLS +/** + * mate_panel_applet_settings_new: + * @applet A #MatePanelApplet + * @schema applet's schema id + * + * Returns: (transfer full): a #GSettings. free when you used it + */ GSettings* mate_panel_applet_settings_new (MatePanelApplet *applet, gchar *schema); + GList* mate_panel_applet_settings_get_glist (GSettings *settings, gchar *key); void mate_panel_applet_settings_set_glist (GSettings *settings, gchar *key, GList *list); GSList* mate_panel_applet_settings_get_gslist (GSettings *settings, gchar *key); |