applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename app-id to org.gnome.Settings

Browse source 
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
This commit is contained in:
Georges Basile Stavracas Neto 2022-01-20 00:02:02 -03:00
parent 5fbb9dfc6b
commit acd59aec65
38 changed files with 47 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build-aux/flatpak/org.gnome.Settings.json
View file

@ -13,7 +13,6 @@
"--device=dri", "--device=dri",
"--env=DCONF_USER_CONFIG_DIR=.config/dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
"--filesystem=host", "--filesystem=host",
"--own-name=org.gnome.ControlCenter",
"--own-name=org.gnome.SessionManager", "--own-name=org.gnome.SessionManager",
"--share=ipc", "--share=ipc",
"--share=network", "--share=network",

2
panels/background/background.gresource.xml
View file

@ -7,7 +7,7 @@
<file>preview.css</file> <file>preview.css</file>
</gresource> </gresource>
<gresource prefix="/org/gnome/ControlCenter/icons/scalable/actions"> <gresource prefix="/org/gnome/Settings/icons/scalable/actions">
<file preprocess="xml-stripblanks">background-selected-symbolic.svg</file> <file preprocess="xml-stripblanks">background-selected-symbolic.svg</file>
<file preprocess="xml-stripblanks">slideshow-symbolic.svg</file> <file preprocess="xml-stripblanks">slideshow-symbolic.svg</file>
</gresource> </gresource>

2
panels/network/network.gresource.xml
View file

@ -16,7 +16,7 @@
<file preprocess="xml-stripblanks">cc-wifi-panel.ui</file> <file preprocess="xml-stripblanks">cc-wifi-panel.ui</file>
<file>wifi-panel.css</file> <file>wifi-panel.css</file>
</gresource> </gresource>
<gresource prefix="/org/gnome/ControlCenter/icons/scalable/actions"> <gresource prefix="/org/gnome/Settings/icons/scalable/actions">
<!-- Wi-Fi panel icons --> <!-- Wi-Fi panel icons -->
<file preprocess="xml-stripblanks">lock-small-symbolic.svg</file> <file preprocess="xml-stripblanks">lock-small-symbolic.svg</file>
<file preprocess="xml-stripblanks">warning-small-symbolic.svg</file> <file preprocess="xml-stripblanks">warning-small-symbolic.svg</file>

2
panels/network/wireless-security/eap-method-fast.c
View file

@ -274,7 +274,7 @@ eap_method_fast_class_init (EAPMethodFASTClass *klass)
g_type_ensure (WS_TYPE_FILE_CHOOSER_BUTTON); 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_entry);
gtk_widget_class_bind_template_child (widget_class, EAPMethodFAST, anon_identity_label); gtk_widget_class_bind_template_child (widget_class, EAPMethodFAST, anon_identity_label);

2
panels/network/wireless-security/eap-method-leap.c
View file

@ -215,7 +215,7 @@ eap_method_leap_class_init (EAPMethodLEAPClass *klass)
object_class->dispose = eap_method_leap_dispose; 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_entry);
gtk_widget_class_bind_template_child (widget_class, EAPMethodLEAP, password_label); gtk_widget_class_bind_template_child (widget_class, EAPMethodLEAP, password_label);

2
panels/network/wireless-security/eap-method-peap.c
View file

@ -277,7 +277,7 @@ eap_method_peap_class_init (EAPMethodPEAPClass *klass)
{ {
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (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_entry);
gtk_widget_class_bind_template_child (widget_class, EAPMethodPEAP, anon_identity_label); gtk_widget_class_bind_template_child (widget_class, EAPMethodPEAP, anon_identity_label);

2
panels/network/wireless-security/eap-method-simple.c
View file

@ -297,7 +297,7 @@ eap_method_simple_class_init (EAPMethodSimpleClass *klass)
object_class->dispose = eap_method_simple_dispose; 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, password_label);
gtk_widget_class_bind_template_child (widget_class, EAPMethodSimple, username_label); gtk_widget_class_bind_template_child (widget_class, EAPMethodSimple, username_label);

2
panels/network/wireless-security/eap-method-tls.c
View file

@ -461,7 +461,7 @@ eap_method_tls_class_init (EAPMethodTLSClass *klass)
g_type_ensure (WS_TYPE_FILE_CHOOSER_BUTTON); 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_button);
gtk_widget_class_bind_template_child (widget_class, EAPMethodTLS, ca_cert_label); gtk_widget_class_bind_template_child (widget_class, EAPMethodTLS, ca_cert_label);

