[Xfce4-commits] <terminal:master> Revert the glade -> ui raname.

[Nick Schermer]

Updating branch refs/heads/master
         to 91b88ce416635e90562c420b88df8a7d8c065486 (commit)
       from 23e36bf0f047a704f1b8f51ed4f6322a655e5098 (commit)

commit 91b88ce416635e90562c420b88df8a7d8c065486
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Dec 7 11:44:53 2009 +0100

    Revert the glade -> ui raname.
    
    It turns out the translatable strings in the ui
    file are not picked up by update-po, while it
    works fine for .glade files.

 Makefile.am                            |    2 +-
 Terminal.ui => Terminal.glade          |    0
 po/POTFILES.in                         |    2 +-
 terminal/terminal-preferences-dialog.c |    2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6c39c59..5139706 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,7 +49,7 @@ man_MANS = Terminal.1
 uidir = $(datadir)/Terminal
 ui_DATA = \
 	Terminal-toolbars.ui \
-	Terminal.ui
+	Terminal.glade
 
 EXTRA_DIST = \
 	HACKING \
diff --git a/Terminal.ui b/Terminal.glade
similarity index 100%
rename from Terminal.ui
rename to Terminal.glade
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3d165be..12dcae6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -15,5 +15,5 @@ terminal/terminal-widget.c
 terminal/terminal-window.c
 
 Terminal.desktop.in
-Terminal.ui
+Terminal.glade
 Terminal-default-apps.xml.in
diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
index 2944e3d..2664dc7 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -112,7 +112,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, "Terminal/Terminal.ui");
+  file = xfce_resource_lookup (XFCE_RESOURCE_DATA, "Terminal/Terminal.glade");
   xfce_resource_pop_path (XFCE_RESOURCE_DATA);
 
   if (G_UNLIKELY (file == NULL))