Updating branch refs/heads/master to 7660de9211c7b959b03750763d9eff508eb28e43 (commit) from fa997ee108b2c52fd1229edc3c050928e580ed3e (commit)
commit 7660de9211c7b959b03750763d9eff508eb28e43 Author: Nick Schermer <n...@xfce.org> Date: Fri Dec 18 17:09:05 2009 +0100 Rename to .ui files back .glade. The .ui files are not added to the translations (intltool doesn't pick them up). dialogs/accessibility-settings/Makefile.am | 4 ++-- ...bility-dialog.ui => accessibility-dialog.glade} | 0 dialogs/appearance-settings/Makefile.am | 4 ++-- ...ppearance-dialog.ui => appearance-dialog.glade} | 0 dialogs/display-settings/Makefile.am | 4 ++-- .../{display-dialog.ui => display-dialog.glade} | 0 dialogs/keyboard-settings/Makefile.am | 4 ++-- .../{keyboard-dialog.ui => keyboard-dialog.glade} | 0 dialogs/mouse-settings/Makefile.am | 4 ++-- .../{mouse-dialog.ui => mouse-dialog.glade} | 0 po/POTFILES.in | 12 ++++++------ xfce4-settings-editor/Makefile.am | 4 ++-- ...tings-editor.ui => xfce4-settings-editor.glade} | 0 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dialogs/accessibility-settings/Makefile.am b/dialogs/accessibility-settings/Makefile.am index e219caf..bf16b70 100644 --- a/dialogs/accessibility-settings/Makefile.am +++ b/dialogs/accessibility-settings/Makefile.am @@ -35,7 +35,7 @@ if MAINTAINER_MODE BUILT_SOURCES = \ accessibility-dialog_ui.h -accessibility-dialog_ui.h: accessibility-dialog.ui +accessibility-dialog_ui.h: accessibility-dialog.glade exo-csource --static --strip-comments --strip-content --name=accessibility_dialog_ui $< >$@ endif @@ -48,7 +48,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) EXTRA_DIST = \ $(desktop_in_files) \ - accessibility-dialog.ui + accessibility-dialog.glade DISTCLEANFILES = \ $(desktop_DATA) diff --git a/dialogs/accessibility-settings/accessibility-dialog.ui b/dialogs/accessibility-settings/accessibility-dialog.glade similarity index 100% rename from dialogs/accessibility-settings/accessibility-dialog.ui rename to dialogs/accessibility-settings/accessibility-dialog.glade diff --git a/dialogs/appearance-settings/Makefile.am b/dialogs/appearance-settings/Makefile.am index 129ec78..66a946a 100644 --- a/dialogs/appearance-settings/Makefile.am +++ b/dialogs/appearance-settings/Makefile.am @@ -36,7 +36,7 @@ if MAINTAINER_MODE BUILT_SOURCES = \ appearance-dialog_ui.h -appearance-dialog_ui.h: appearance-dialog.ui +appearance-dialog_ui.h: appearance-dialog.glade exo-csource --static --strip-comments --strip-content --name=appearance_dialog_ui $< >$@ endif @@ -49,7 +49,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) EXTRA_DIST = \ $(desktop_in_files) \ - appearance-dialog.ui + appearance-dialog.glade DISTCLEANFILES = \ $(desktop_DATA) diff --git a/dialogs/appearance-settings/appearance-dialog.ui b/dialogs/appearance-settings/appearance-dialog.glade similarity index 100% rename from dialogs/appearance-settings/appearance-dialog.ui rename to dialogs/appearance-settings/appearance-dialog.glade diff --git a/dialogs/display-settings/Makefile.am b/dialogs/display-settings/Makefile.am index 8b04f78..2d5f801 100644 --- a/dialogs/display-settings/Makefile.am +++ b/dialogs/display-settings/Makefile.am @@ -41,7 +41,7 @@ if MAINTAINER_MODE BUILT_SOURCES = \ display-dialog_ui.h -display-dialog_ui.h: display-dialog.ui +display-dialog_ui.h: display-dialog.glade exo-csource --static --strip-comments --strip-content --name=display_dialog_ui $< >$@ endif @@ -54,7 +54,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) EXTRA_DIST = \ $(desktop_in_files) \ - display-dialog.ui + display-dialog.glade DISTCLEANFILES = \ $(desktop_DATA) diff --git a/dialogs/display-settings/display-dialog.ui b/dialogs/display-settings/display-dialog.glade similarity index 100% rename from dialogs/display-settings/display-dialog.ui rename to dialogs/display-settings/display-dialog.glade diff --git a/dialogs/keyboard-settings/Makefile.am b/dialogs/keyboard-settings/Makefile.am index f72e7f5..3cc0a5d 100644 --- a/dialogs/keyboard-settings/Makefile.am +++ b/dialogs/keyboard-settings/Makefile.am @@ -50,7 +50,7 @@ if MAINTAINER_MODE BUILT_SOURCES = \ keyboard-dialog_ui.h -keyboard-dialog_ui.h: keyboard-dialog.ui +keyboard-dialog_ui.h: keyboard-dialog.glade exo-csource --static --strip-comments --strip-content --name=keyboard_dialog_ui $< >$@ endif @@ -63,7 +63,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) EXTRA_DIST = \ $(desktop_in_files) \ - keyboard-dialog.ui + keyboard-dialog.glade DISTCLEANFILES = \ $(desktop_DATA) diff --git a/dialogs/keyboard-settings/keyboard-dialog.ui b/dialogs/keyboard-settings/keyboard-dialog.glade similarity index 100% rename from dialogs/keyboard-settings/keyboard-dialog.ui rename to dialogs/keyboard-settings/keyboard-dialog.glade diff --git a/dialogs/mouse-settings/Makefile.am b/dialogs/mouse-settings/Makefile.am index a8f4455..070db71 100644 --- a/dialogs/mouse-settings/Makefile.am +++ b/dialogs/mouse-settings/Makefile.am @@ -48,7 +48,7 @@ if MAINTAINER_MODE BUILT_SOURCES = \ mouse-dialog_ui.h -mouse-dialog_ui.h: mouse-dialog.ui +mouse-dialog_ui.h: mouse-dialog.glade exo-csource --static --strip-comments --strip-content --name=mouse_dialog_ui $< >$@ endif @@ -61,7 +61,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) EXTRA_DIST = \ $(desktop_in_files) \ - mouse-dialog.ui + mouse-dialog.glade DISTCLEANFILES = \ $(desktop_DATA) diff --git a/dialogs/mouse-settings/mouse-dialog.ui b/dialogs/mouse-settings/mouse-dialog.glade similarity index 100% rename from dialogs/mouse-settings/mouse-dialog.ui rename to dialogs/mouse-settings/mouse-dialog.glade diff --git a/po/POTFILES.in b/po/POTFILES.in index 6952a8a..c695ee7 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,31 +1,31 @@ -dialogs/accessibility-settings/accessibility-dialog.ui +dialogs/accessibility-settings/accessibility-dialog.glade dialogs/accessibility-settings/main.c dialogs/accessibility-settings/xfce4-accessibility-settings.desktop.in -dialogs/appearance-settings/appearance-dialog.ui +dialogs/appearance-settings/appearance-dialog.glade dialogs/appearance-settings/main.c dialogs/appearance-settings/xfce-ui-settings.desktop.in -dialogs/display-settings/display-dialog.ui +dialogs/display-settings/display-dialog.glade dialogs/display-settings/main.c dialogs/display-settings/xfce-randr.c dialogs/display-settings/xfce-randr-legacy.c dialogs/display-settings/xfce-display-settings.desktop.in dialogs/keyboard-settings/command-dialog.c -dialogs/keyboard-settings/keyboard-dialog.ui +dialogs/keyboard-settings/keyboard-dialog.glade dialogs/keyboard-settings/main.c dialogs/keyboard-settings/xfce-keyboard-settings.c dialogs/keyboard-settings/xfce-keyboard-settings.desktop.in dialogs/mouse-settings/main.c -dialogs/mouse-settings/mouse-dialog.ui +dialogs/mouse-settings/mouse-dialog.glade dialogs/mouse-settings/xfce-mouse-settings.desktop.in xfce4-settings-editor/main.c xfce4-settings-editor/main_window.c xfce4-settings-editor/xfce4-settings-editor.desktop.in -xfce4-settings-editor/xfce4-settings-editor.ui +xfce4-settings-editor/xfce4-settings-editor.glade xfce4-settings-helper/accessibility.c xfce4-settings-helper/keyboard-layout.c diff --git a/xfce4-settings-editor/Makefile.am b/xfce4-settings-editor/Makefile.am index 1c175ec..c6c9a2d 100644 --- a/xfce4-settings-editor/Makefile.am +++ b/xfce4-settings-editor/Makefile.am @@ -43,7 +43,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) EXTRA_DIST = \ $(desktop_in_files) \ - xfce4-settings-editor.ui + xfce4-settings-editor.glade DISTCLEANFILES = \ $(desktop_DATA) @@ -53,7 +53,7 @@ if MAINTAINER_MODE BUILT_SOURCES = \ xfce4-settings-editor_ui.h -xfce4-settings-editor_ui.h: xfce4-settings-editor.ui +xfce4-settings-editor_ui.h: xfce4-settings-editor.glade exo-csource --static --strip-comments --strip-content --name=xfce4_settings_editor_ui $< >$@ endif diff --git a/xfce4-settings-editor/xfce4-settings-editor.ui b/xfce4-settings-editor/xfce4-settings-editor.glade similarity index 100% rename from xfce4-settings-editor/xfce4-settings-editor.ui rename to xfce4-settings-editor/xfce4-settings-editor.glade _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits