diff --git a/build-aux/flatpak/org.gnome.Settings.json b/build-aux/flatpak/org.gnome.Settings.json index 313c6c64f..3258f88e5 100644 --- a/build-aux/flatpak/org.gnome.Settings.json +++ b/build-aux/flatpak/org.gnome.Settings.json @@ -13,7 +13,6 @@ "--device=dri", "--env=DCONF_USER_CONFIG_DIR=.config/dconf", "--filesystem=host", - "--own-name=org.gnome.ControlCenter", "--own-name=org.gnome.SessionManager", "--share=ipc", "--share=network", diff --git a/panels/background/background.gresource.xml b/panels/background/background.gresource.xml index bb932a30f..1699244f0 100644 --- a/panels/background/background.gresource.xml +++ b/panels/background/background.gresource.xml @@ -7,7 +7,7 @@ preview.css - + background-selected-symbolic.svg slideshow-symbolic.svg diff --git a/panels/network/network.gresource.xml b/panels/network/network.gresource.xml index 8fb44ae57..d014387bf 100644 --- a/panels/network/network.gresource.xml +++ b/panels/network/network.gresource.xml @@ -16,7 +16,7 @@ cc-wifi-panel.ui wifi-panel.css - + lock-small-symbolic.svg warning-small-symbolic.svg diff --git a/panels/network/wireless-security/eap-method-fast.c b/panels/network/wireless-security/eap-method-fast.c index 0988b8cf3..c0f4ad006 100644 --- a/panels/network/wireless-security/eap-method-fast.c +++ b/panels/network/wireless-security/eap-method-fast.c @@ -274,7 +274,7 @@ eap_method_fast_class_init (EAPMethodFASTClass *klass) g_type_ensure (WS_TYPE_FILE_CHOOSER_BUTTON); - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/network/eap-method-fast.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Settings/network/eap-method-fast.ui"); gtk_widget_class_bind_template_child (widget_class, EAPMethodFAST, anon_identity_entry); gtk_widget_class_bind_template_child (widget_class, EAPMethodFAST, anon_identity_label); diff --git a/panels/network/wireless-security/eap-method-leap.c b/panels/network/wireless-security/eap-method-leap.c index a5ff59e2e..95e7a8eab 100644 --- a/panels/network/wireless-security/eap-method-leap.c +++ b/panels/network/wireless-security/eap-method-leap.c @@ -215,7 +215,7 @@ eap_method_leap_class_init (EAPMethodLEAPClass *klass) object_class->dispose = eap_method_leap_dispose; - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/network/eap-method-leap.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Settings/network/eap-method-leap.ui"); gtk_widget_class_bind_template_child (widget_class, EAPMethodLEAP, password_entry); gtk_widget_class_bind_template_child (widget_class, EAPMethodLEAP, password_label); diff --git a/panels/network/wireless-security/eap-method-peap.c b/panels/network/wireless-security/eap-method-peap.c index b30419da1..17eee125e 100644 --- a/panels/network/wireless-security/eap-method-peap.c +++ b/panels/network/wireless-security/eap-method-peap.c @@ -277,7 +277,7 @@ eap_method_peap_class_init (EAPMethodPEAPClass *klass) { GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/network/eap-method-peap.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Settings/network/eap-method-peap.ui"); gtk_widget_class_bind_template_child (widget_class, EAPMethodPEAP, anon_identity_entry); gtk_widget_class_bind_template_child (widget_class, EAPMethodPEAP, anon_identity_label); diff --git a/panels/network/wireless-security/eap-method-simple.c b/panels/network/wireless-security/eap-method-simple.c index d0f0b2200..3dda8df28 100644 --- a/panels/network/wireless-security/eap-method-simple.c +++ b/panels/network/wireless-security/eap-method-simple.c @@ -297,7 +297,7 @@ eap_method_simple_class_init (EAPMethodSimpleClass *klass) object_class->dispose = eap_method_simple_dispose; - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/network/eap-method-simple.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Settings/network/eap-method-simple.ui"); gtk_widget_class_bind_template_child (widget_class, EAPMethodSimple, password_label); gtk_widget_class_bind_template_child (widget_class, EAPMethodSimple, username_label); diff --git a/panels/network/wireless-security/eap-method-tls.c b/panels/network/wireless-security/eap-method-tls.c index 3bf79adb8..5038915fd 100644 --- a/panels/network/wireless-security/eap-method-tls.c +++ b/panels/network/wireless-security/eap-method-tls.c @@ -461,7 +461,7 @@ eap_method_tls_class_init (EAPMethodTLSClass *klass) g_type_ensure (WS_TYPE_FILE_CHOOSER_BUTTON); - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/network/eap-method-tls.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Settings/network/eap-method-tls.ui"); gtk_widget_class_bind_template_child (widget_class, EAPMethodTLS, ca_cert_button); gtk_widget_class_bind_template_child (widget_class, EAPMethodTLS, ca_cert_label); diff --git a/panels/network/wireless-security/eap-method-ttls.c b/panels/network/wireless-security/eap-method-ttls.c index 699566706..b41a57f55 100644 --- a/panels/network/wireless-security/eap-method-ttls.c +++ b/panels/network/wireless-security/eap-method-ttls.c @@ -285,7 +285,7 @@ eap_method_ttls_class_init (EAPMethodTTLSClass *klass) { GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/network/eap-method-ttls.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Settings/network/eap-method-ttls.ui"); gtk_widget_class_bind_template_child (widget_class, EAPMethodTTLS, anon_identity_entry); gtk_widget_class_bind_template_child (widget_class, EAPMethodTTLS, anon_identity_label); diff --git a/panels/network/wireless-security/wireless-security.gresource.xml b/panels/network/wireless-security/wireless-security.gresource.xml index fa1a965ad..c82860c3f 100644 --- a/panels/network/wireless-security/wireless-security.gresource.xml +++ b/panels/network/wireless-security/wireless-security.gresource.xml @@ -1,6 +1,6 @@ - + eap-method-leap.ui eap-method-fast.ui eap-method-peap.ui diff --git a/panels/network/wireless-security/ws-dynamic-wep.c b/panels/network/wireless-security/ws-dynamic-wep.c index 001c561f7..87a5bb9dd 100644 --- a/panels/network/wireless-security/ws-dynamic-wep.c +++ b/panels/network/wireless-security/ws-dynamic-wep.c @@ -179,7 +179,7 @@ ws_dynamic_wep_class_init (WirelessSecurityDynamicWEPClass *klass) { GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/network/ws-dynamic-wep.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Settings/network/ws-dynamic-wep.ui"); gtk_widget_class_bind_template_child (widget_class, WirelessSecurityDynamicWEP, auth_combo); gtk_widget_class_bind_template_child (widget_class, WirelessSecurityDynamicWEP, auth_label); diff --git a/panels/network/wireless-security/ws-leap.c b/panels/network/wireless-security/ws-leap.c index 4fcfb5f81..a2340159e 100644 --- a/panels/network/wireless-security/ws-leap.c +++ b/panels/network/wireless-security/ws-leap.c @@ -150,7 +150,7 @@ ws_leap_class_init (WirelessSecurityLEAPClass *klass) { GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/network/ws-leap.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Settings/network/ws-leap.ui"); gtk_widget_class_bind_template_child (widget_class, WirelessSecurityLEAP, password_entry); gtk_widget_class_bind_template_child (widget_class, WirelessSecurityLEAP, password_label); diff --git a/panels/network/wireless-security/ws-sae.c b/panels/network/wireless-security/ws-sae.c index 532067286..83fe0c793 100644 --- a/panels/network/wireless-security/ws-sae.c +++ b/panels/network/wireless-security/ws-sae.c @@ -167,7 +167,7 @@ ws_sae_class_init (WirelessSecuritySAEClass *klass) { GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/network/ws-sae.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Settings/network/ws-sae.ui"); gtk_widget_class_bind_template_child (widget_class, WirelessSecuritySAE, password_entry); gtk_widget_class_bind_template_child (widget_class, WirelessSecuritySAE, password_label); diff --git a/panels/network/wireless-security/ws-wep-key.c b/panels/network/wireless-security/ws-wep-key.c index 741114fb2..8b354d5b2 100644 --- a/panels/network/wireless-security/ws-wep-key.c +++ b/panels/network/wireless-security/ws-wep-key.c @@ -264,7 +264,7 @@ ws_wep_key_class_init (WirelessSecurityWEPKeyClass *klass) object_class->dispose = ws_wep_key_dispose; - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/network/ws-wep-key.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Settings/network/ws-wep-key.ui"); gtk_widget_class_bind_template_child (widget_class, WirelessSecurityWEPKey, auth_method_combo); gtk_widget_class_bind_template_child (widget_class, WirelessSecurityWEPKey, auth_method_label); diff --git a/panels/network/wireless-security/ws-wpa-eap.c b/panels/network/wireless-security/ws-wpa-eap.c index 662149d69..d2b01b6fc 100644 --- a/panels/network/wireless-security/ws-wpa-eap.c +++ b/panels/network/wireless-security/ws-wpa-eap.c @@ -194,7 +194,7 @@ ws_wpa_eap_class_init (WirelessSecurityWPAEAPClass *klass) { GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/network/ws-wpa-eap.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Settings/network/ws-wpa-eap.ui"); gtk_widget_class_bind_template_child (widget_class, WirelessSecurityWPAEAP, auth_combo); gtk_widget_class_bind_template_child (widget_class, WirelessSecurityWPAEAP, auth_label); diff --git a/panels/network/wireless-security/ws-wpa-psk.c b/panels/network/wireless-security/ws-wpa-psk.c index 348f11ef5..b911b36bb 100644 --- a/panels/network/wireless-security/ws-wpa-psk.c +++ b/panels/network/wireless-security/ws-wpa-psk.c @@ -180,7 +180,7 @@ ws_wpa_psk_class_init (WirelessSecurityWPAPSKClass *klass) { GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/network/ws-wpa-psk.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Settings/network/ws-wpa-psk.ui"); gtk_widget_class_bind_template_child (widget_class, WirelessSecurityWPAPSK, password_entry); gtk_widget_class_bind_template_child (widget_class, WirelessSecurityWPAPSK, password_label); diff --git a/panels/online-accounts/gnome-control-center-goa-helper.c b/panels/online-accounts/gnome-control-center-goa-helper.c index d37f4ff90..56513147e 100644 --- a/panels/online-accounts/gnome-control-center-goa-helper.c +++ b/panels/online-accounts/gnome-control-center-goa-helper.c @@ -242,7 +242,7 @@ create_account (int argc, return EXIT_FAILURE; } - application = gtk_application_new ("org.gnome.ControlCenter.GoaHelper", + application = gtk_application_new ("org.gnome.Settings.GoaHelper", G_APPLICATION_FLAGS_NONE); g_signal_connect (application, "activate", G_CALLBACK (on_application_activate_create_account_cb), argv); @@ -451,7 +451,7 @@ show_account (int argc, return EXIT_FAILURE; } - application = gtk_application_new ("org.gnome.ControlCenter.GoaHelper", + application = gtk_application_new ("org.gnome.Settings.GoaHelper", G_APPLICATION_FLAGS_NONE); g_signal_connect (application, "activate", G_CALLBACK (on_application_activate_show_account_cb), argv); diff --git a/panels/region/region.gresource.xml b/panels/region/region.gresource.xml index b1d72b2e2..e3bff8608 100644 --- a/panels/region/region.gresource.xml +++ b/panels/region/region.gresource.xml @@ -5,7 +5,7 @@ cc-region-panel.ui cc-format-preview.ui - + view-layout-symbolic.svg diff --git a/panels/sound/sound.gresource.xml b/panels/sound/sound.gresource.xml index 5f3964f98..3ec0b5f85 100644 --- a/panels/sound/sound.gresource.xml +++ b/panels/sound/sound.gresource.xml @@ -15,7 +15,7 @@ cc-subwoofer-slider.ui cc-volume-slider.ui - + icons/audio-speaker-center-back.svg icons/audio-speaker-center-back-testing.svg icons/audio-speaker-center.svg diff --git a/panels/user-accounts/user-accounts.gresource.xml b/panels/user-accounts/user-accounts.gresource.xml index fcd1a7fbc..47c987e94 100644 --- a/panels/user-accounts/user-accounts.gresource.xml +++ b/panels/user-accounts/user-accounts.gresource.xml @@ -14,7 +14,7 @@ data/cc-fingerprint-dialog.css - + data/icons/fingerprint-detection-complete-symbolic.svg data/icons/fingerprint-detection-symbolic.svg data/icons/fingerprint-detection-warning-symbolic.svg diff --git a/po/POTFILES.in b/po/POTFILES.in index 15696c19b..04eb81e57 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -289,8 +289,8 @@ shell/cc-panel-list.ui shell/cc-panel-loader.c shell/cc-window.c shell/cc-window.ui -shell/gnome-control-center.desktop.in.in shell/help-overlay.ui shell/org.gnome.ControlCenter.gschema.xml +shell/org.gnome.ControlCenter.desktop.in.in # Please do not remove this file from POTFILES.in. Run "git submodule init && git submodule update" to get it. subprojects/gvc/gvc-mixer-control.c diff --git a/search-provider/control-center-search-provider.c b/search-provider/control-center-search-provider.c index dfe0dc51c..c49cd9a45 100644 --- a/search-provider/control-center-search-provider.c +++ b/search-provider/control-center-search-provider.c @@ -135,7 +135,7 @@ cc_search_provider_app_get () return singleton; singleton = g_object_new (CC_TYPE_SEARCH_PROVIDER_APP, - "application-id", "org.gnome.ControlCenter.SearchProvider", + "application-id", "org.gnome.Settings.SearchProvider", "flags", G_APPLICATION_IS_SERVICE, NULL); diff --git a/search-provider/gnome-control-center-search-provider.ini b/search-provider/gnome-control-center-search-provider.ini deleted file mode 100644 index 79230332e..000000000 --- a/search-provider/gnome-control-center-search-provider.ini +++ /dev/null @@ -1,5 +0,0 @@ -[Shell Search Provider] -DesktopId=gnome-control-center.desktop -BusName=org.gnome.ControlCenter.SearchProvider -ObjectPath=/org/gnome/ControlCenter/SearchProvider -Version=2 diff --git a/search-provider/meson.build b/search-provider/meson.build index 1a3467250..624641aff 100644 --- a/search-provider/meson.build +++ b/search-provider/meson.build @@ -1,7 +1,7 @@ service_conf = configuration_data() service_conf.set('libexecdir', control_center_libexecdir) -service = 'org.gnome.ControlCenter.SearchProvider.service' +service = 'org.gnome.Settings.SearchProvider.service' configure_file( input : service + '.in', @@ -12,7 +12,7 @@ configure_file( ) install_data( - 'gnome-control-center-search-provider.ini', + 'org.gnome.Settings.search-provider.ini', install_dir: join_paths(control_center_datadir, 'gnome-shell', 'search-providers') ) diff --git a/search-provider/org.gnome.ControlCenter.SearchProvider.service.in b/search-provider/org.gnome.ControlCenter.SearchProvider.service.in deleted file mode 100644 index 81dd0c8c2..000000000 --- a/search-provider/org.gnome.ControlCenter.SearchProvider.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.gnome.ControlCenter.SearchProvider -Exec=@libexecdir@/gnome-control-center-search-provider \ No newline at end of file diff --git a/search-provider/org.gnome.Settings.SearchProvider.service.in b/search-provider/org.gnome.Settings.SearchProvider.service.in new file mode 100644 index 000000000..7cc98a368 --- /dev/null +++ b/search-provider/org.gnome.Settings.SearchProvider.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.gnome.Settings.SearchProvider +Exec=@libexecdir@/gnome-control-center-search-provider diff --git a/search-provider/org.gnome.Settings.search-provider.ini b/search-provider/org.gnome.Settings.search-provider.ini new file mode 100644 index 000000000..89dd949e2 --- /dev/null +++ b/search-provider/org.gnome.Settings.search-provider.ini @@ -0,0 +1,5 @@ +[Shell Search Provider] +DesktopId=org.gnome.Settings.desktop +BusName=org.gnome.Settings.SearchProvider +ObjectPath=/org/gnome/Settings/SearchProvider +Version=2 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 similarity index 98% rename from shell/appdata/gnome-control-center.appdata.xml.in rename to 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 @@ - gnome-control-center.desktop + org.gnome.Settings.desktop CC0-1.0 GPL-2.0+ Settings 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 @@ - + cc-panel.ui cc-panel-list.ui cc-window.ui @@ -9,7 +9,7 @@ - + icons/multitasking-symbolic.svg style.css 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 similarity index 100% rename from shell/gnome-control-center.desktop.in.in rename to shell/org.gnome.Settings.desktop.in.in diff --git a/shell/org.gnome.ControlCenter.gschema.xml b/shell/org.gnome.Settings.gschema.xml similarity index 95% rename from shell/org.gnome.ControlCenter.gschema.xml rename to 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 @@ - + '' The identifier for the last Settings panel to be opened diff --git a/shell/org.gnome.ControlCenter.service.in b/shell/org.gnome.Settings.service.in similarity index 63% rename from shell/org.gnome.ControlCenter.service.in rename to 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