[gnome-builder/wip/chergert/devel] more wip on settings ids
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder/wip/chergert/devel] more wip on settings ids
- Date: Wed, 23 Jan 2019 18:03:16 +0000 (UTC)
commit 074c3d075f1d8bb64eb2f4e8de7be4e4d3c16d9d
Author: Christian Hergert <chergert redhat com>
Date: Wed Jan 23 10:02:56 2019 -0800
more wip on settings ids
src/libide/code/ide-highlight-engine.c | 2 +-
src/libide/code/ide-language-defaults.c | 2 +-
src/libide/editor/ide-editor-page-settings.c | 4 +-
src/libide/editor/ide-editor-sidebar.c | 2 +-
src/libide/editor/ide-editor-surface.c | 4 +-
src/libide/foundry/ide-config.c | 2 +-
src/libide/foundry/ide-pipeline-stage-transfer.c | 2 +-
src/libide/gui/ide-application-actions.c | 4 +-
src/libide/gui/ide-application-color.c | 2 +-
src/libide/gui/ide-application-plugins.c | 2 +-
src/libide/gui/ide-application.c | 4 +-
src/libide/gui/ide-preferences-builtin.c | 112 ++++++++++-----------
src/libide/gui/ide-window-settings.c | 2 +-
src/libide/plugins/ide-extension-adapter.c | 2 +-
src/libide/plugins/ide-extension-set-adapter.c | 2 +-
src/libide/projects/ide-projects-global.c | 2 +-
src/libide/terminal/ide-terminal.c | 2 +-
src/plugins/auto-save/gbp-auto-save-buffer-addin.c | 2 +-
src/plugins/clang/ide-clang-completion-item.c | 4 +-
src/plugins/clang/ide-clang-preferences-addin.c | 10 +-
src/plugins/color-picker/gb-color-picker-prefs.c | 6 +-
src/plugins/ctags/ide-ctags-builder.c | 4 +-
src/plugins/ctags/ide-ctags-completion-provider.c | 4 +-
src/plugins/editor/gbp-editor-session-addin.c | 2 +-
.../flatpak/gbp-flatpak-application-addin.c | 2 +-
.../ide-gca-diagnostic-provider.c | 4 +-
src/plugins/project-tree/gbp-project-tree-addin.c | 2 +-
.../gbp-restore-cursor-buffer-addin.c | 2 +-
src/plugins/xml-pack/ide-xml-parser.c | 6 +-
29 files changed, 108 insertions(+), 92 deletions(-)
---
diff --git a/src/libide/code/ide-highlight-engine.c b/src/libide/code/ide-highlight-engine.c
index d95b74b00..71ecad74c 100644
--- a/src/libide/code/ide-highlight-engine.c
+++ b/src/libide/code/ide-highlight-engine.c
@@ -950,7 +950,7 @@ ide_highlight_engine_init (IdeHighlightEngine *self)
{
g_weak_ref_init (&self->buffer_wref, NULL);
- self->settings = g_settings_new ("org.gnome.builder.code-insight");
+ self->settings = g_settings_new (PACKAGE_APP_ID_LOWER".code-insight");
self->enabled = g_settings_get_boolean (self->settings, "semantic-highlighting");
self->signal_group = dzl_signal_group_new (IDE_TYPE_BUFFER);
diff --git a/src/libide/code/ide-language-defaults.c b/src/libide/code/ide-language-defaults.c
index 373446abd..12ac536d2 100644
--- a/src/libide/code/ide-language-defaults.c
+++ b/src/libide/code/ide-language-defaults.c
@@ -28,7 +28,7 @@
#include "ide-language-defaults.h"
-#define SCHEMA_ID "org.gnome.builder.editor.language"
+#define SCHEMA_ID PACKAGE_APP_ID_LOWER".editor.language"
#define PATH_BASE "/org/gnome/builder/editor/language/"
static gboolean initialized;
diff --git a/src/libide/editor/ide-editor-page-settings.c b/src/libide/editor/ide-editor-page-settings.c
index c542e4d58..74115b5ca 100644
--- a/src/libide/editor/ide-editor-page-settings.c
+++ b/src/libide/editor/ide-editor-page-settings.c
@@ -141,7 +141,7 @@ _ide_editor_page_init_settings (IdeEditorPage *self)
source_view = ide_editor_page_get_view (self);
buffer = ide_editor_page_get_buffer (self);
- self->editor_settings = g_settings_new ("org.gnome.builder.editor");
+ self->editor_settings = g_settings_new (PACKAGE_APP_ID_LOWER".editor");
g_settings_bind (self->editor_settings, "highlight-current-line",
source_view, "highlight-current-line",
@@ -229,5 +229,5 @@ _ide_editor_page_init_settings (IdeEditorPage *self)
on_draw_spaces_changed (self, "draw-spaces", self->editor_settings);
- self->insight_settings = g_settings_new ("org.gnome.builder.code-insight");
+ self->insight_settings = g_settings_new (PACKAGE_APP_ID_LOWER".code-insight");
}
diff --git a/src/libide/editor/ide-editor-sidebar.c b/src/libide/editor/ide-editor-sidebar.c
index 13c746f2a..110b6a3a5 100644
--- a/src/libide/editor/ide-editor-sidebar.c
+++ b/src/libide/editor/ide-editor-sidebar.c
@@ -220,7 +220,7 @@ ide_editor_sidebar_init (IdeEditorSidebar *self)
G_CALLBACK (ide_editor_sidebar_stack_notify_visible_child),
self);
- self->settings = g_settings_new ("org.gnome.builder");
+ self->settings = g_settings_new (PACKAGE_APP_ID_LOWER"");
g_signal_connect_object (self->settings,
"changed::show-open-files",
diff --git a/src/libide/editor/ide-editor-surface.c b/src/libide/editor/ide-editor-surface.c
index 78f3ffde4..1c30e6fe8 100644
--- a/src/libide/editor/ide-editor-surface.c
+++ b/src/libide/editor/ide-editor-surface.c
@@ -83,7 +83,7 @@ ide_editor_surface_restore_panel_state (IdeEditorSurface *self)
/* TODO: This belongs in editor settings probably */
- settings = g_settings_new ("org.gnome.builder.workbench");
+ settings = g_settings_new (PACKAGE_APP_ID_LOWER".workbench");
pane = dzl_dock_bin_get_left_edge (DZL_DOCK_BIN (self));
reveal = g_settings_get_boolean (settings, "left-visible");
@@ -114,7 +114,7 @@ ide_editor_surface_save_panel_state (IdeEditorSurface *self)
g_assert (IDE_IS_EDITOR_SURFACE (self));
/* TODO: possibly belongs in editor settings */
- settings = g_settings_new ("org.gnome.builder.workbench");
+ settings = g_settings_new (PACKAGE_APP_ID_LOWER".workbench");
pane = dzl_dock_bin_get_left_edge (DZL_DOCK_BIN (self));
position = dzl_dock_revealer_get_position (DZL_DOCK_REVEALER (pane));
diff --git a/src/libide/foundry/ide-config.c b/src/libide/foundry/ide-config.c
index 6df4cd0dd..a523166f6 100644
--- a/src/libide/foundry/ide-config.c
+++ b/src/libide/foundry/ide-config.c
@@ -974,7 +974,7 @@ ide_config_get_parallelism (IdeConfig *self)
if (priv->parallelism == -1)
{
- g_autoptr(GSettings) settings = g_settings_new ("org.gnome.builder.build");
+ g_autoptr(GSettings) settings = g_settings_new (PACKAGE_APP_ID_LOWER".build");
return g_settings_get_int (settings, "parallel");
}
diff --git a/src/libide/foundry/ide-pipeline-stage-transfer.c
b/src/libide/foundry/ide-pipeline-stage-transfer.c
index 203a0ce8b..8fbb6b4c1 100644
--- a/src/libide/foundry/ide-pipeline-stage-transfer.c
+++ b/src/libide/foundry/ide-pipeline-stage-transfer.c
@@ -126,7 +126,7 @@ ide_pipeline_stage_transfer_build_async (IdePipelineStage *stage,
if (g_network_monitor_get_network_metered (monitor))
{
- g_autoptr(GSettings) settings = g_settings_new ("org.gnome.builder.build");
+ g_autoptr(GSettings) settings = g_settings_new (PACKAGE_APP_ID_LOWER".build");
if (!g_settings_get_boolean (settings, "allow-network-when-metered"))
{
diff --git a/src/libide/gui/ide-application-actions.c b/src/libide/gui/ide-application-actions.c
index 3c1c2a676..45edd6c3b 100644
--- a/src/libide/gui/ide-application-actions.c
+++ b/src/libide/gui/ide-application-actions.c
@@ -300,7 +300,7 @@ ide_application_actions_nighthack (GSimpleAction *action,
"gtk-application-prefer-dark-theme", TRUE,
NULL);
- settings = g_settings_new ("org.gnome.builder.editor");
+ settings = g_settings_new (PACKAGE_APP_ID_LOWER".editor");
g_settings_set_string (settings, "style-scheme-name", "builder-dark");
}
@@ -315,7 +315,7 @@ ide_application_actions_dayhack (GSimpleAction *action,
"gtk-application-prefer-dark-theme", FALSE,
NULL);
- settings = g_settings_new ("org.gnome.builder.editor");
+ settings = g_settings_new (PACKAGE_APP_ID_LOWER".editor");
g_settings_set_string (settings, "style-scheme-name", "builder");
}
diff --git a/src/libide/gui/ide-application-color.c b/src/libide/gui/ide-application-color.c
index de467ed77..0ee491ce6 100644
--- a/src/libide/gui/ide-application-color.c
+++ b/src/libide/gui/ide-application-color.c
@@ -151,7 +151,7 @@ _ide_application_update_color (IdeApplication *self)
* scheme to match.
*/
- editor_settings = g_settings_new ("org.gnome.builder.editor");
+ editor_settings = g_settings_new (PACKAGE_APP_ID_LOWER".editor");
old_name = g_settings_get_string (editor_settings, "style-scheme-name");
new_name = find_similar_style_scheme (old_name, night_mode);
diff --git a/src/libide/gui/ide-application-plugins.c b/src/libide/gui/ide-application-plugins.c
index 93768bd0c..38decaacd 100644
--- a/src/libide/gui/ide-application-plugins.c
+++ b/src/libide/gui/ide-application-plugins.c
@@ -47,7 +47,7 @@ _ide_application_plugin_get_settings (IdeApplication *self,
g_autofree gchar *path = NULL;
path = g_strdup_printf ("/org/gnome/builder/plugins/%s/", module_name);
- settings = g_settings_new_with_path ("org.gnome.builder.plugin", path);
+ settings = g_settings_new_with_path (PACKAGE_APP_ID_LOWER".plugin", path);
g_hash_table_insert (self->plugin_settings, g_strdup (module_name), settings);
}
diff --git a/src/libide/gui/ide-application.c b/src/libide/gui/ide-application.c
index fe0481457..20bacea64 100644
--- a/src/libide/gui/ide-application.c
+++ b/src/libide/gui/ide-application.c
@@ -113,7 +113,7 @@ ide_application_register_keybindings (IdeApplication *self)
g_assert (IDE_IS_APPLICATION (self));
- settings = g_settings_new ("org.gnome.builder.editor");
+ settings = g_settings_new (PACKAGE_APP_ID_LOWER".editor");
name = g_settings_get_string (settings, "keybindings");
self->keybindings = ide_keybindings_new (name);
g_settings_bind (settings, "keybindings", self->keybindings, "mode", G_SETTINGS_BIND_GET);
@@ -374,7 +374,7 @@ ide_application_init (IdeApplication *self)
self->started_at = g_date_time_new_now_local ();
self->workspace_type = IDE_TYPE_PRIMARY_WORKSPACE;
self->workbenches = g_ptr_array_new_with_free_func (g_object_unref);
- self->settings = g_settings_new ("org.gnome.builder");
+ self->settings = g_settings_new (PACKAGE_APP_ID_LOWER"");
self->plugin_gresources = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
(GDestroyNotify)g_resource_unref);
diff --git a/src/libide/gui/ide-preferences-builtin.c b/src/libide/gui/ide-preferences-builtin.c
index 1fdee4849..c0d79395c 100644
--- a/src/libide/gui/ide-preferences-builtin.c
+++ b/src/libide/gui/ide-preferences-builtin.c
@@ -80,7 +80,7 @@ ide_preferences_builtin_register_plugins (DzlPreferences *preferences)
path = g_strdup_printf ("/org/gnome/builder/plugins/%s/",
peas_plugin_info_get_module_name (plugin_info));
- dzl_preferences_add_switch (preferences, "plugins", "plugins", "org.gnome.builder.plugin", "enabled",
path, NULL, name, desc, keywords, i);
+ dzl_preferences_add_switch (preferences, "plugins", "plugins", PACKAGE_APP_ID_LOWER".plugin",
"enabled", path, NULL, name, desc, keywords, i);
}
g_list_free (copy);
@@ -98,15 +98,15 @@ ide_preferences_builtin_register_appearance (DzlPreferences *preferences)
dzl_preferences_add_page (preferences, "appearance", _("Appearance"), 0);
dzl_preferences_add_list_group (preferences, "appearance", "basic", _("Themes"), GTK_SELECTION_NONE, 0);
- dark_mode = dzl_preferences_add_switch (preferences, "appearance", "basic", "org.gnome.builder",
"night-mode", NULL, NULL, _("Dark Mode"), _("Whether Builder should use a dark theme"), _("dark theme"), 0);
- dzl_preferences_add_switch (preferences, "appearance", "basic", "org.gnome.builder", "follow-night-light",
NULL, NULL, _("Night Light"), _("Automatically enable dark mode at night"), _("follow night light"), 5);
- dzl_preferences_add_switch (preferences, "appearance", "basic", "org.gnome.builder.editor",
"show-grid-lines", NULL, NULL, _("Grid Pattern"), _("Display a grid pattern underneath source code"), NULL,
10);
+ dark_mode = dzl_preferences_add_switch (preferences, "appearance", "basic", PACKAGE_APP_ID_LOWER,
"night-mode", NULL, NULL, _("Dark Mode"), _("Whether Builder should use a dark theme"), _("dark theme"), 0);
+ dzl_preferences_add_switch (preferences, "appearance", "basic", PACKAGE_APP_ID_LOWER,
"follow-night-light", NULL, NULL, _("Night Light"), _("Automatically enable dark mode at night"), _("follow
night light"), 5);
+ dzl_preferences_add_switch (preferences, "appearance", "basic", PACKAGE_APP_ID_LOWER".editor",
"show-grid-lines", NULL, NULL, _("Grid Pattern"), _("Display a grid pattern underneath source code"), NULL,
10);
dzl_preferences_add_list_group (preferences, "appearance", "font", _("Font"), GTK_SELECTION_NONE, 10);
- dzl_preferences_add_font_button (preferences, "appearance", "font", "org.gnome.builder.editor",
"font-name", _("Editor"), C_("Keywords", "editor font monospace"), 0);
+ dzl_preferences_add_font_button (preferences, "appearance", "font", PACKAGE_APP_ID_LOWER".editor",
"font-name", _("Editor"), C_("Keywords", "editor font monospace"), 0);
/* XXX: This belongs in terminal addin */
- dzl_preferences_add_font_button (preferences, "appearance", "font", "org.gnome.builder.terminal",
"font-name", _("Terminal"), C_("Keywords", "terminal font monospace"), 1);
- dzl_preferences_add_switch (preferences, "appearance", "font", "org.gnome.builder.terminal", "allow-bold",
NULL, NULL, _("Bold text in terminals"), _("If terminals are allowed to display bold text"), C_("Keywords",
"terminal allow bold"), 2);
+ dzl_preferences_add_font_button (preferences, "appearance", "font", PACKAGE_APP_ID_LOWER".terminal",
"font-name", _("Terminal"), C_("Keywords", "terminal font monospace"), 1);
+ dzl_preferences_add_switch (preferences, "appearance", "font", PACKAGE_APP_ID_LOWER".terminal",
"allow-bold", NULL, NULL, _("Bold text in terminals"), _("If terminals are allowed to display bold text"),
C_("Keywords", "terminal allow bold"), 2);
manager = gtk_source_style_scheme_manager_get_default ();
scheme_ids = gtk_source_style_scheme_manager_get_scheme_ids (manager);
@@ -123,7 +123,7 @@ ide_preferences_builtin_register_appearance (DzlPreferences *preferences)
scheme = gtk_source_style_scheme_manager_get_scheme (manager, scheme_ids [i]);
title = gtk_source_style_scheme_get_name (scheme);
- dzl_preferences_add_radio (preferences, "appearance", "schemes", "org.gnome.builder.editor",
"style-scheme-name", NULL, variant_str, title, NULL, title, i);
+ dzl_preferences_add_radio (preferences, "appearance", "schemes", PACKAGE_APP_ID_LOWER".editor",
"style-scheme-name", NULL, variant_str, title, NULL, title, i);
}
if (g_getenv ("GTK_THEME") != NULL)
@@ -139,11 +139,11 @@ ide_preferences_builtin_register_keyboard (DzlPreferences *preferences)
dzl_preferences_add_page (preferences, "keyboard", _("Keyboard"), 400);
dzl_preferences_add_list_group (preferences, "keyboard", "mode", _("Emulation"), GTK_SELECTION_NONE, 0);
- dzl_preferences_add_radio (preferences, "keyboard", "mode", "org.gnome.builder.editor", "keybindings",
NULL, "\"default\"", _("Builder"), _("Default keybinding mode which mimics gedit"), NULL, 0);
+ dzl_preferences_add_radio (preferences, "keyboard", "mode", PACKAGE_APP_ID_LOWER".editor", "keybindings",
NULL, "\"default\"", _("Builder"), _("Default keybinding mode which mimics gedit"), NULL, 0);
dzl_preferences_add_list_group (preferences, "keyboard", "movements", _("Movement"), GTK_SELECTION_NONE,
100);
- dzl_preferences_add_switch (preferences, "keyboard", "movements", "org.gnome.builder.editor",
"smart-home-end", NULL, NULL, _("Smart Home and End"), _("Home moves to first non-whitespace character"),
NULL, 0);
- dzl_preferences_add_switch (preferences, "keyboard", "movements", "org.gnome.builder.editor",
"smart-backspace", NULL, NULL, _("Smart Backspace"), _("Backspace will remove extra space to keep you aligned
with your indentation"), NULL, 100);
+ dzl_preferences_add_switch (preferences, "keyboard", "movements", PACKAGE_APP_ID_LOWER".editor",
"smart-home-end", NULL, NULL, _("Smart Home and End"), _("Home moves to first non-whitespace character"),
NULL, 0);
+ dzl_preferences_add_switch (preferences, "keyboard", "movements", PACKAGE_APP_ID_LOWER".editor",
"smart-backspace", NULL, NULL, _("Smart Backspace"), _("Backspace will remove extra space to keep you aligned
with your indentation"), NULL, 100);
}
static void
@@ -152,39 +152,39 @@ ide_preferences_builtin_register_editor (DzlPreferences *preferences)
dzl_preferences_add_page (preferences, "editor", _("Editor"), 100);
dzl_preferences_add_list_group (preferences, "editor", "general", _("General"), GTK_SELECTION_NONE, -5);
- dzl_preferences_add_switch (preferences, "editor", "general", "org.gnome.builder", "show-open-files",
NULL, NULL, _("Display list of open files"), _("Display the list of all open files in the project sidebar"),
NULL, 0);
+ dzl_preferences_add_switch (preferences, "editor", "general", PACKAGE_APP_ID_LOWER, "show-open-files",
NULL, NULL, _("Display list of open files"), _("Display the list of all open files in the project sidebar"),
NULL, 0);
dzl_preferences_add_list_group (preferences, "editor", "position", _("Cursor"), GTK_SELECTION_NONE, 0);
- dzl_preferences_add_switch (preferences, "editor", "position", "org.gnome.builder.editor",
"restore-insert-mark", NULL, NULL, _("Restore cursor position"), _("Restore cursor position when a file is
reopened"), NULL, 0);
- dzl_preferences_add_switch (preferences, "editor", "position", "org.gnome.builder.editor", "wrap-text",
NULL, NULL, _("Enable text wrapping"), _("Wrap text that is too wide to display"), NULL, 5);
- dzl_preferences_add_spin_button (preferences, "editor", "position", "org.gnome.builder.editor",
"scroll-offset", NULL, _("Scroll Offset"), _("Minimum number of lines to keep above and below the cursor"),
NULL, 10);
- dzl_preferences_add_spin_button (preferences, "editor", "position", "org.gnome.builder.editor",
"overscroll", NULL, _("Overscroll"), _("Allow the editor to scroll past the end of the buffer"), NULL, 20);
+ dzl_preferences_add_switch (preferences, "editor", "position", PACKAGE_APP_ID_LOWER".editor",
"restore-insert-mark", NULL, NULL, _("Restore cursor position"), _("Restore cursor position when a file is
reopened"), NULL, 0);
+ dzl_preferences_add_switch (preferences, "editor", "position", PACKAGE_APP_ID_LOWER".editor", "wrap-text",
NULL, NULL, _("Enable text wrapping"), _("Wrap text that is too wide to display"), NULL, 5);
+ dzl_preferences_add_spin_button (preferences, "editor", "position", PACKAGE_APP_ID_LOWER".editor",
"scroll-offset", NULL, _("Scroll Offset"), _("Minimum number of lines to keep above and below the cursor"),
NULL, 10);
+ dzl_preferences_add_spin_button (preferences, "editor", "position", PACKAGE_APP_ID_LOWER".editor",
"overscroll", NULL, _("Overscroll"), _("Allow the editor to scroll past the end of the buffer"), NULL, 20);
dzl_preferences_add_list_group (preferences, "editor", "line", _("Line Information"), GTK_SELECTION_NONE,
50);
- dzl_preferences_add_switch (preferences, "editor", "line", "org.gnome.builder.editor",
"show-line-numbers", NULL, NULL, _("Line numbers"), _("Show line number at beginning of each line"), NULL, 0);
- dzl_preferences_add_switch (preferences, "editor", "line", "org.gnome.builder.editor",
"show-line-changes", NULL, NULL, _("Line changes"), _("Show if a line was added or modified next to line
number"), NULL, 1);
- dzl_preferences_add_switch (preferences, "editor", "line", "org.gnome.builder.editor",
"show-line-diagnostics", NULL, NULL, _("Line diagnostics"), _("Show an icon next to line numbers indicating
type of diagnostic"), NULL, 2);
+ dzl_preferences_add_switch (preferences, "editor", "line", PACKAGE_APP_ID_LOWER".editor",
"show-line-numbers", NULL, NULL, _("Line numbers"), _("Show line number at beginning of each line"), NULL, 0);
+ dzl_preferences_add_switch (preferences, "editor", "line", PACKAGE_APP_ID_LOWER".editor",
"show-line-changes", NULL, NULL, _("Line changes"), _("Show if a line was added or modified next to line
number"), NULL, 1);
+ dzl_preferences_add_switch (preferences, "editor", "line", PACKAGE_APP_ID_LOWER".editor",
"show-line-diagnostics", NULL, NULL, _("Line diagnostics"), _("Show an icon next to line numbers indicating
type of diagnostic"), NULL, 2);
dzl_preferences_add_list_group (preferences, "editor", "highlight", _("Highlight"), GTK_SELECTION_NONE,
100);
- dzl_preferences_add_switch (preferences, "editor", "highlight", "org.gnome.builder.editor",
"highlight-current-line", NULL, NULL, _("Current line"), _("Make current line stand out with highlights"),
NULL, 0);
- dzl_preferences_add_switch (preferences, "editor", "highlight", "org.gnome.builder.editor",
"highlight-matching-brackets", NULL, NULL, _("Matching brackets"), _("Highlight matching brackets based on
cursor position"), NULL, 1);
+ dzl_preferences_add_switch (preferences, "editor", "highlight", PACKAGE_APP_ID_LOWER".editor",
"highlight-current-line", NULL, NULL, _("Current line"), _("Make current line stand out with highlights"),
NULL, 0);
+ dzl_preferences_add_switch (preferences, "editor", "highlight", PACKAGE_APP_ID_LOWER".editor",
"highlight-matching-brackets", NULL, NULL, _("Matching brackets"), _("Highlight matching brackets based on
cursor position"), NULL, 1);
dzl_preferences_add_list_group (preferences, "editor", "overview", _("Code Overview"), GTK_SELECTION_NONE,
100);
- dzl_preferences_add_switch (preferences, "editor", "overview", "org.gnome.builder.editor", "show-map",
NULL, NULL, _("Show overview map"), _("A zoomed out view to enhance navigating source code"), NULL, 0);
- dzl_preferences_add_switch (preferences, "editor", "overview", "org.gnome.builder.editor",
"auto-hide-map", NULL, NULL, _("Automatically hide overview map"), _("Automatically hide map when editor
loses focus"), NULL, 1);
+ dzl_preferences_add_switch (preferences, "editor", "overview", PACKAGE_APP_ID_LOWER".editor", "show-map",
NULL, NULL, _("Show overview map"), _("A zoomed out view to enhance navigating source code"), NULL, 0);
+ dzl_preferences_add_switch (preferences, "editor", "overview", PACKAGE_APP_ID_LOWER".editor",
"auto-hide-map", NULL, NULL, _("Automatically hide overview map"), _("Automatically hide map when editor
loses focus"), NULL, 1);
dzl_preferences_add_list_group (preferences, "editor", "draw-spaces", _("Visible Whitespace Characters"),
GTK_SELECTION_NONE, 400);
- dzl_preferences_add_radio (preferences, "editor", "draw-spaces", "org.gnome.builder.editor",
"draw-spaces", NULL, "\"space\"", _("Spaces"), NULL, NULL, 0);
- dzl_preferences_add_radio (preferences, "editor", "draw-spaces", "org.gnome.builder.editor",
"draw-spaces", NULL, "\"tab\"", _("Tabs"), NULL, NULL, 1);
- dzl_preferences_add_radio (preferences, "editor", "draw-spaces", "org.gnome.builder.editor",
"draw-spaces", NULL, "\"newline\"", _("New line and carriage return"), NULL, NULL, 2);
- dzl_preferences_add_radio (preferences, "editor", "draw-spaces", "org.gnome.builder.editor",
"draw-spaces", NULL, "\"nbsp\"", _("Non-breaking spaces"), NULL, NULL, 3);
- dzl_preferences_add_radio (preferences, "editor", "draw-spaces", "org.gnome.builder.editor",
"draw-spaces", NULL, "\"text\"", _("Spaces inside of text"), NULL, NULL, 4);
- dzl_preferences_add_radio (preferences, "editor", "draw-spaces", "org.gnome.builder.editor",
"draw-spaces", NULL, "\"trailing\"", _("Trailing Only"), NULL, NULL, 5);
- dzl_preferences_add_radio (preferences, "editor", "draw-spaces", "org.gnome.builder.editor",
"draw-spaces", NULL, "\"leading\"", _("Leading Only"), NULL, NULL, 6);
+ dzl_preferences_add_radio (preferences, "editor", "draw-spaces", PACKAGE_APP_ID_LOWER".editor",
"draw-spaces", NULL, "\"space\"", _("Spaces"), NULL, NULL, 0);
+ dzl_preferences_add_radio (preferences, "editor", "draw-spaces", PACKAGE_APP_ID_LOWER".editor",
"draw-spaces", NULL, "\"tab\"", _("Tabs"), NULL, NULL, 1);
+ dzl_preferences_add_radio (preferences, "editor", "draw-spaces", PACKAGE_APP_ID_LOWER".editor",
"draw-spaces", NULL, "\"newline\"", _("New line and carriage return"), NULL, NULL, 2);
+ dzl_preferences_add_radio (preferences, "editor", "draw-spaces", PACKAGE_APP_ID_LOWER".editor",
"draw-spaces", NULL, "\"nbsp\"", _("Non-breaking spaces"), NULL, NULL, 3);
+ dzl_preferences_add_radio (preferences, "editor", "draw-spaces", PACKAGE_APP_ID_LOWER".editor",
"draw-spaces", NULL, "\"text\"", _("Spaces inside of text"), NULL, NULL, 4);
+ dzl_preferences_add_radio (preferences, "editor", "draw-spaces", PACKAGE_APP_ID_LOWER".editor",
"draw-spaces", NULL, "\"trailing\"", _("Trailing Only"), NULL, NULL, 5);
+ dzl_preferences_add_radio (preferences, "editor", "draw-spaces", PACKAGE_APP_ID_LOWER".editor",
"draw-spaces", NULL, "\"leading\"", _("Leading Only"), NULL, NULL, 6);
dzl_preferences_add_list_group (preferences, "editor", "autosave", _("Autosave"), GTK_SELECTION_NONE, 450);
- dzl_preferences_add_switch (preferences, "editor", "autosave", "org.gnome.builder.editor", "auto-save",
NULL, NULL,_("Autosave Enabled"), _("Enable or disable autosave feature"), NULL, 1);
- dzl_preferences_add_spin_button (preferences, "editor", "autosave", "org.gnome.builder.editor",
"auto-save-timeout", NULL, _("Autosave Frequency"), _("The number of seconds after modification before auto
saving"), NULL, 60);
+ dzl_preferences_add_switch (preferences, "editor", "autosave", PACKAGE_APP_ID_LOWER".editor", "auto-save",
NULL, NULL,_("Autosave Enabled"), _("Enable or disable autosave feature"), NULL, 1);
+ dzl_preferences_add_spin_button (preferences, "editor", "autosave", PACKAGE_APP_ID_LOWER".editor",
"auto-save-timeout", NULL, _("Autosave Frequency"), _("The number of seconds after modification before auto
saving"), NULL, 60);
}
static void
@@ -193,7 +193,7 @@ ide_preferences_builtin_register_code_insight (DzlPreferences *preferences)
dzl_preferences_add_page (preferences, "code-insight", _("Code Insight"), 300);
dzl_preferences_add_list_group (preferences, "code-insight", "highlighting", _("Highlighting"),
GTK_SELECTION_NONE, 0);
- dzl_preferences_add_switch (preferences, "code-insight", "highlighting", "org.gnome.builder.code-insight",
"semantic-highlighting", NULL, NULL, _("Semantic Highlighting"), _("Use code insight to highlight additional
information discovered in source file"), NULL, 0);
+ dzl_preferences_add_switch (preferences, "code-insight", "highlighting",
PACKAGE_APP_ID_LOWER".code-insight", "semantic-highlighting", NULL, NULL, _("Semantic Highlighting"), _("Use
code insight to highlight additional information discovered in source file"), NULL, 0);
dzl_preferences_add_list_group (preferences, "code-insight", "diagnostics", _("Diagnostics"),
GTK_SELECTION_NONE, 200);
}
@@ -204,8 +204,8 @@ ide_preferences_builtin_register_completion (DzlPreferences *preferences)
dzl_preferences_add_page (preferences, "completion", _("Completion"), 325);
dzl_preferences_add_list_group (preferences, "completion", "general", _("General"), GTK_SELECTION_NONE, 0);
- dzl_preferences_add_spin_button (preferences, "completion", "general", "org.gnome.builder.editor",
"completion-n-rows", NULL, _("Completions Display Size"), _("Number of completions to display"), NULL, -1);
- dzl_preferences_add_switch (preferences, "completion", "general", "org.gnome.builder.editor",
"interactive-completion", NULL, NULL, _("Interactive Completion"), _("Display code suggestions interactively
as you type"), NULL, 0);
+ dzl_preferences_add_spin_button (preferences, "completion", "general", PACKAGE_APP_ID_LOWER".editor",
"completion-n-rows", NULL, _("Completions Display Size"), _("Number of completions to display"), NULL, -1);
+ dzl_preferences_add_switch (preferences, "completion", "general", PACKAGE_APP_ID_LOWER".editor",
"interactive-completion", NULL, NULL, _("Interactive Completion"), _("Display code suggestions interactively
as you type"), NULL, 0);
dzl_preferences_add_list_group (preferences, "completion", "providers", _("Completion Providers"),
GTK_SELECTION_NONE, 100);
}
@@ -322,28 +322,28 @@ ide_preferences_builtin_register_languages (DzlPreferences *preferences)
dzl_preferences_add_page (preferences, "languages.id", NULL, 0);
dzl_preferences_add_list_group (preferences, "languages.id", "basic", _("General"), GTK_SELECTION_NONE, 0);
- dzl_preferences_add_switch (preferences, "languages.id", "basic", "org.gnome.builder.editor.language",
"trim-trailing-whitespace", "/org/gnome/builder/editor/language/{id}/", NULL, _("Trim trailing whitespace"),
_("Upon saving, trailing whitespace from modified lines will be trimmed."), NULL, 10);
- dzl_preferences_add_switch (preferences, "languages.id", "basic", "org.gnome.builder.editor.language",
"overwrite-braces", "/org/gnome/builder/editor/language/{id}/", NULL, _("Overwrite Braces"), _("Overwrite
closing braces"), NULL, 20);
- dzl_preferences_add_switch (preferences, "languages.id", "basic", "org.gnome.builder.editor.language",
"insert-matching-brace", "/org/gnome/builder/editor/language/{id}/", NULL, _("Insert Matching Brace"),
_("Insert matching character for { [ ( or \""), NULL, 20);
- dzl_preferences_add_switch (preferences, "languages.id", "basic", "org.gnome.builder.editor.language",
"insert-trailing-newline", "/org/gnome/builder/editor/language/{id}/", NULL, _("Insert Trailing Newline"),
_("Ensure files end with a newline"), NULL, 30);
+ dzl_preferences_add_switch (preferences, "languages.id", "basic", PACKAGE_APP_ID_LOWER".editor.language",
"trim-trailing-whitespace", "/org/gnome/builder/editor/language/{id}/", NULL, _("Trim trailing whitespace"),
_("Upon saving, trailing whitespace from modified lines will be trimmed."), NULL, 10);
+ dzl_preferences_add_switch (preferences, "languages.id", "basic", PACKAGE_APP_ID_LOWER".editor.language",
"overwrite-braces", "/org/gnome/builder/editor/language/{id}/", NULL, _("Overwrite Braces"), _("Overwrite
closing braces"), NULL, 20);
+ dzl_preferences_add_switch (preferences, "languages.id", "basic", PACKAGE_APP_ID_LOWER".editor.language",
"insert-matching-brace", "/org/gnome/builder/editor/language/{id}/", NULL, _("Insert Matching Brace"),
_("Insert matching character for { [ ( or \""), NULL, 20);
+ dzl_preferences_add_switch (preferences, "languages.id", "basic", PACKAGE_APP_ID_LOWER".editor.language",
"insert-trailing-newline", "/org/gnome/builder/editor/language/{id}/", NULL, _("Insert Trailing Newline"),
_("Ensure files end with a newline"), NULL, 30);
dzl_preferences_add_list_group (preferences, "languages.id", "margin", _("Margins"), GTK_SELECTION_NONE,
0);
- dzl_preferences_add_radio (preferences, "languages.id", "margin", "org.gnome.builder.editor.language",
"show-right-margin", "/org/gnome/builder/editor/language/{id}/", NULL, _("Show right margin"), NULL, NULL, 0);
- dzl_preferences_add_spin_button (preferences, "languages.id", "margin",
"org.gnome.builder.editor.language", "right-margin-position", "/org/gnome/builder/editor/language/{id}/",
_("Right margin position"), _("Position in spaces for the right margin"), NULL, 10);
+ dzl_preferences_add_radio (preferences, "languages.id", "margin", PACKAGE_APP_ID_LOWER".editor.language",
"show-right-margin", "/org/gnome/builder/editor/language/{id}/", NULL, _("Show right margin"), NULL, NULL, 0);
+ dzl_preferences_add_spin_button (preferences, "languages.id", "margin",
PACKAGE_APP_ID_LOWER".editor.language", "right-margin-position", "/org/gnome/builder/editor/language/{id}/",
_("Right margin position"), _("Position in spaces for the right margin"), NULL, 10);
dzl_preferences_add_list_group (preferences, "languages.id", "indentation", _("Indentation"),
GTK_SELECTION_NONE, 100);
- dzl_preferences_add_spin_button (preferences, "languages.id", "indentation",
"org.gnome.builder.editor.language", "tab-width", "/org/gnome/builder/editor/language/{id}/", _("Tab width"),
_("Width of a tab character in spaces"), NULL, 10);
- dzl_preferences_add_radio (preferences, "languages.id", "indentation",
"org.gnome.builder.editor.language", "insert-spaces-instead-of-tabs",
"/org/gnome/builder/editor/language/{id}/", NULL, _("Insert spaces instead of tabs"), _("Prefer spaces over
use of tabs"), NULL, 20);
- dzl_preferences_add_radio (preferences, "languages.id", "indentation",
"org.gnome.builder.editor.language", "auto-indent", "/org/gnome/builder/editor/language/{id}/", NULL,
_("Automatically indent"), _("Indent source code as you type"), NULL, 30);
+ dzl_preferences_add_spin_button (preferences, "languages.id", "indentation",
PACKAGE_APP_ID_LOWER".editor.language", "tab-width", "/org/gnome/builder/editor/language/{id}/", _("Tab
width"), _("Width of a tab character in spaces"), NULL, 10);
+ dzl_preferences_add_radio (preferences, "languages.id", "indentation",
PACKAGE_APP_ID_LOWER".editor.language", "insert-spaces-instead-of-tabs",
"/org/gnome/builder/editor/language/{id}/", NULL, _("Insert spaces instead of tabs"), _("Prefer spaces over
use of tabs"), NULL, 20);
+ dzl_preferences_add_radio (preferences, "languages.id", "indentation",
PACKAGE_APP_ID_LOWER".editor.language", "auto-indent", "/org/gnome/builder/editor/language/{id}/", NULL,
_("Automatically indent"), _("Indent source code as you type"), NULL, 30);
dzl_preferences_add_list_group (preferences, "languages.id", "spaces-style", _("Spacing"),
GTK_SELECTION_NONE, 600);
- dzl_preferences_add_radio (preferences, "languages.id", "spaces-style",
"org.gnome.builder.editor.language", "spaces-style", "/org/gnome/builder/editor/language/{id}/",
"\"before-left-paren\"", _("Space before opening parentheses"), NULL, NULL, 0);
- dzl_preferences_add_radio (preferences, "languages.id", "spaces-style",
"org.gnome.builder.editor.language", "spaces-style", "/org/gnome/builder/editor/language/{id}/",
"\"before-left-bracket\"", _("Space before opening brackets"), NULL, NULL, 1);
- dzl_preferences_add_radio (preferences, "languages.id", "spaces-style",
"org.gnome.builder.editor.language", "spaces-style", "/org/gnome/builder/editor/language/{id}/",
"\"before-left-brace\"", _("Space before opening braces"), NULL, NULL, 2);
- dzl_preferences_add_radio (preferences, "languages.id", "spaces-style",
"org.gnome.builder.editor.language", "spaces-style", "/org/gnome/builder/editor/language/{id}/",
"\"before-left-angle\"", _("Space before opening angles"), NULL, NULL, 3);
- dzl_preferences_add_radio (preferences, "languages.id", "spaces-style",
"org.gnome.builder.editor.language", "spaces-style", "/org/gnome/builder/editor/language/{id}/", "\"colon\"",
_("Prefer a space before colons"), NULL, NULL, 4);
- dzl_preferences_add_radio (preferences, "languages.id", "spaces-style",
"org.gnome.builder.editor.language", "spaces-style", "/org/gnome/builder/editor/language/{id}/", "\"comma\"",
_("Prefer a space before commas"), NULL, NULL, 5);
- dzl_preferences_add_radio (preferences, "languages.id", "spaces-style",
"org.gnome.builder.editor.language", "spaces-style", "/org/gnome/builder/editor/language/{id}/",
"\"semicolon\"", _("Prefer a space before semicolons"), NULL, NULL, 6);
+ dzl_preferences_add_radio (preferences, "languages.id", "spaces-style",
PACKAGE_APP_ID_LOWER".editor.language", "spaces-style", "/org/gnome/builder/editor/language/{id}/",
"\"before-left-paren\"", _("Space before opening parentheses"), NULL, NULL, 0);
+ dzl_preferences_add_radio (preferences, "languages.id", "spaces-style",
PACKAGE_APP_ID_LOWER".editor.language", "spaces-style", "/org/gnome/builder/editor/language/{id}/",
"\"before-left-bracket\"", _("Space before opening brackets"), NULL, NULL, 1);
+ dzl_preferences_add_radio (preferences, "languages.id", "spaces-style",
PACKAGE_APP_ID_LOWER".editor.language", "spaces-style", "/org/gnome/builder/editor/language/{id}/",
"\"before-left-brace\"", _("Space before opening braces"), NULL, NULL, 2);
+ dzl_preferences_add_radio (preferences, "languages.id", "spaces-style",
PACKAGE_APP_ID_LOWER".editor.language", "spaces-style", "/org/gnome/builder/editor/language/{id}/",
"\"before-left-angle\"", _("Space before opening angles"), NULL, NULL, 3);
+ dzl_preferences_add_radio (preferences, "languages.id", "spaces-style",
PACKAGE_APP_ID_LOWER".editor.language", "spaces-style", "/org/gnome/builder/editor/language/{id}/",
"\"colon\"", _("Prefer a space before colons"), NULL, NULL, 4);
+ dzl_preferences_add_radio (preferences, "languages.id", "spaces-style",
PACKAGE_APP_ID_LOWER".editor.language", "spaces-style", "/org/gnome/builder/editor/language/{id}/",
"\"comma\"", _("Prefer a space before commas"), NULL, NULL, 5);
+ dzl_preferences_add_radio (preferences, "languages.id", "spaces-style",
PACKAGE_APP_ID_LOWER".editor.language", "spaces-style", "/org/gnome/builder/editor/language/{id}/",
"\"semicolon\"", _("Prefer a space before semicolons"), NULL, NULL, 6);
}
static gboolean
@@ -394,7 +394,7 @@ ide_preferences_builtin_register_build (DzlPreferences *preferences)
dzl_preferences_add_page (preferences, "build", _("Build"), 500);
dzl_preferences_add_list_group (preferences, "build", "basic", _("General"), GTK_SELECTION_NONE, 0);
- id = dzl_preferences_add_spin_button (preferences, "build", "basic", "org.gnome.builder.build",
"parallel", "/org/gnome/builder/build/", _("Build Workers"), _("Number of parallel build workers"), NULL, 0);
+ id = dzl_preferences_add_spin_button (preferences, "build", "basic", PACKAGE_APP_ID_LOWER".build",
"parallel", "/org/gnome/builder/build/", _("Build Workers"), _("Number of parallel build workers"), NULL, 0);
bin = dzl_preferences_get_widget (preferences, id);
widget = dzl_preferences_spin_button_get_spin_button (DZL_PREFERENCES_SPIN_BUTTON (bin));
@@ -402,10 +402,10 @@ ide_preferences_builtin_register_build (DzlPreferences *preferences)
g_signal_connect (widget, "input", G_CALLBACK (workers_input), NULL);
g_signal_connect (widget, "output", G_CALLBACK (workers_output), NULL);
- dzl_preferences_add_switch (preferences, "build", "basic", "org.gnome.builder", "clear-cache-at-startup",
NULL, NULL, _("Clear build cache at startup"), _("Expired caches will be purged when Builder is started"),
NULL, 10);
+ dzl_preferences_add_switch (preferences, "build", "basic", PACKAGE_APP_ID_LOWER, "clear-cache-at-startup",
NULL, NULL, _("Clear build cache at startup"), _("Expired caches will be purged when Builder is started"),
NULL, 10);
dzl_preferences_add_list_group (preferences, "build", "network", _("Network"), GTK_SELECTION_NONE, 100);
- dzl_preferences_add_switch (preferences, "build", "network", "org.gnome.builder.build",
"allow-network-when-metered", NULL, NULL, _("Allow downloads over metered connections"), _("Allow the use of
metered network connections when automatically downloading dependencies"), NULL, 10);
+ dzl_preferences_add_switch (preferences, "build", "network", PACKAGE_APP_ID_LOWER".build",
"allow-network-when-metered", NULL, NULL, _("Allow downloads over metered connections"), _("Allow the use of
metered network connections when automatically downloading dependencies"), NULL, 10);
}
static void
@@ -414,8 +414,8 @@ ide_preferences_builtin_register_projects (DzlPreferences *preferences)
dzl_preferences_add_page (preferences, "projects", _("Projects"), 450);
dzl_preferences_add_list_group (preferences, "projects", "directory", _("Workspace"), GTK_SELECTION_NONE,
0);
- dzl_preferences_add_file_chooser (preferences, "projects", "directory", "org.gnome.builder",
"projects-directory", NULL, _("Projects directory"), _("A place for all your projects"),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, NULL, 0);
- dzl_preferences_add_switch (preferences, "projects", "directory", "org.gnome.builder",
"restore-previous-files", NULL, NULL, _("Restore previously opened files"), _("Open previously opened files
when loading a project"), NULL, 10);
+ dzl_preferences_add_file_chooser (preferences, "projects", "directory", PACKAGE_APP_ID_LOWER,
"projects-directory", NULL, _("Projects directory"), _("A place for all your projects"),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, NULL, 0);
+ dzl_preferences_add_switch (preferences, "projects", "directory", PACKAGE_APP_ID_LOWER,
"restore-previous-files", NULL, NULL, _("Restore previously opened files"), _("Open previously opened files
when loading a project"), NULL, 10);
}
#if 0
diff --git a/src/libide/gui/ide-window-settings.c b/src/libide/gui/ide-window-settings.c
index dc2701c48..59ebb1cd2 100644
--- a/src/libide/gui/ide-window-settings.c
+++ b/src/libide/gui/ide-window-settings.c
@@ -140,7 +140,7 @@ _ide_window_settings_register (GtkWindow *window)
{
if (settings == NULL)
{
- settings = g_settings_new ("org.gnome.builder");
+ settings = g_settings_new (PACKAGE_APP_ID_LOWER"");
g_object_add_weak_pointer (G_OBJECT (settings), (gpointer *)&settings);
}
else
diff --git a/src/libide/plugins/ide-extension-adapter.c b/src/libide/plugins/ide-extension-adapter.c
index d6043385f..bc9914b17 100644
--- a/src/libide/plugins/ide-extension-adapter.c
+++ b/src/libide/plugins/ide-extension-adapter.c
@@ -86,7 +86,7 @@ ide_extension_adapter_get_settings (IdeExtensionAdapter *self,
peas_plugin_info_get_module_name (plugin_info),
g_type_name (self->interface_type));
- return g_settings_new_with_path ("org.gnome.builder.extension-type", path);
+ return g_settings_new_with_path (PACKAGE_APP_ID_LOWER".extension-type", path);
}
static void
diff --git a/src/libide/plugins/ide-extension-set-adapter.c b/src/libide/plugins/ide-extension-set-adapter.c
index d4586b1f6..5a1bbcc01 100644
--- a/src/libide/plugins/ide-extension-set-adapter.c
+++ b/src/libide/plugins/ide-extension-set-adapter.c
@@ -161,7 +161,7 @@ watch_extension (IdeExtensionSetAdapter *self,
path = g_strdup_printf ("/org/gnome/builder/extension-types/%s/%s/",
peas_plugin_info_get_module_name (plugin_info),
g_type_name (interface_type));
- settings = g_settings_new_with_path ("org.gnome.builder.extension-type", path);
+ settings = g_settings_new_with_path (PACKAGE_APP_ID_LOWER".extension-type", path);
g_ptr_array_add (self->settings, g_object_ref (settings));
diff --git a/src/libide/projects/ide-projects-global.c b/src/libide/projects/ide-projects-global.c
index d762d072c..6d00c39a7 100644
--- a/src/libide/projects/ide-projects-global.c
+++ b/src/libide/projects/ide-projects-global.c
@@ -68,7 +68,7 @@ ide_get_projects_dir (void)
if G_UNLIKELY (g_settings == NULL)
{
- g_settings = g_settings_new ("org.gnome.builder");
+ g_settings = g_settings_new (PACKAGE_APP_ID_LOWER"");
g_signal_connect (g_settings,
"changed::projects-directory",
G_CALLBACK (on_projects_directory_changed_cb),
diff --git a/src/libide/terminal/ide-terminal.c b/src/libide/terminal/ide-terminal.c
index 12b6eca67..04dc2ca87 100644
--- a/src/libide/terminal/ide-terminal.c
+++ b/src/libide/terminal/ide-terminal.c
@@ -550,7 +550,7 @@ ide_terminal_init (IdeTerminal *self)
vte_terminal_match_set_cursor_name (VTE_TERMINAL (self), tag, "hand2");
}
- priv->settings = g_settings_new ("org.gnome.builder.terminal");
+ priv->settings = g_settings_new (PACKAGE_APP_ID_LOWER".terminal");
g_settings_bind (priv->settings, "allow-bold", self, "allow-bold", G_SETTINGS_BIND_GET);
g_signal_connect_object (priv->settings,
"changed::font-name",
diff --git a/src/plugins/auto-save/gbp-auto-save-buffer-addin.c
b/src/plugins/auto-save/gbp-auto-save-buffer-addin.c
index 404d2f2a0..6d89c667d 100644
--- a/src/plugins/auto-save/gbp-auto-save-buffer-addin.c
+++ b/src/plugins/auto-save/gbp-auto-save-buffer-addin.c
@@ -118,7 +118,7 @@ gbp_auto_save_buffer_addin_load (IdeBufferAddin *addin,
g_assert (IDE_IS_BUFFER (buffer));
self->buffer = buffer;
- self->settings = g_settings_new ("org.gnome.builder.editor");
+ self->settings = g_settings_new (PACKAGE_APP_ID_LOWER".editor");
self->auto_save = g_settings_get_boolean (self->settings, "auto-save");
self->auto_save_timeout = g_settings_get_int (self->settings, "auto-save-timeout");
diff --git a/src/plugins/clang/ide-clang-completion-item.c b/src/plugins/clang/ide-clang-completion-item.c
index 93ca4d391..11bdb781f 100644
--- a/src/plugins/clang/ide-clang-completion-item.c
+++ b/src/plugins/clang/ide-clang-completion-item.c
@@ -20,6 +20,8 @@
#define G_LOG_DOMAIN "ide-clang-completion"
+#include "config.h"
+
#include <clang-c/Index.h>
#include <glib/gi18n.h>
#include <libide-foundry.h>
@@ -269,7 +271,7 @@ ide_clang_completion_item_create_snippet (IdeClangCompletionItem *self,
g_assert (IDE_IS_CLANG_COMPLETION_ITEM (self));
g_assert (!file_settings || IDE_IS_FILE_SETTINGS (file_settings));
- settings = g_settings_new ("org.gnome.builder.clang");
+ settings = g_settings_new (PACKAGE_APP_ID_LOWER".clang");
result = ide_clang_completion_item_get_result (self);
snippet = ide_snippet_new (NULL, NULL);
diff --git a/src/plugins/clang/ide-clang-preferences-addin.c b/src/plugins/clang/ide-clang-preferences-addin.c
index 06571beb5..92167c36b 100644
--- a/src/plugins/clang/ide-clang-preferences-addin.c
+++ b/src/plugins/clang/ide-clang-preferences-addin.c
@@ -18,6 +18,8 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
+#include "config.h"
+
#include <glib/gi18n.h>
#include <libide-code.h>
#include <libide-gui.h>
@@ -61,7 +63,7 @@ ide_clang_preferences_addin_load (IdePreferencesAddin *addin,
self->diagnose_id = dzl_preferences_add_switch (preferences,
"code-insight",
"diagnostics",
- "org.gnome.builder.extension-type",
+ PACKAGE_APP_ID_LOWER".extension-type",
"enabled",
"/org/gnome/builder/extension-types/clang-plugin/IdeDiagnosticProvider/",
NULL,
@@ -74,7 +76,7 @@ ide_clang_preferences_addin_load (IdePreferencesAddin *addin,
self->completion_id = dzl_preferences_add_switch (preferences,
"completion",
"providers",
- "org.gnome.builder.extension-type",
+ PACKAGE_APP_ID_LOWER".extension-type",
"enabled",
"/org/gnome/builder/extension-types/clang-plugin/IdeCompletionProvider/",
NULL,
@@ -88,7 +90,7 @@ ide_clang_preferences_addin_load (IdePreferencesAddin *addin,
self->parens_id = dzl_preferences_add_switch (preferences,
"completion",
"clang",
- "org.gnome.builder.clang",
+ PACKAGE_APP_ID_LOWER".clang",
"complete-parens",
NULL,
NULL,
@@ -100,7 +102,7 @@ ide_clang_preferences_addin_load (IdePreferencesAddin *addin,
self->params_id = dzl_preferences_add_switch (preferences,
"completion",
"clang",
- "org.gnome.builder.clang",
+ PACKAGE_APP_ID_LOWER".clang",
"complete-params",
NULL,
NULL,
diff --git a/src/plugins/color-picker/gb-color-picker-prefs.c
b/src/plugins/color-picker/gb-color-picker-prefs.c
index 3e4d8e0bb..08d3c94b8 100644
--- a/src/plugins/color-picker/gb-color-picker-prefs.c
+++ b/src/plugins/color-picker/gb-color-picker-prefs.c
@@ -20,6 +20,8 @@
#include <glib/gi18n.h>
+#include "config.h"
+
#include <libide-editor.h>
#include "gb-color-picker-editor-addin.h"
@@ -741,6 +743,6 @@ gb_color_picker_prefs_init (GbColorPickerPrefs *self)
g_object_unref (builder);
- self->plugin_settings = g_settings_new ("org.gnome.builder.plugins.color_picker_plugin");
- self->components_settings = g_settings_new ("org.gnome.builder.plugins.color_picker_plugin.components");
+ self->plugin_settings = g_settings_new (PACKAGE_APP_ID_LOWER".plugins.color_picker_plugin");
+ self->components_settings = g_settings_new (PACKAGE_APP_ID_LOWER".plugins.color_picker_plugin.components");
}
diff --git a/src/plugins/ctags/ide-ctags-builder.c b/src/plugins/ctags/ide-ctags-builder.c
index 31a0f101d..549b9052b 100644
--- a/src/plugins/ctags/ide-ctags-builder.c
+++ b/src/plugins/ctags/ide-ctags-builder.c
@@ -20,6 +20,8 @@
#define G_LOG_DOMAIN "ide-ctags-builder"
+#include "config.h"
+
#include <libide-vcs.h>
#include "ide-ctags-builder.h"
@@ -333,7 +335,7 @@ ide_ctags_builder_build_async (IdeTagsBuilder *builder,
IDE_EXIT;
}
- settings = g_settings_new ("org.gnome.builder.code-insight");
+ settings = g_settings_new (PACKAGE_APP_ID_LOWER".code-insight");
task_data = g_slice_new0 (BuildTaskData);
task_data->ctags = g_settings_get_string (settings, "ctags-path");
diff --git a/src/plugins/ctags/ide-ctags-completion-provider.c
b/src/plugins/ctags/ide-ctags-completion-provider.c
index afc9a427a..1de343eb9 100644
--- a/src/plugins/ctags/ide-ctags-completion-provider.c
+++ b/src/plugins/ctags/ide-ctags-completion-provider.c
@@ -20,6 +20,8 @@
#define G_LOG_DOMAIN "ide-ctags-completion-provider"
+#include "config.h"
+
#include <glib/gi18n.h>
#include <libide-code.h>
@@ -207,7 +209,7 @@ static void
ide_ctags_completion_provider_init (IdeCtagsCompletionProvider *self)
{
self->indexes = g_ptr_array_new_with_free_func (g_object_unref);
- self->settings = g_settings_new ("org.gnome.builder.code-insight");
+ self->settings = g_settings_new (PACKAGE_APP_ID_LOWER".code-insight");
g_signal_connect_object (self->settings,
"changed::ctags-autocompletion",
diff --git a/src/plugins/editor/gbp-editor-session-addin.c b/src/plugins/editor/gbp-editor-session-addin.c
index 61b782242..75adc3636 100644
--- a/src/plugins/editor/gbp-editor-session-addin.c
+++ b/src/plugins/editor/gbp-editor-session-addin.c
@@ -449,7 +449,7 @@ gbp_editor_session_addin_restore_async (IdeSessionAddin *addin,
editor,
0);
- settings = g_settings_new ("org.gnome.builder");
+ settings = g_settings_new (PACKAGE_APP_ID_LOWER"");
if (!g_settings_get_boolean (settings, "restore-previous-files"))
{
diff --git a/src/plugins/flatpak/gbp-flatpak-application-addin.c
b/src/plugins/flatpak/gbp-flatpak-application-addin.c
index feddde9ed..fbe3d29b9 100644
--- a/src/plugins/flatpak/gbp-flatpak-application-addin.c
+++ b/src/plugins/flatpak/gbp-flatpak-application-addin.c
@@ -410,7 +410,7 @@ gbp_flatpak_application_addin_load (IdeApplicationAddin *addin,
instance = self;
- settings = g_settings_new ("org.gnome.builder");
+ settings = g_settings_new (PACKAGE_APP_ID_LOWER"");
if (g_settings_get_boolean (settings, "clear-cache-at-startup"))
{
diff --git a/src/plugins/gnome-code-assistance/ide-gca-diagnostic-provider.c
b/src/plugins/gnome-code-assistance/ide-gca-diagnostic-provider.c
index cbfc6cf19..ca00b0995 100644
--- a/src/plugins/gnome-code-assistance/ide-gca-diagnostic-provider.c
+++ b/src/plugins/gnome-code-assistance/ide-gca-diagnostic-provider.c
@@ -20,6 +20,8 @@
#define G_LOG_DOMAIN "ide-gca-diagnostic-provider"
+#include "config.h"
+
#include <glib/gi18n.h>
#include "gca-diagnostics.h"
@@ -314,7 +316,7 @@ static GVariant *
get_parse_options (void)
{
if (G_UNLIKELY (gca_settings == NULL))
- gca_settings = g_settings_new ("org.gnome.builder.gnome-code-assistance");
+ gca_settings = g_settings_new (PACKAGE_APP_ID_LOWER".gnome-code-assistance");
if (g_settings_get_boolean (gca_settings, "enable-pylint"))
{
diff --git a/src/plugins/project-tree/gbp-project-tree-addin.c
b/src/plugins/project-tree/gbp-project-tree-addin.c
index 2c20dd9a3..fd3ceb4fb 100644
--- a/src/plugins/project-tree/gbp-project-tree-addin.c
+++ b/src/plugins/project-tree/gbp-project-tree-addin.c
@@ -919,7 +919,7 @@ gbp_project_tree_addin_class_init (GbpProjectTreeAddinClass *klass)
static void
gbp_project_tree_addin_init (GbpProjectTreeAddin *self)
{
- self->settings = g_settings_new ("org.gnome.builder.project-tree");
+ self->settings = g_settings_new (PACKAGE_APP_ID_LOWER".project-tree");
g_signal_connect_object (self->settings,
"changed",
diff --git a/src/plugins/restore-cursor/gbp-restore-cursor-buffer-addin.c
b/src/plugins/restore-cursor/gbp-restore-cursor-buffer-addin.c
index 2ad872ab1..cc7117eae 100644
--- a/src/plugins/restore-cursor/gbp-restore-cursor-buffer-addin.c
+++ b/src/plugins/restore-cursor/gbp-restore-cursor-buffer-addin.c
@@ -117,7 +117,7 @@ gbp_restore_cursor_buffer_addin_file_loaded (IdeBufferAddin *addin,
g_assert (G_IS_FILE (file));
/* Make sure our setting isn't disabled */
- settings = g_settings_new ("org.gnome.builder.editor");
+ settings = g_settings_new (PACKAGE_APP_ID_LOWER".editor");
if (!g_settings_get_boolean (settings, "restore-insert-mark"))
return;
diff --git a/src/plugins/xml-pack/ide-xml-parser.c b/src/plugins/xml-pack/ide-xml-parser.c
index 1b0cfa802..49ab1792a 100644
--- a/src/plugins/xml-pack/ide-xml-parser.c
+++ b/src/plugins/xml-pack/ide-xml-parser.c
@@ -18,6 +18,10 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
+#define G_LOG_DOMAIN "ide-xml-parser"
+
+#include "config.h"
+
#include <dazzle.h>
#include <glib/gi18n.h>
#include <glib-object.h>
@@ -797,7 +801,7 @@ ide_xml_parser_init (IdeXmlParser *self)
self->color_tags = g_array_new (TRUE, TRUE, sizeof (ColorTag));
g_array_set_clear_func (self->color_tags, (GDestroyNotify)color_tag_free);
- self->settings = g_settings_new ("org.gnome.builder.editor");
+ self->settings = g_settings_new (PACKAGE_APP_ID_LOWER".editor");
g_signal_connect_swapped (self->settings,
"changed",
G_CALLBACK (editor_settings_changed_cb),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
