Updating branch refs/heads/master
to 4a220b26cbf35604c5b64f2820d457b76e45edf2 (commit)
from 3424775cac176caed5a1eee7caa64f50915abdd6 (commit)
commit 4a220b26cbf35604c5b64f2820d457b76e45edf2
Author: Sean Davis <smd.seanda...@gmail.com>
Date: Tue Aug 20 07:11:42 2013 -0400
Rename GTK3 ui files to remove -3.ui
data/interfaces/Makefile.am | 23 ++++++--------------
.../{mediachooser-3.ui => mediachooser.ui} | 0
.../{open-location-3.ui => open-location.ui} | 0
.../{parole-settings-3.ui => parole-settings.ui} | 0
data/interfaces/{parole-3.ui => parole.ui} | 0
data/interfaces/{playlist-3.ui => playlist.ui} | 0
data/interfaces/{plugins-3.ui => plugins.ui} | 0
.../{save-playlist-3.ui => save-playlist.ui} | 0
8 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/data/interfaces/Makefile.am b/data/interfaces/Makefile.am
index 55badea..6292efc 100644
--- a/data/interfaces/Makefile.am
+++ b/data/interfaces/Makefile.am
@@ -10,37 +10,28 @@ interfaces = \
interfaces_h = \
$(interfaces:.ui=_ui.h)
-interfaces = \
- parole-3.ui \
- parole-settings-3.ui \
- playlist-3.ui \
- mediachooser-3.ui \
- save-playlist-3.ui \
- plugins-3.ui \
- open-location-3.ui
-
if MAINTAINER_MODE
BUILT_SOURCES = $(interfaces_h)
-parole_ui.h: parole-3.ui
+parole_ui.h: parole.ui
xdt-csource --static --strip-comments --strip-content --name=parole_ui
$< > $@
-parole-settings_ui.h: parole-settings-3.ui
+parole-settings_ui.h: parole-settings.ui
xdt-csource --static --strip-comments --strip-content
--name=parole_settings_ui $< > $@
-playlist_ui.h: playlist-3.ui
+playlist_ui.h: playlist.ui
xdt-csource --static --strip-comments --strip-content
--name=playlist_ui $< > $@
-mediachooser_ui.h: mediachooser-3.ui
+mediachooser_ui.h: mediachooser.ui
xdt-csource --static --strip-comments --strip-content
--name=mediachooser_ui $< > $@
-save-playlist_ui.h: save-playlist-3.ui
+save-playlist_ui.h: save-playlist.ui
xdt-csource --static --strip-comments --strip-content
--name=save_playlist_ui $< > $@
-open-location_ui.h: open-location-3.ui
+open-location_ui.h: open-location.ui
xdt-csource --static --strip-comments --strip-content
--name=open_location_ui $< > $@
-plugins_ui.h: plugins-3.ui
+plugins_ui.h: plugins.ui
xdt-csource --static --strip-comments --strip-content --name=plugins_ui
$< > $@
endif
diff --git a/data/interfaces/mediachooser-3.ui b/data/interfaces/mediachooser.ui
similarity index 100%
rename from data/interfaces/mediachooser-3.ui
rename to data/interfaces/mediachooser.ui
diff --git a/data/interfaces/open-location-3.ui
b/data/interfaces/open-location.ui
similarity index 100%
rename from data/interfaces/open-location-3.ui
rename to data/interfaces/open-location.ui
diff --git a/data/interfaces/parole-settings-3.ui
b/data/interfaces/parole-settings.ui
similarity index 100%
rename from data/interfaces/parole-settings-3.ui
rename to data/interfaces/parole-settings.ui
diff --git a/data/interfaces/parole-3.ui b/data/interfaces/parole.ui
similarity index 100%
rename from data/interfaces/parole-3.ui
rename to data/interfaces/parole.ui
diff --git a/data/interfaces/playlist-3.ui b/data/interfaces/playlist.ui
similarity index 100%
rename from data/interfaces/playlist-3.ui
rename to data/interfaces/playlist.ui
diff --git a/data/interfaces/plugins-3.ui b/data/interfaces/plugins.ui
similarity index 100%
rename from data/interfaces/plugins-3.ui
rename to data/interfaces/plugins.ui
diff --git a/data/interfaces/save-playlist-3.ui
b/data/interfaces/save-playlist.ui
similarity index 100%
rename from data/interfaces/save-playlist-3.ui
rename to data/interfaces/save-playlist.ui
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
