diff options
-rw-r--r-- | po/POTFILES.in | 4 | ||||
-rw-r--r-- | shell/cc-panel-list.c | 2 | ||||
-rw-r--r-- | shell/cc-panel-list.ui (renamed from shell/panel-list.ui) | 0 | ||||
-rw-r--r-- | shell/cc-window.c | 2 | ||||
-rw-r--r-- | shell/cc-window.ui (renamed from shell/window.ui) | 0 | ||||
-rw-r--r-- | shell/gnome-control-center.gresource.xml | 4 | ||||
-rw-r--r-- | shell/meson.build | 4 |
7 files changed, 8 insertions, 8 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index c52dff8d1..7a981585c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -229,11 +229,11 @@ panels/wacom/gsd-wacom-key-shortcut-button.c panels/wacom/wacom-stylus-page.ui shell/appdata/gnome-control-center.appdata.xml.in shell/cc-application.c +shell/cc-panel-list.ui 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/panel-list.ui -shell/window.ui # 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/shell/cc-panel-list.c b/shell/cc-panel-list.c index 2c0c70845..39a46b470 100644 --- a/shell/cc-panel-list.c +++ b/shell/cc-panel-list.c @@ -753,7 +753,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/panel-list.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/gtk/cc-panel-list.ui"); gtk_widget_class_bind_template_child (widget_class, CcPanelList, details_listbox); gtk_widget_class_bind_template_child (widget_class, CcPanelList, details_row); diff --git a/shell/panel-list.ui b/shell/cc-panel-list.ui index 10daec9fe..10daec9fe 100644 --- a/shell/panel-list.ui +++ b/shell/cc-panel-list.ui diff --git a/shell/cc-window.c b/shell/cc-window.c index 9fba02581..e83076dca 100644 --- a/shell/cc-window.c +++ b/shell/cc-window.c @@ -854,7 +854,7 @@ cc_window_class_init (CcWindowClass *klass) CC_TYPE_SHELL_MODEL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/gtk/window.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/ControlCenter/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); diff --git a/shell/window.ui b/shell/cc-window.ui index eca04a977..eca04a977 100644 --- a/shell/window.ui +++ b/shell/cc-window.ui diff --git a/shell/gnome-control-center.gresource.xml b/shell/gnome-control-center.gresource.xml index 24823939f..567dc783b 100644 --- a/shell/gnome-control-center.gresource.xml +++ b/shell/gnome-control-center.gresource.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <gresources> <gresource prefix="/org/gnome/ControlCenter/gtk"> + <file preprocess="xml-stripblanks">cc-panel-list.ui</file> + <file preprocess="xml-stripblanks">cc-window.ui</file> <file preprocess="xml-stripblanks">help-overlay.ui</file> - <file preprocess="xml-stripblanks">panel-list.ui</file> - <file preprocess="xml-stripblanks">window.ui</file> </gresource> </gresources> diff --git a/shell/meson.build b/shell/meson.build index 12622cfc1..0b2ebeca8 100644 --- a/shell/meson.build +++ b/shell/meson.build @@ -53,9 +53,9 @@ sources = files( ) resource_data = files( + 'cc-panel-list.ui', + 'cc-window.ui', 'help-overlay.ui', - 'panel-list.ui', - 'window.ui' ) sources += gnome.compile_resources( |