summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Schwinn <alexxcons@xfce.org>2020-05-16 22:00:16 +0200
committerAlexander Schwinn <alexxcons@xfce.org>2020-05-17 23:49:36 +0200
commit49de3bf3be71cb2111d8848ccf8dd4702d96c026 (patch)
tree50508236b6d62d6a3781e9ee727aef2ff25fc23b
parent39d5bba236ec0a3fe225f0cac5dc2827a9dbf96c (diff)
downloadthunar-49de3bf3be71cb2111d8848ccf8dd4702d96c026.tar.gz
Remove unused *ui.xml files (Bug #16654)
-rw-r--r--thunar/Makefile.am34
-rw-r--r--thunar/thunar-abstract-icon-view-ui.xml43
-rw-r--r--thunar/thunar-abstract-icon-view.c1
-rw-r--r--thunar/thunar-details-view-ui.xml21
-rw-r--r--thunar/thunar-details-view.c1
-rw-r--r--thunar/thunar-launcher-ui.xml58
-rw-r--r--thunar/thunar-launcher.c1
-rw-r--r--thunar/thunar-renamer-dialog-ui.xml47
-rw-r--r--thunar/thunar-shortcuts-pane-ui.xml29
-rw-r--r--thunar/thunar-shortcuts-pane.c1
-rw-r--r--thunar/thunar-standard-view-ui.xml100
-rw-r--r--thunar/thunar-window-ui.xml136
-rw-r--r--thunar/thunar-window.c1
13 files changed, 0 insertions, 473 deletions
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index b64d62ac..c2c75f91 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -24,12 +24,6 @@ bin_PROGRAMS = \
thunar_built_sources = \
thunar-marshal.c \
thunar-marshal.h \
- thunar-abstract-icon-view-ui.h \
- thunar-details-view-ui.h \
- thunar-launcher-ui.h \
- thunar-shortcuts-pane-ui.h \
- thunar-renamer-dialog-ui.h \
- thunar-standard-view-ui.h \
thunar-dbus-freedesktop-interfaces.h \
thunar-dbus-freedesktop-interfaces.c \
thunar-dbus-service-infos.h \
@@ -38,7 +32,6 @@ thunar_built_sources = \
thunar-thumbnailer-proxy.h \
thunar-thumbnail-cache-proxy.h \
thunar-thumbnail-cache-proxy.c \
- thunar-window-ui.h \
thunar-resources.h \
thunar-resources.c
@@ -297,27 +290,6 @@ thunar-thumbnailer-proxy.h thunar-thumbnailer-proxy.c: $(srcdir)/thunar-thumbnai
thunar-thumbnail-cache-proxy.h thunar-thumbnail-cache-proxy.c: $(srcdir)/thunar-thumbnail-cache-dbus.xml Makefile
$(AM_V_GEN) gdbus-codegen --c-namespace Thunar --generate-c-code thunar-thumbnail-cache-proxy $(srcdir)/thunar-thumbnail-cache-dbus.xml
-thunar-abstract-icon-view-ui.h: Makefile $(srcdir)/thunar-abstract-icon-view-ui.xml
- $(AM_V_GEN) xdt-csource --strip-comments --strip-content --static --name=thunar_abstract_icon_view_ui $(srcdir)/thunar-abstract-icon-view-ui.xml > thunar-abstract-icon-view-ui.h
-
-thunar-details-view-ui.h: Makefile $(srcdir)/thunar-details-view-ui.xml
- $(AM_V_GEN) xdt-csource --strip-comments --strip-content --static --name=thunar_details_view_ui $(srcdir)/thunar-details-view-ui.xml > thunar-details-view-ui.h
-
-thunar-launcher-ui.h: Makefile $(srcdir)/thunar-launcher-ui.xml
- $(AM_V_GEN) xdt-csource --strip-comments --strip-content --static --name=thunar_launcher_ui $(srcdir)/thunar-launcher-ui.xml > thunar-launcher-ui.h
-
-thunar-shortcuts-pane-ui.h: Makefile $(srcdir)/thunar-shortcuts-pane-ui.xml
- $(AM_V_GEN) xdt-csource --strip-comments --strip-content --static --name=thunar_shortcuts_pane_ui $(srcdir)/thunar-shortcuts-pane-ui.xml > thunar-shortcuts-pane-ui.h
-
-thunar-renamer-dialog-ui.h: Makefile $(srcdir)/thunar-renamer-dialog-ui.xml
- $(AM_V_GEN) xdt-csource --strip-comments --strip-content --static --name=thunar_renamer_dialog_ui $(srcdir)/thunar-renamer-dialog-ui.xml > thunar-renamer-dialog-ui.h
-
-thunar-standard-view-ui.h: Makefile $(srcdir)/thunar-standard-view-ui.xml
- $(AM_V_GEN) xdt-csource --strip-comments --strip-content --static --name=thunar_standard_view_ui $(srcdir)/thunar-standard-view-ui.xml > thunar-standard-view-ui.h
-
-thunar-window-ui.h: Makefile $(srcdir)/thunar-window-ui.xml
- $(AM_V_GEN) xdt-csource --strip-comments --strip-content --static --name=thunar_window_ui $(srcdir)/thunar-window-ui.xml > thunar-window-ui.h
-
thunar-marshal.h: stamp-thunar-marshal.h
@true
@@ -354,16 +326,10 @@ thunar-resources.h: thunar.gresource.xml
endif
EXTRA_DIST = \
- thunar-abstract-icon-view-ui.xml \
thunar-dbus-freedesktop-interfaces.xml \
thunar-dbus-service-infos.xml \
- thunar-details-view-ui.xml \
- thunar-launcher-ui.xml \
thunar-marshal.list \
- thunar-renamer-dialog-ui.xml \
- thunar-standard-view-ui.xml \
thunar-thumbnail-frame.png \
- thunar-window-ui.xml \
thunar-settings \
thunar.gresource.xml \
$(desktop_in_files)
diff --git a/thunar/thunar-abstract-icon-view-ui.xml b/thunar/thunar-abstract-icon-view-ui.xml
deleted file mode 100644
index c75a282a..00000000
--- a/thunar/thunar-abstract-icon-view-ui.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<ui>
-
- <!--
- Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
-
- Thunar icon view user interface description file. Do NOT
- simply edit this file if you don't know how the whole system
- works, because it's too easy to break something.
- -->
-
- <menubar name="main-menu">
- <menu action="view-menu">
- <placeholder name="placeholder-view-items-actions">
- <menu action="arrange-items-menu">
- <menuitem action="sort-by-name" />
- <menuitem action="sort-by-size" />
- <menuitem action="sort-by-type" />
- <menuitem action="sort-by-mtime" />
- <separator />
- <menuitem action="sort-ascending" />
- <menuitem action="sort-descending" />
- </menu>
- </placeholder>
- </menu>
- </menubar>
-
- <popup action="folder-context-menu">
- <placeholder name="placeholder-view-items-actions">
- <menu action="arrange-items-menu">
- <menuitem action="sort-by-name" />
- <menuitem action="sort-by-size" />
- <menuitem action="sort-by-type" />
- <menuitem action="sort-by-mtime" />
- <separator />
- <menuitem action="sort-ascending" />
- <menuitem action="sort-descending" />
- </menu>
- </placeholder>
- </popup>
-
-</ui>
-
-<!-- vi: set ts=2 sw=2 et ai nocindent syntax=xml: -->
diff --git a/thunar/thunar-abstract-icon-view.c b/thunar/thunar-abstract-icon-view.c
index 4ed1c939..50be2728 100644
--- a/thunar/thunar-abstract-icon-view.c
+++ b/thunar/thunar-abstract-icon-view.c
@@ -24,7 +24,6 @@
#include <gdk/gdkkeysyms.h>
#include <thunar/thunar-abstract-icon-view.h>
-#include <thunar/thunar-abstract-icon-view-ui.h>
#include <thunar/thunar-gobject-extensions.h>
#include <thunar/thunar-gtk-extensions.h>
#include <thunar/thunar-launcher.h>
diff --git a/thunar/thunar-details-view-ui.xml b/thunar/thunar-details-view-ui.xml
deleted file mode 100644
index 990a9874..00000000
--- a/thunar/thunar-details-view-ui.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<ui>
-
- <!--
- Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
-
- Thunar details view user interface description file. Do NOT
- simply edit this file if you don't know how the whole system
- works, because it's too easy to break something.
- -->
-
- <menubar name="main-menu">
- <menu action="view-menu">
- <placeholder name="placeholder-view-items-actions">
- <menuitem action="setup-columns" />
- </placeholder>
- </menu>
- </menubar>
-
-</ui>
-
-<!-- vi: set ts=2 sw=2 et ai nocindent syntax=xml: -->
diff --git a/thunar/thunar-details-view.c b/thunar/thunar-details-view.c
index a3528a85..bfd403ff 100644
--- a/thunar/thunar-details-view.c
+++ b/thunar/thunar-details-view.c
@@ -25,7 +25,6 @@
#include <thunar/thunar-column-editor.h>
#include <thunar/thunar-details-view.h>
-#include <thunar/thunar-details-view-ui.h>
#include <thunar/thunar-launcher.h>
#include <thunar/thunar-gtk-extensions.h>
#include <thunar/thunar-private.h>
diff --git a/thunar/thunar-launcher-ui.xml b/thunar/thunar-launcher-ui.xml
deleted file mode 100644
index 4b168777..00000000
--- a/thunar/thunar-launcher-ui.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<ui>
-
- <!--
- Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
-
- Thunar launcher user interface description file. Do NOT
- simply edit this file if you don't know how the whole system
- works, because it's too easy to break something.
- -->
-
- <menubar name="main-menu">
- <menu action="file-menu">
- <placeholder name="placeholder-launcher">
- <menuitem action="open" />
- <menuitem action="open-in-new-tab" />
- <menuitem action="open-in-new-window" />
- <placeholder name="placeholder-applications" />
- <menuitem action="open-with-other" />
- <menu action="open-with-menu">
- <placeholder name="placeholder-applications" />
- <separator />
- <menuitem action="open-with-other-in-menu" />
- </menu>
- <placeholder name="placeholder-actions" />
- </placeholder>
-
- <menu action="sendto-menu">
- <placeholder name="placeholder-sendto-actions">
- <menuitem action="sendto-desktop" />
- <separator />
- </placeholder>
- </menu>
- </menu>
- </menubar>
-
- <popup action="file-context-menu">
- <placeholder name="placeholder-launcher">
- <menuitem action="open" />
- <menuitem action="open-in-new-tab" />
- <menuitem action="open-in-new-window" />
- <placeholder name="placeholder-applications" />
- <menuitem action="open-with-other" />
- <menu action="open-with-menu">
- <placeholder name="placeholder-applications" />
- <separator />
- <menuitem action="open-with-other-in-menu" />
- </menu>
- <placeholder name="placeholder-actions" />
- </placeholder>
-
- <menu action="sendto-menu">
- <placeholder name="placeholder-sendto-actions">
- <menuitem action="sendto-desktop" />
- <separator />
- </placeholder>
- </menu>
- </popup>
-</ui>
diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c
index f9cb9183..ffee7e59 100644
--- a/thunar/thunar-launcher.c
+++ b/thunar/thunar-launcher.c
@@ -43,7 +43,6 @@
#include <thunar/thunar-icon-factory.h>
#include <thunar/thunar-io-scan-directory.h>
#include <thunar/thunar-launcher.h>
-#include <thunar/thunar-launcher-ui.h>
#include <thunar/thunar-preferences.h>
#include <thunar/thunar-private.h>
#include <thunar/thunar-properties-dialog.h>
diff --git a/thunar/thunar-renamer-dialog-ui.xml b/thunar/thunar-renamer-dialog-ui.xml
deleted file mode 100644
index 8ecc8701..00000000
--- a/thunar/thunar-renamer-dialog-ui.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<ui>
-
- <!--
- Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
-
- Thunar bulk rename user interface description file. Do NOT
- simply edit this file if you don't know how the whole system
- works, because it's too easy to break something.
- -->
-
- <toolbar name="toolbar">
- <toolitem action="add-files" />
- <toolitem action="remove-files" />
- <separator />
- <toolitem action="clear" />
- <separator expand="true" />
- <toolitem action="about" />
- </toolbar>
-
- <menubar name="main-menu">
- <menu action="file-menu">
- <placeholder name="placeholder-launcher" />
- <separator />
- <menu action="sendto-menu">
- <placeholder name="placeholder-sendto-actions" />
- </menu>
- </menu>
- </menubar>
-
- <popup action="file-context-menu">
- <placeholder name="placeholder-launcher" />
- <separator />
- <menu action="sendto-menu">
- <placeholder name="placeholder-sendto-actions" />
- </menu>
- <separator />
- <placeholder name="placeholder-renamer-actions" />
- <separator />
- <menuitem action="add-files" />
- <menuitem action="remove-files" />
- <separator />
- <menuitem action="properties" />
- </popup>
-
-</ui>
-
-<!-- vi: set ts=2 sw=2 et ai nocindent syntax=xml: -->
diff --git a/thunar/thunar-shortcuts-pane-ui.xml b/thunar/thunar-shortcuts-pane-ui.xml
deleted file mode 100644
index 58f928d7..00000000
--- a/thunar/thunar-shortcuts-pane-ui.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<ui>
-
- <!--
- Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
-
- Thunar shortcuts pane user interface description file. Do NOT
- simply edit this file if you don't know how the whole system
- works, because it's too easy to break something.
- -->
-
- <menubar name="main-menu">
- <menu action="file-menu">
- <menu action="sendto-menu">
- <placeholder name="placeholder-sendto-sidepane">
- <menuitem action="sendto-shortcuts" />
- </placeholder>
- </menu>
- </menu>
- </menubar>
-
- <popup action="file-context-menu">
- <menu action="sendto-menu">
- <placeholder name="placeholder-sendto-sidepane">
- <menuitem action="sendto-shortcuts" />
- </placeholder>
- </menu>
- </popup>
-
-</ui>
diff --git a/thunar/thunar-shortcuts-pane.c b/thunar/thunar-shortcuts-pane.c
index af22391d..7e4f8fb1 100644
--- a/thunar/thunar-shortcuts-pane.c
+++ b/thunar/thunar-shortcuts-pane.c
@@ -25,7 +25,6 @@
#include <thunar/thunar-private.h>
#include <thunar/thunar-shortcuts-model.h>
#include <thunar/thunar-shortcuts-pane.h>
-#include <thunar/thunar-shortcuts-pane-ui.h>
#include <thunar/thunar-shortcuts-view.h>
#include <thunar/thunar-side-pane.h>
diff --git a/thunar/thunar-standard-view-ui.xml b/thunar/thunar-standard-view-ui.xml
deleted file mode 100644
index 6972427f..00000000
--- a/thunar/thunar-standard-view-ui.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<ui>
-
- <!--
- Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
-
- Thunar standard view user interface description file. Do NOT
- simply edit this file if you don't know how the whole system
- works, because it's too easy to break something.
- -->
-
- <accelerator action="zoom-in-alt"/>
- <accelerator action="open-location-alt"/>
-
- <menubar name="main-menu">
- <menu action="file-menu">
- <placeholder name="placeholder-create-actions">
- <menuitem action="create-folder" />
- <menuitem action="create-document" />
- </placeholder>
- <placeholder name="placeholder-file-properties">
- <menuitem action="properties" />
- </placeholder>
- </menu>
-
- <menu action="edit-menu">
- <placeholder name="placeholder-edit-clipboard-actions">
- <menuitem action="cut" />
- <menuitem action="copy" />
- <menuitem action="paste" />
- <separator />
- <menuitem action="move-to-trash" />
- <menuitem action="delete" />
- </placeholder>
- <placeholder name="placeholder-edit-select-actions">
- <menuitem action="select-all-files" />
- <menuitem action="select-by-pattern" />
- <menuitem action="invert-selection" />
- </placeholder>
- <placeholder name="placeholder-edit-alter-actions">
- <menuitem action="duplicate" />
- <menuitem action="make-link" />
- <menuitem action="rename" />
- <menuitem action="restore" />
- </placeholder>
- </menu>
-
- <menu action="go-menu">
- <placeholder name="placeholder-go-history-actions">
- <menuitem action="back" />
- <menuitem action="forward" />
- </placeholder>
- </menu>
- </menubar>
-
- <popup action="file-context-menu">
- <placeholder name="placeholder-clipboard-actions">
- <menuitem action="cut" />
- <menuitem action="copy" />
- <menuitem action="paste-into-folder" />
- <separator />
- <menuitem action="move-to-trash" />
- <menuitem action="delete" />
- </placeholder>
- <placeholder name="placeholder-edit-actions">
- <menuitem action="rename" />
- <menuitem action="restore" />
- </placeholder>
- <placeholder name="placeholder-file-actions">
- <menuitem action="properties" />
- </placeholder>
- </popup>
-
- <popup action="folder-context-menu">
- <menuitem action="create-folder" />
- <menuitem action="create-document" />
- <menuitem action="empty-trash" />
- <separator />
- <menuitem action="paste" />
- <separator />
- <placeholder name="placeholder-custom-actions" />
- <separator />
- <placeholder name="placeholder-view-items-actions" />
- <separator />
- <menuitem action="zoom-in" />
- <menuitem action="zoom-out" />
- <menuitem action="zoom-reset" />
- <separator />
- <menuitem action="properties" />
- </popup>
-
- <toolbar name="location-toolbar">
- <placeholder name="placeholder-history-actions">
- <toolitem action="back" />
- <toolitem action="forward" />
- </placeholder>
- </toolbar>
-
-</ui>
-
-<!-- vi: set ts=2 sw=2 et ai nocindent syntax=xml: -->
diff --git a/thunar/thunar-window-ui.xml b/thunar/thunar-window-ui.xml
deleted file mode 100644
index 457b82b2..00000000
--- a/thunar/thunar-window-ui.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<ui>
-
- <!--
- Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
-
- Thunar main window user interface description file. Do NOT
- simply edit this file if you don't know how the whole system
- works, because it's too easy to break something.
- -->
-
- <menubar name="main-menu">
- <menu action="file-menu">
- <menuitem action="new-tab" />
- <menuitem action="new-window" />
- <separator />
- <placeholder name="placeholder-create-actions" />
- <separator />
- <placeholder name="placeholder-launcher" />
- <separator />
- <menu action="sendto-menu">
- <placeholder name="placeholder-sendto-sidepane" />
- <placeholder name="placeholder-sendto-actions" />
- </menu>
- <separator />
- <placeholder name="placeholder-custom-actions" />
- <separator />
- <placeholder name="placeholder-file-properties" />
- <separator />
- <menuitem action="empty-trash" />
- <separator />
- <menuitem action="detach-tab" />
- <separator />
- <menuitem action="close-all-windows" />
- <menuitem action="close-tab" />
- <menuitem action="close-window" />
- </menu>
-
- <menu action="edit-menu">
- <placeholder name="placeholder-edit-clipboard-actions" />
- <separator />
- <placeholder name="placeholder-edit-select-actions" />
- <separator />
- <placeholder name="placeholder-edit-alter-actions" />
- <separator />
- <placeholder name="placeholder-custom-preferences" />
- <menuitem action="preferences" />
- </menu>
-
- <menu action="view-menu">
- <menuitem action="reload" />
- <separator />
- <menu action="view-location-selector-menu">
- <menuitem action="view-location-selector-pathbar" />
- <menuitem action="view-location-selector-toolbar" />
- </menu>
- <menu action="view-side-pane-menu">
- <menuitem action="view-side-pane-shortcuts" />
- <menuitem action="view-side-pane-tree" />
- </menu>
- <menuitem action="view-statusbar" />
- <menuitem action="view-menubar" />
- <separator />
- <menuitem action="show-hidden" />
- <separator />
- <placeholder name="placeholder-view-items-actions" />
- <separator />
- <menuitem action="zoom-in" />
- <menuitem action="zoom-out" />
- <menuitem action="zoom-reset" />
- <separator />
- <menuitem action="view-as-icons" />
- <menuitem action="view-as-detailed-list" />
- <menuitem action="view-as-compact-list" />
- </menu>
-
- <menu action="go-menu">
- <menuitem action="open-parent" />
- <placeholder name="placeholder-go-history-actions" />
- <separator />
-
- <menuitem action="open-home" />
- <menuitem action="open-desktop" />
- <menuitem action="open-computer" />
- <placeholder name="placeholder-go-items-actions" />
- <menuitem action="open-file-system" />
- <menuitem action="open-templates" />
- <separator />
- <placeholder name="placeholder-go-local-actions" />
- <separator />
- <menuitem action="open-network" />
- <placeholder name="placeholder-go-remote-actions" />
- <separator />
- <menuitem action="open-location" />
- </menu>
-
- <menu action="help-menu">
- <menuitem action="contents" />
- <menuitem action="about" />
- </menu>
- </menubar>
-
- <popup action="file-context-menu">
- <placeholder name="placeholder-launcher" />
- <separator />
- <menu action="sendto-menu">
- <placeholder name="placeholder-sendto-sidepane" />
- <placeholder name="placeholder-sendto-actions" />
- </menu>
- <separator />
- <placeholder name="placeholder-clipboard-actions" />
- <separator />
- <placeholder name="placeholder-edit-actions" />
- <separator />
- <placeholder name="placeholder-custom-actions" />
- <separator />
- <placeholder name="placeholder-file-actions" />
- </popup>
-
- <popup action="tab-context-menu">
- <menuitem action="new-tab" />
- <separator />
- <menuitem action="detach-tab" />
- <menuitem action="switch-next-tab" />
- <menuitem action="switch-previous-tab" />
- <separator />
- <menuitem action="close-tab" />
- </popup>
-
- <toolbar name="location-toolbar">
- <placeholder name="placeholder-history-actions" />
- <toolitem action="open-parent" />
- <toolitem action="open-home" />
- </toolbar>
-</ui>
-
-<!-- vi: set ts=2 sw=2 et ai nocindent syntax=xml: -->
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 3468475c..61e11248 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -57,7 +57,6 @@
#include <thunar/thunar-statusbar.h>
#include <thunar/thunar-tree-pane.h>
#include <thunar/thunar-window.h>
-#include <thunar/thunar-window-ui.h>
#include <thunar/thunar-device-monitor.h>
#include <glib.h>