diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2015-11-12 22:49:02 +0100 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2015-11-12 22:49:02 +0100 |
| commit | 0bba55177226bfdb3125e1b6f0e7db51ef588c92 (patch) | |
| tree | c32453cf13aaa84ade1e508a4f64663af2ebc935 | |
| parent | 1688168dc7d8640a15d760f2e2a0e7d95e69756f (diff) | |
| download | nautilus-0bba55177226bfdb3125e1b6f0e7db51ef588c92.tar.gz | |
resources: rename toolbar without the *-ui
| -rw-r--r-- | po/POTFILES.in | 2 | ||||
| -rw-r--r-- | src/nautilus-toolbar.c | 2 | ||||
| -rw-r--r-- | src/resources/nautilus.gresource.xml | 2 | ||||
| -rw-r--r-- | src/resources/ui/nautilus-toolbar.ui (renamed from src/resources/ui/nautilus-toolbar-ui.ui) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index 111aaf7d6..e5906e897 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -87,7 +87,7 @@ src/nautilus-x-content-bar.c [type: gettext/glade]src/resources/ui/nautilus-remote-warning-bar.ui [type: gettext/glade]src/resources/ui/nautilus-rename-file-popover.ui [type: gettext/glade]src/resources/ui/nautilus-toolbar-action-menu.ui -[type: gettext/glade]src/resources/ui/nautilus-toolbar-ui.ui +[type: gettext/glade]src/resources/ui/nautilus-toolbar.ui [type: gettext/glade]src/resources/ui/nautilus-toolbar-view-menu.ui [type: gettext/glade]src/resources/ui/nautilus-window.ui src/gtk/gtkplacesview.c diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c index a57ade648..003268b67 100644 --- a/src/nautilus-toolbar.c +++ b/src/nautilus-toolbar.c @@ -858,7 +858,7 @@ nautilus_toolbar_class_init (NautilusToolbarClass *klass) g_object_class_install_properties (oclass, NUM_PROPERTIES, properties); gtk_widget_class_set_template_from_resource (widget_class, - "/org/gnome/nautilus/ui/nautilus-toolbar-ui.ui"); + "/org/gnome/nautilus/ui/nautilus-toolbar.ui"); gtk_widget_class_bind_template_child_private (widget_class, NautilusToolbar, operations_button); gtk_widget_class_bind_template_child_private (widget_class, NautilusToolbar, operations_icon); diff --git a/src/resources/nautilus.gresource.xml b/src/resources/nautilus.gresource.xml index a88b1032c..057062562 100644 --- a/src/resources/nautilus.gresource.xml +++ b/src/resources/nautilus.gresource.xml @@ -5,7 +5,7 @@ <file compressed="true">ui/nautilus-file-management-properties.ui</file> <file>ui/nautilus-app-menu.ui</file> <file>ui/nautilus-pathbar-context-menu.ui</file> - <file>ui/nautilus-toolbar-ui.ui</file> + <file>ui/nautilus-toolbar.ui</file> <file>ui/nautilus-toolbar-view-menu.ui</file> <file>ui/nautilus-toolbar-action-menu.ui</file> <file>ui/nautilus-create-folder-dialog.ui</file> diff --git a/src/resources/ui/nautilus-toolbar-ui.ui b/src/resources/ui/nautilus-toolbar.ui index 8e47f0815..8e47f0815 100644 --- a/src/resources/ui/nautilus-toolbar-ui.ui +++ b/src/resources/ui/nautilus-toolbar.ui |