2
panels/network/wireless-security/eap-method-ttls.c
View file

@ -285,7 +285,7 @@ eap_method_ttls_class_init (EAPMethodTTLSClass *klass)
{ {
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (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_entry);
gtk_widget_class_bind_template_child (widget_class, EAPMethodTTLS, anon_identity_label); gtk_widget_class_bind_template_child (widget_class, EAPMethodTTLS, anon_identity_label);

2
panels/network/wireless-security/wireless-security.gresource.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<gresources> <gresources>
<gresource prefix="/org/gnome/ControlCenter/network/"> <gresource prefix="/org/gnome/Settings/network/">
<file preprocess="xml-stripblanks">eap-method-leap.ui</file> <file preprocess="xml-stripblanks">eap-method-leap.ui</file>
<file preprocess="xml-stripblanks">eap-method-fast.ui</file> <file preprocess="xml-stripblanks">eap-method-fast.ui</file>
<file preprocess="xml-stripblanks">eap-method-peap.ui</file> <file preprocess="xml-stripblanks">eap-method-peap.ui</file>

2
panels/network/wireless-security/ws-dynamic-wep.c
View file

@ -179,7 +179,7 @@ ws_dynamic_wep_class_init (WirelessSecurityDynamicWEPClass *klass)
{ {
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (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_combo);
gtk_widget_class_bind_template_child (widget_class, WirelessSecurityDynamicWEP, auth_label); gtk_widget_class_bind_template_child (widget_class, WirelessSecurityDynamicWEP, auth_label);

2
panels/network/wireless-security/ws-leap.c
View file

@ -150,7 +150,7 @@ ws_leap_class_init (WirelessSecurityLEAPClass *klass)
{ {
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (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_entry);
gtk_widget_class_bind_template_child (widget_class, WirelessSecurityLEAP, password_label); gtk_widget_class_bind_template_child (widget_class, WirelessSecurityLEAP, password_label);

2
panels/network/wireless-security/ws-sae.c
View file

@ -167,7 +167,7 @@ ws_sae_class_init (WirelessSecuritySAEClass *klass)
{ {
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (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_entry);
gtk_widget_class_bind_template_child (widget_class, WirelessSecuritySAE, password_label); gtk_widget_class_bind_template_child (widget_class, WirelessSecuritySAE, password_label);

2
panels/network/wireless-security/ws-wep-key.c
View file

@ -264,7 +264,7 @@ ws_wep_key_class_init (WirelessSecurityWEPKeyClass *klass)
object_class->dispose = ws_wep_key_dispose; 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_combo);
gtk_widget_class_bind_template_child (widget_class, WirelessSecurityWEPKey, auth_method_label); gtk_widget_class_bind_template_child (widget_class, WirelessSecurityWEPKey, auth_method_label);

2
panels/network/wireless-security/ws-wpa-eap.c
View file

@ -194,7 +194,7 @@ ws_wpa_eap_class_init (WirelessSecurityWPAEAPClass *klass)
{ {
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (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_combo);
gtk_widget_class_bind_template_child (widget_class, WirelessSecurityWPAEAP, auth_label); gtk_widget_class_bind_template_child (widget_class, WirelessSecurityWPAEAP, auth_label);

2
panels/network/wireless-security/ws-wpa-psk.c
View file

@ -180,7 +180,7 @@ ws_wpa_psk_class_init (WirelessSecurityWPAPSKClass *klass)
{ {
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (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_entry);
gtk_widget_class_bind_template_child (widget_class, WirelessSecurityWPAPSK, password_label); gtk_widget_class_bind_template_child (widget_class, WirelessSecurityWPAPSK, password_label);

4
panels/online-accounts/gnome-control-center-goa-helper.c
View file

@ -242,7 +242,7 @@ create_account (int argc,
return EXIT_FAILURE; return EXIT_FAILURE;
} }
application = gtk_application_new ("org.gnome.ControlCenter.GoaHelper", application = gtk_application_new ("org.gnome.Settings.GoaHelper",
G_APPLICATION_FLAGS_NONE); G_APPLICATION_FLAGS_NONE);
g_signal_connect (application, "activate", G_CALLBACK (on_application_activate_create_account_cb), argv); 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; return EXIT_FAILURE;
} }
application = gtk_application_new ("org.gnome.ControlCenter.GoaHelper", application = gtk_application_new ("org.gnome.Settings.GoaHelper",
G_APPLICATION_FLAGS_NONE); G_APPLICATION_FLAGS_NONE);
g_signal_connect (application, "activate", G_CALLBACK (on_application_activate_show_account_cb), argv); g_signal_connect (application, "activate", G_CALLBACK (on_application_activate_show_account_cb), argv);

2
panels/region/region.gresource.xml
View file

@ -5,7 +5,7 @@
<file preprocess="xml-stripblanks">cc-region-panel.ui</file> <file preprocess="xml-stripblanks">cc-region-panel.ui</file>
<file preprocess="xml-stripblanks">cc-format-preview.ui</file> <file preprocess="xml-stripblanks">cc-format-preview.ui</file>
</gresource> </gresource>
<gresource prefix="/org/gnome/ControlCenter/icons/scalable/actions"> <gresource prefix="/org/gnome/Settings/icons/scalable/actions">
<file>view-layout-symbolic.svg</file> <file>view-layout-symbolic.svg</file>
</gresource> </gresource>
</gresources> </gresources>

2
panels/sound/sound.gresource.xml
View file

@ -15,7 +15,7 @@
<file preprocess="xml-stripblanks">cc-subwoofer-slider.ui</file> <file preprocess="xml-stripblanks">cc-subwoofer-slider.ui</file>
<file preprocess="xml-stripblanks">cc-volume-slider.ui</file> <file preprocess="xml-stripblanks">cc-volume-slider.ui</file>
</gresource> </gresource>
<gresource prefix="/org/gnome/ControlCenter/icons/scalable/devices"> <gresource prefix="/org/gnome/Settings/icons/scalable/devices">
<file alias="audio-speaker-center-back.svg">icons/audio-speaker-center-back.svg</file> <file alias="audio-speaker-center-back.svg">icons/audio-speaker-center-back.svg</file>
<file alias="audio-speaker-center-back-testing.svg">icons/audio-speaker-center-back-testing.svg</file> <file alias="audio-speaker-center-back-testing.svg">icons/audio-speaker-center-back-testing.svg</file>
<file alias="audio-speaker-center.svg">icons/audio-speaker-center.svg</file> <file alias="audio-speaker-center.svg">icons/audio-speaker-center.svg</file>

2
panels/user-accounts/user-accounts.gresource.xml
View file

@ -14,7 +14,7 @@
<file alias="cc-fingerprint-dialog.css">data/cc-fingerprint-dialog.css</file> <file alias="cc-fingerprint-dialog.css">data/cc-fingerprint-dialog.css</file>
</gresource> </gresource>
<gresource prefix="/org/gnome/ControlCenter/icons/scalable/status"> <gresource prefix="/org/gnome/Settings/icons/scalable/status">
<file preprocess="xml-stripblanks" alias="fingerprint-detection-complete-symbolic.svg">data/icons/fingerprint-detection-complete-symbolic.svg</file> <file preprocess="xml-stripblanks" alias="fingerprint-detection-complete-symbolic.svg">data/icons/fingerprint-detection-complete-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="fingerprint-detection-symbolic.svg">data/icons/fingerprint-detection-symbolic.svg</file> <file preprocess="xml-stripblanks" alias="fingerprint-detection-symbolic.svg">data/icons/fingerprint-detection-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="fingerprint-detection-warning-symbolic.svg">data/icons/fingerprint-detection-warning-symbolic.svg</file> <file preprocess="xml-stripblanks" alias="fingerprint-detection-warning-symbolic.svg">data/icons/fingerprint-detection-warning-symbolic.svg</file>

2
po/POTFILES.in
View file

@ -289,8 +289,8 @@ shell/cc-panel-list.ui
shell/cc-panel-loader.c shell/cc-panel-loader.c
shell/cc-window.c shell/cc-window.c
shell/cc-window.ui shell/cc-window.ui
shell/gnome-control-center.desktop.in.in
shell/help-overlay.ui shell/help-overlay.ui
shell/org.gnome.ControlCenter.gschema.xml 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. # 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 subprojects/gvc/gvc-mixer-control.c

2
search-provider/control-center-search-provider.c
View file

@ -135,7 +135,7 @@ cc_search_provider_app_get ()
return singleton; return singleton;
singleton = g_object_new (CC_TYPE_SEARCH_PROVIDER_APP, 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, "flags", G_APPLICATION_IS_SERVICE,
NULL); NULL);

5
search-provider/gnome-control-center-search-provider.ini
View file

@ -1,5 +0,0 @@
[Shell Search Provider]
DesktopId=gnome-control-center.desktop
BusName=org.gnome.ControlCenter.SearchProvider
ObjectPath=/org/gnome/ControlCenter/SearchProvider
Version=2

4
search-provider/meson.build
View file

@ -1,7 +1,7 @@
service_conf = configuration_data() service_conf = configuration_data()
service_conf.set('libexecdir', control_center_libexecdir) service_conf.set('libexecdir', control_center_libexecdir)
service = 'org.gnome.ControlCenter.SearchProvider.service' service = 'org.gnome.Settings.SearchProvider.service'
configure_file( configure_file(
input : service + '.in', input : service + '.in',
@ -12,7 +12,7 @@ configure_file(
) )
install_data( 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') install_dir: join_paths(control_center_datadir, 'gnome-shell', 'search-providers')
) )

3
search-provider/org.gnome.ControlCenter.SearchProvider.service.in
View file

@ -1,3 +0,0 @@
[D-BUS Service]
Name=org.gnome.ControlCenter.SearchProvider
Exec=@libexecdir@/gnome-control-center-search-provider

3
search-provider/org.gnome.Settings.SearchProvider.service.in Normal file
View file

@ -0,0 +1,3 @@
[D-BUS Service]
Name=org.gnome.Settings.SearchProvider
Exec=@libexecdir@/gnome-control-center-search-provider

5
search-provider/org.gnome.Settings.search-provider.ini Normal file
View file

@ -0,0 +1,5 @@
[Shell Search Provider]
DesktopId=org.gnome.Settings.desktop
BusName=org.gnome.Settings.SearchProvider
ObjectPath=/org/gnome/Settings/SearchProvider
Version=2

2
shell/appdata/meson.build
View file

@ -1,4 +1,4 @@
appdata = 'gnome-control-center.appdata.xml' appdata = 'org.gnome.Settings.appdata.xml'
i18n.merge_file( i18n.merge_file(
input: appdata + '.in', input: appdata + '.in',

2
shell/appdata/gnome-control-center.appdata.xml.in → shell/appdata/org.gnome.Settings.appdata.xml.in
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2015 Richard Hughes <richard@hughsie.com> --> <!-- Copyright 2015 Richard Hughes <richard@hughsie.com> -->
<component type="desktop"> <component type="desktop">
<id>gnome-control-center.desktop</id> <id>org.gnome.Settings.desktop</id>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+</project_license> <project_license>GPL-2.0+</project_license>
<name>Settings</name> <name>Settings</name>

4
shell/cc-application.c
View file

@ -232,7 +232,7 @@ cc_application_startup (GApplication *application)
self->window = cc_window_new (GTK_APPLICATION (application), self->model); self->window = cc_window_new (GTK_APPLICATION (application), self->model);
provider = gtk_css_provider_new (); 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_context_add_provider_for_display (gdk_display_get_default (),
GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER (provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
@ -292,7 +292,7 @@ GtkApplication *
cc_application_new (void) cc_application_new (void)
{ {
return g_object_new (CC_TYPE_APPLICATION, return g_object_new (CC_TYPE_APPLICATION,
"application-id", "org.gnome.ControlCenter", "application-id", "org.gnome.Settings",
"flags", G_APPLICATION_HANDLES_COMMAND_LINE, "flags", G_APPLICATION_HANDLES_COMMAND_LINE,
NULL); NULL);
} }

2
shell/cc-panel-list.c
View file

@ -770,7 +770,7 @@ cc_panel_list_class_init (CcPanelListClass *klass)
g_object_class_install_properties (object_class, N_PROPS, properties); 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_listbox);
gtk_widget_class_bind_template_child (widget_class, CcPanelList, privacy_row); gtk_widget_class_bind_template_child (widget_class, CcPanelList, privacy_row);

2
shell/cc-panel.c
View file

@ -270,7 +270,7 @@ cc_panel_class_init (CcPanelClass *klass)
g_object_class_install_properties (object_class, N_PROPS, properties); 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, content_bin);
gtk_widget_class_bind_template_child_private (widget_class, CcPanel, main_box); gtk_widget_class_bind_template_child_private (widget_class, CcPanel, main_box);

4
shell/cc-window.c
View file

@ -809,7 +809,7 @@ cc_window_class_init (CcWindowClass *klass)
FALSE, FALSE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); 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, development_warning_dialog);
gtk_widget_class_bind_template_child (widget_class, CcWindow, header); 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)); 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_panels = g_queue_new ();
self->previous_list_view = cc_panel_list_get_view (self->panel_list); self->previous_list_view = cc_panel_list_get_view (self->panel_list);

4
shell/gnome-control-center.gresource.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<gresources> <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.ui</file>
<file preprocess="xml-stripblanks">cc-panel-list.ui</file> <file preprocess="xml-stripblanks">cc-panel-list.ui</file>
<file preprocess="xml-stripblanks">cc-window.ui</file> <file preprocess="xml-stripblanks">cc-window.ui</file>
@ -9,7 +9,7 @@
</gresource> </gresource>
<!-- Panel icons --> <!-- Panel icons -->
<gresource prefix="/org/gnome/ControlCenter"> <gresource prefix="/org/gnome/Settings">
<file preprocess="xml-stripblanks">icons/multitasking-symbolic.svg</file> <file preprocess="xml-stripblanks">icons/multitasking-symbolic.svg</file>
<file>style.css</file> <file>style.css</file>
</gresource> </gresource>

6
shell/meson.build
View file

@ -4,7 +4,7 @@ subdir('completions')
service_conf = configuration_data() service_conf = configuration_data()
service_conf.set('bindir', control_center_bindir) service_conf.set('bindir', control_center_bindir)
service = 'org.gnome.ControlCenter.service' service = 'org.gnome.Settings.service'
configure_file( configure_file(
input : service + '.in', input : service + '.in',
@ -14,7 +14,7 @@ configure_file(
configuration : service_conf configuration : service_conf
) )
desktop = 'gnome-control-center.desktop' desktop = 'org.gnome.Settings.desktop'
desktop_in = configure_file( desktop_in = configure_file(
input : desktop + '.in.in', input : desktop + '.in.in',
@ -166,6 +166,6 @@ libtestshell_deps = common_deps + [ libwidgets_dep, libtestshell_dep ]
install_data ( install_data (
'org.gnome.ControlCenter.gschema.xml', 'org.gnome.Settings.gschema.xml',
install_dir : control_center_schemadir install_dir : control_center_schemadir
) )

0
shell/gnome-control-center.desktop.in.in → shell/org.gnome.Settings.desktop.in.in
View file

2
shell/org.gnome.ControlCenter.gschema.xml → shell/org.gnome.Settings.gschema.xml
View file

@ -1,5 +1,5 @@
<schemalist> <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"> <key name="last-panel" type="s">
<default>''</default> <default>''</default>
<summary>The identifier for the last Settings panel to be opened</summary> <summary>The identifier for the last Settings panel to be opened</summary>

2
shell/org.gnome.ControlCenter.service.in → shell/org.gnome.Settings.service.in
View file

@ -1,3 +1,3 @@
[D-BUS Service] [D-BUS Service]
Name=org.gnome.ControlCenter Name=org.gnome.Settings
Exec=@bindir@/gnome-control-center Exec=@bindir@/gnome-control-center