Rename app-id to org.gnome.Settings

Rename the app-id to org.gnome.Settings since this is what
we've been calling it for many years now. Adjust all files
that derive from the app-id, such as the desktop file, D-Bus
service file names, search providers, GSettings schemas, to
match that.

Closes https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/344

11 files changed, 15 insertions, 15 deletions

diff --git a/shell/appdata/meson.build b/shell/appdata/meson.build
index fdb827969..526a10de8 100644
--- a/shell/appdata/meson.build
+++ b/shell/appdata/meson.build
@@ -1,4 +1,4 @@
-appdata = 'gnome-control-center.appdata.xml'
+appdata = 'org.gnome.Settings.appdata.xml'
 
 i18n.merge_file(
   input: appdata + '.in',
diff --git a/shell/appdata/gnome-control-center.appdata.xml.in b/shell/appdata/org.gnome.Settings.appdata.xml.in
index ed654b90d..cf06de84b 100644
--- a/shell/appdata/gnome-control-center.appdata.xml.in
+++ b/shell/appdata/org.gnome.Settings.appdata.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2015 Richard Hughes <richard@hughsie.com> -->
 <component type="desktop">
-  <id>gnome-control-center.desktop</id>
+  <id>org.gnome.Settings.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
   <name>Settings</name>
diff --git a/shell/cc-application.c b/shell/cc-application.c
index 11c019419..a51568bae 100644
--- a/shell/cc-application.c
+++ b/shell/cc-application.c
@@ -232,7 +232,7 @@ cc_application_startup (GApplication *application)
   self->window = cc_window_new (GTK_APPLICATION (application), self->model);
 
   provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_resource (provider, "/org/gnome/ControlCenter/gtk/style.css");
+  gtk_css_provider_load_from_resource (provider, "/org/gnome/Settings/gtk/style.css");
   gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                               GTK_STYLE_PROVIDER (provider),
                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
@@ -292,7 +292,7 @@ GtkApplication *
 cc_application_new (void)
 {
   return g_object_new (CC_TYPE_APPLICATION,
-                       "application-id", "org.gnome.ControlCenter",
+                       "application-id", "org.gnome.Settings",
                        "flags", G_APPLICATION_HANDLES_COMMAND_LINE,
                        NULL);
 }
diff --git a/shell/cc-panel-list.c b/shell/cc-panel-list.c
index 9ab6b7b80..6cbc16bbd 100644
--- a/shell/cc-panel-list.c
+++ b/shell/cc-panel-list.c
@@ -770,7 +770,7 @@ cc_panel_list_class_init (CcPanelListClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/gtk/cc-panel-list.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Settings/gtk/cc-panel-list.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcPanelList, privacy_listbox);
   gtk_widget_class_bind_template_child (widget_class, CcPanelList, privacy_row);
diff --git a/shell/cc-panel.c b/shell/cc-panel.c
index 0d3886fa7..d51a8b1cd 100644
--- a/shell/cc-panel.c
+++ b/shell/cc-panel.c
@@ -270,7 +270,7 @@ cc_panel_class_init (CcPanelClass *klass)
 
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/gtk/cc-panel.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Settings/gtk/cc-panel.ui");
 
   gtk_widget_class_bind_template_child_private (widget_class, CcPanel, content_bin);
   gtk_widget_class_bind_template_child_private (widget_class, CcPanel, main_box);
diff --git a/shell/cc-window.c b/shell/cc-window.c
index ac9afea94..3a79b6d97 100644
--- a/shell/cc-window.c
+++ b/shell/cc-window.c
@@ -809,7 +809,7 @@ cc_window_class_init (CcWindowClass *klass)
                                                          FALSE,
                                                          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/gtk/cc-window.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Settings/gtk/cc-window.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcWindow, development_warning_dialog);
   gtk_widget_class_bind_template_child (widget_class, CcWindow, header);
@@ -851,7 +851,7 @@ cc_window_init (CcWindow *self)
 {
   gtk_widget_init_template (GTK_WIDGET (self));
 
-  self->settings = g_settings_new ("org.gnome.ControlCenter");
+  self->settings = g_settings_new ("org.gnome.Settings");
   self->previous_panels = g_queue_new ();
   self->previous_list_view = cc_panel_list_get_view (self->panel_list);
 
diff --git a/shell/gnome-control-center.gresource.xml b/shell/gnome-control-center.gresource.xml
index bdd1ec209..ec1feae1e 100644
--- a/shell/gnome-control-center.gresource.xml
+++ b/shell/gnome-control-center.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/ControlCenter/gtk">
+  <gresource prefix="/org/gnome/Settings/gtk">
     <file preprocess="xml-stripblanks">cc-panel.ui</file>
     <file preprocess="xml-stripblanks">cc-panel-list.ui</file>
     <file preprocess="xml-stripblanks">cc-window.ui</file>
@@ -9,7 +9,7 @@
   </gresource>
 
   <!-- Panel icons -->
-  <gresource prefix="/org/gnome/ControlCenter">
+  <gresource prefix="/org/gnome/Settings">
     <file preprocess="xml-stripblanks">icons/multitasking-symbolic.svg</file>
     <file>style.css</file>
   </gresource>
diff --git a/shell/meson.build b/shell/meson.build
index 56ec21249..9553c35ce 100644
--- a/shell/meson.build
+++ b/shell/meson.build
@@ -4,7 +4,7 @@ subdir('completions')
 service_conf = configuration_data()
 service_conf.set('bindir', control_center_bindir)
 
-service = 'org.gnome.ControlCenter.service'
+service = 'org.gnome.Settings.service'
 
 configure_file(
           input : service + '.in',
@@ -14,7 +14,7 @@ configure_file(
   configuration : service_conf
 )
 
-desktop = 'gnome-control-center.desktop'
+desktop = 'org.gnome.Settings.desktop'
 
 desktop_in = configure_file(
           input : desktop + '.in.in',
@@ -166,6 +166,6 @@ libtestshell_deps = common_deps + [ libwidgets_dep, libtestshell_dep ]
 
 
 install_data (
-  'org.gnome.ControlCenter.gschema.xml',
+  'org.gnome.Settings.gschema.xml',
   install_dir : control_center_schemadir
 )
diff --git a/shell/gnome-control-center.desktop.in.in b/shell/org.gnome.Settings.desktop.in.in
index 1cb049c8c..1cb049c8c 100644
--- a/shell/gnome-control-center.desktop.in.in
+++ b/shell/org.gnome.Settings.desktop.in.in
diff --git a/shell/org.gnome.ControlCenter.gschema.xml b/shell/org.gnome.Settings.gschema.xml
index ccf376b00..bf4d78df4 100644
--- a/shell/org.gnome.ControlCenter.gschema.xml
+++ b/shell/org.gnome.Settings.gschema.xml
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema gettext-domain="gnome-control-center-2.0" id="org.gnome.ControlCenter" path="/org/gnome/control-center/">
+  <schema gettext-domain="gnome-control-center-2.0" id="org.gnome.Settings" path="/org/gnome/control-center/">
     <key name="last-panel" type="s">
       <default>''</default>
       <summary>The identifier for the last Settings panel to be opened</summary>
diff --git a/shell/org.gnome.ControlCenter.service.in b/shell/org.gnome.Settings.service.in
index a51512957..dbd6f82da 100644
--- a/shell/org.gnome.ControlCenter.service.in
+++ b/shell/org.gnome.Settings.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.gnome.ControlCenter
+Name=org.gnome.Settings
 Exec=@bindir@/gnome-control-center