Updating branch refs/heads/master
to 5fd3aa42945969ffe4f2d9c2bedc5580a5b8d6f1 (commit)
from b5f1330226122a6e4a95305e6c0a43c3f687bdd9 (commit)
commit 5fd3aa42945969ffe4f2d9c2bedc5580a5b8d6f1
Author: Nick Schermer <n...@xfce.org>
Date: Sun Dec 23 22:35:12 2012 +0100
Move glade file in new location.
Makefile.am | 7 +------
po/POTFILES.in | 2 +-
terminal/Makefile.am | 4 +++-
terminal/terminal-preferences-dialog.c | 2 +-
.../terminal-preferences.glade | 0
5 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index eef5ee8..f4bb1bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,18 +33,13 @@ xml_in_files = $(xml_in_in_files:.xml.in.in=.xml.in)
xml_DATA = $(xml_in_files:.xml.in=.xml)
@INTLTOOL_XML_RULE@
-uidir = $(datadir)/xfce4-terminal
-ui_DATA = \
- xfce4-terminal.glade
-
EXTRA_DIST = \
HACKING \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
$(desktop_in_files) \
- $(xml_in_in_files) \
- $(ui_DATA)
+ $(xml_in_in_files)
DISTCLEANFILES = \
intltool-extract \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 97d7f7e..a34a2e6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,11 +14,11 @@ terminal/terminal-encoding-action.c
terminal/terminal-image-loader.c
terminal/terminal-options.c
terminal/terminal-preferences-dialog.c
+terminal/terminal-preferences.glade
terminal/terminal-preferences.c
terminal/terminal-screen.c
terminal/terminal-widget.c
terminal/terminal-window.c
xfce4-terminal.desktop.in
-xfce4-terminal.glade
xfce4-terminal-default-apps.xml.in.in
diff --git a/terminal/Makefile.am b/terminal/Makefile.am
index 894f262..1077e7f 100644
--- a/terminal/Makefile.am
+++ b/terminal/Makefile.am
@@ -67,7 +67,8 @@ xfce4_terminal_LDADD = \
$(LIBXFCE4UI_LIBS) \
$(TERMINAL_LIBS)
-
+uidir = $(datadir)/xfce4/terminal
+ui_DATA = terminal-preferences.glade
##
## Rules to auto-generate built sources
@@ -146,6 +147,7 @@ clean-local:
rm -f *.core core core.*
EXTRA_DIST =\
+ $(ui_DATA) \
terminal-config.h.in \
terminal-marshal.list \
terminal-window-ui.xml
diff --git a/terminal/terminal-preferences-dialog.c
b/terminal/terminal-preferences-dialog.c
index a6a5787..88d52e5 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -146,7 +146,7 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog
*dialog)
/* lookup the ui file */
xfce_resource_push_path (XFCE_RESOURCE_DATA, DATADIR);
- file = xfce_resource_lookup (XFCE_RESOURCE_DATA,
"xfce4-terminal/xfce4-terminal.glade");
+ file = xfce_resource_lookup (XFCE_RESOURCE_DATA,
"xfce4/terminal/terminal-preferences.glade");
xfce_resource_pop_path (XFCE_RESOURCE_DATA);
if (G_UNLIKELY (file == NULL))
diff --git a/xfce4-terminal.glade b/terminal/terminal-preferences.glade
similarity index 100%
rename from xfce4-terminal.glade
rename to terminal/terminal-preferences.glade
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
