[Xfce4-commits] <xfce4-panel:devel> Rename glade to ui.
Nick Schermer
nick at xfce.org
Mon Sep 7 18:20:04 CEST 2009
Updating branch refs/heads/devel
to 75bc4d9c66b7e90c8bc6a53439adb8e30c4549c3 (commit)
from aaad26640419471a4fa823c97dc595e8940675de (commit)
commit 75bc4d9c66b7e90c8bc6a53439adb8e30c4549c3
Author: Nick Schermer <nick at xfce.org>
Date: Mon Sep 7 11:30:29 2009 +0200
Rename glade to ui.
panel/Makefile.am | 8 ++--
panel/panel-preferences-dialog.c | 6 ++--
...es-dialog.glade => panel-preferences-dialog.ui} | 2 +-
plugins/actions/Makefile.am | 8 ++--
.../{actions-dialog.glade => actions-dialog.ui} | 2 +-
plugins/actions/actions.c | 8 ++--
plugins/clock/Makefile.am | 8 ++--
.../clock/{clock-dialog.glade => clock-dialog.ui} | 2 +-
plugins/clock/clock.c | 6 ++--
plugins/launcher/Makefile.am | 9 ++---
plugins/launcher/launcher-dialog.c | 6 ++--
.../{launcher-dialog.glade => launcher-dialog.ui} | 2 +-
plugins/pager/Makefile.am | 8 ++--
.../pager/{pager-dialog.glade => pager-dialog.ui} | 2 +-
plugins/pager/pager.c | 8 ++--
plugins/separator/Makefile.am | 8 ++--
...{separator-dialog.glade => separator-dialog.ui} | 2 +-
plugins/separator/separator.c | 6 ++--
plugins/systray/Makefile.am | 8 ++--
.../{systray-dialog.glade => systray-dialog.ui} | 2 +-
plugins/systray/systray.c | 6 ++--
plugins/tasklist/Makefile.am | 8 ++--
.../{tasklist-dialog.glade => tasklist-dialog.ui} | 2 +-
plugins/tasklist/tasklist.c | 6 ++--
plugins/windowmenu/Makefile.am | 8 ++--
...indowmenu-dialog.glade => windowmenu-dialog.ui} | 2 +-
plugins/windowmenu/windowmenu.c | 6 ++--
po/POTFILES.in | 36 ++++++++++----------
po/POTFILES.skip | 9 -----
29 files changed, 92 insertions(+), 102 deletions(-)
diff --git a/panel/Makefile.am b/panel/Makefile.am
index b38d2e8..04e0452 100644
--- a/panel/Makefile.am
+++ b/panel/Makefile.am
@@ -20,7 +20,7 @@ xfce4_panel_built_sources = \
panel-dbus-client-infos.h \
panel-marshal.h \
panel-marshal.c \
- panel-preferences-dialog-glade.h
+ panel-preferences-dialog-ui.h
xfce4_panel_SOURCES = \
$(xfce4_panel_built_sources) \
@@ -89,8 +89,8 @@ panel-dbus-service-infos.h: $(srcdir)/panel-dbus-service-infos.xml Makefile
panel-dbus-client-infos.h: $(srcdir)/panel-dbus-service-infos.xml Makefile
dbus-binding-tool --mode=glib-client $< > $@
-panel-preferences-dialog-glade.h: $(srcdir)/panel-preferences-dialog.glade Makefile
- exo-csource --static --strip-comments --strip-content --name=panel_preferences_dialog_glade $< >$@
+panel-preferences-dialog-ui.h: $(srcdir)/panel-preferences-dialog.ui Makefile
+ exo-csource --static --strip-comments --strip-content --name=panel_preferences_dialog_ui $< >$@
panel-marshal.h: $(srcdir)/panel-marshal.list Makefile
glib-genmarshal --header --prefix=panel_marshal $< > $@
@@ -110,6 +110,6 @@ endif
EXTRA_DIST = \
panel-dbus-service-infos.xml \
panel-marshal.list \
- panel-preferences-dialog.glade
+ panel-preferences-dialog.ui
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/panel/panel-preferences-dialog.c b/panel/panel-preferences-dialog.c
index 78fa55e..48a8216 100644
--- a/panel/panel-preferences-dialog.c
+++ b/panel/panel-preferences-dialog.c
@@ -33,7 +33,7 @@
#include <panel/panel-itembar.h>
#include <panel/panel-item-dialog.h>
#include <panel/panel-preferences-dialog.h>
-#include <panel/panel-preferences-dialog-glade.h>
+#include <panel/panel-preferences-dialog-ui.h>
#define PREFERENCES_HELP_URL "http://www.xfce.org"
@@ -136,8 +136,8 @@ panel_preferences_dialog_init (PanelPreferencesDialog *dialog)
panel_application_windows_autohide (dialog->application, TRUE);
/* load the builder data into the object */
- gtk_builder_add_from_string (GTK_BUILDER (dialog), panel_preferences_dialog_glade,
- panel_preferences_dialog_glade_length, NULL);
+ gtk_builder_add_from_string (GTK_BUILDER (dialog), panel_preferences_dialog_ui,
+ panel_preferences_dialog_ui_length, NULL);
/* get the dialog */
window = gtk_builder_get_object (GTK_BUILDER (dialog), "dialog");
diff --git a/panel/panel-preferences-dialog.glade b/panel/panel-preferences-dialog.ui
similarity index 99%
rename from panel/panel-preferences-dialog.glade
rename to panel/panel-preferences-dialog.ui
index a6b3abb..056fa6d 100644
--- a/panel/panel-preferences-dialog.glade
+++ b/panel/panel-preferences-dialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<interface>
- <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-requires gtk+ 2.14 -->
<!-- interface-requires libxfce4ui 0.0 -->
<!-- interface-naming-policy project-wide -->
<object class="GtkListStore" id="orientation-store">
diff --git a/plugins/actions/Makefile.am b/plugins/actions/Makefile.am
index f5bcfdf..f4097ff 100644
--- a/plugins/actions/Makefile.am
+++ b/plugins/actions/Makefile.am
@@ -12,7 +12,7 @@ plugin_LTLIBRARIES = \
libactions.la
libactions_built_sources = \
- actions-dialog_glade.h
+ actions-dialog_ui.h
libactions_la_SOURCES = \
$(libactions_built_sources) \
@@ -55,7 +55,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
- actions-dialog.glade \
+ actions-dialog.ui \
$(desktop_in_files)
DISTCLEANFILES = \
@@ -68,8 +68,8 @@ BUILT_SOURCES = \
DISTCLEANFILES += \
$(libactions_built_sources)
-actions-dialog_glade.h: actions-dialog.glade
- exo-csource --static --strip-comments --strip-content --name=actions_dialog_glade $< >$@
+actions-dialog_ui.h: actions-dialog.ui
+ exo-csource --static --strip-comments --strip-content --name=actions_dialog_ui $< >$@
endif
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/actions/actions-dialog.glade b/plugins/actions/actions-dialog.ui
similarity index 99%
rename from plugins/actions/actions-dialog.glade
rename to plugins/actions/actions-dialog.ui
index 67fcb09..3bbd135 100644
--- a/plugins/actions/actions-dialog.glade
+++ b/plugins/actions/actions-dialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<interface>
- <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-requires gtk+ 2.14 -->
<!-- interface-requires libxfce4ui 4.5 -->
<!-- interface-naming-policy project-wide -->
<object class="XfceTitledDialog" id="dialog">
diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c
index 0109a28..3ccf791 100644
--- a/plugins/actions/actions.c
+++ b/plugins/actions/actions.c
@@ -29,7 +29,7 @@
#include <exo/exo.h>
#include "actions.h"
-#include "actions-dialog_glade.h"
+#include "actions-dialog_ui.h"
@@ -355,10 +355,10 @@ actions_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
panel_return_if_fail (XFCE_IS_ACTIONS_PLUGIN (plugin));
- /* load the dialog from the glade file */
+ /* load the dialog from the ui file */
builder = gtk_builder_new ();
- if (gtk_builder_add_from_string (builder, actions_dialog_glade,
- actions_dialog_glade_length, NULL))
+ if (gtk_builder_add_from_string (builder, actions_dialog_ui,
+ actions_dialog_ui_length, NULL))
{
dialog = gtk_builder_get_object (builder, "dialog");
g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_object_unref, builder);
diff --git a/plugins/clock/Makefile.am b/plugins/clock/Makefile.am
index 2871da5..d974e13 100644
--- a/plugins/clock/Makefile.am
+++ b/plugins/clock/Makefile.am
@@ -12,7 +12,7 @@ plugin_LTLIBRARIES = \
libclock.la
libclock_built_sources = \
- clock-dialog_glade.h
+ clock-dialog_ui.h
libclock_la_SOURCES = \
$(libclock_built_sources) \
@@ -65,7 +65,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
- clock-dialog.glade \
+ clock-dialog.ui \
$(desktop_in_files)
DISTCLEANFILES = \
@@ -78,8 +78,8 @@ BUILT_SOURCES = \
DISTCLEANFILES += \
$(libclock_built_sources)
-clock-dialog_glade.h: clock-dialog.glade
- exo-csource --static --strip-comments --strip-content --name=clock_dialog_glade $< >$@
+clock-dialog_ui.h: clock-dialog.ui
+ exo-csource --static --strip-comments --strip-content --name=clock_dialog_ui $< >$@
endif
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/clock/clock-dialog.glade b/plugins/clock/clock-dialog.ui
similarity index 99%
rename from plugins/clock/clock-dialog.glade
rename to plugins/clock/clock-dialog.ui
index 7eb33c5..33e4cd2 100644
--- a/plugins/clock/clock-dialog.glade
+++ b/plugins/clock/clock-dialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<interface>
- <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-requires gtk+ 2.14 -->
<!-- interface-requires libxfce4ui 0.0 -->
<!-- interface-naming-policy toplevel-contextual -->
<object class="XfceTitledDialog" id="dialog">
diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index ef8bbbb..58b410c 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -38,7 +38,7 @@
#include "clock-digital.h"
#include "clock-fuzzy.h"
#include "clock-lcd.h"
-#include "clock-dialog_glade.h"
+#include "clock-dialog_ui.h"
@@ -384,9 +384,9 @@ clock_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
/* save before we opend the dialog, so all properties exist in xfonf */
clock_plugin_save (panel_plugin);
- /* load the dialog from the glade file */
+ /* load the dialog from the ui file */
builder = gtk_builder_new ();
- if (gtk_builder_add_from_string (builder, clock_dialog_glade, clock_dialog_glade_length, NULL))
+ if (gtk_builder_add_from_string (builder, clock_dialog_ui, clock_dialog_ui_length, NULL))
{
dialog = gtk_builder_get_object (builder, "dialog");
g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_object_unref, builder);
diff --git a/plugins/launcher/Makefile.am b/plugins/launcher/Makefile.am
index a24e6d9..31e547f 100644
--- a/plugins/launcher/Makefile.am
+++ b/plugins/launcher/Makefile.am
@@ -16,7 +16,7 @@ plugin_LTLIBRARIES = \
liblauncher.la
liblauncher_built_sources = \
- launcher-dialog_glade.h
+ launcher-dialog_ui.h
liblauncher_la_SOURCES = \
$(liblauncher_built_sources) \
@@ -65,8 +65,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
- launcher-dialog.glade \
- $(menu_DATA) \
+ launcher-dialog.ui \
$(desktop_in_files)
DISTCLEANFILES = \
@@ -79,8 +78,8 @@ BUILT_SOURCES = \
DISTCLEANFILES += \
$(libclock_built_sources)
-launcher-dialog_glade.h: launcher-dialog.glade
- exo-csource --static --strip-comments --strip-content --name=launcher_dialog_glade $< >$@
+launcher-dialog_ui.h: launcher-dialog.ui
+ exo-csource --static --strip-comments --strip-content --name=launcher_dialog_ui $< >$@
endif
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/launcher/launcher-dialog.c b/plugins/launcher/launcher-dialog.c
index a1dad25..c1c41fb 100644
--- a/plugins/launcher/launcher-dialog.c
+++ b/plugins/launcher/launcher-dialog.c
@@ -35,7 +35,7 @@
#include "launcher.h"
#include "launcher-dialog.h"
-#include "launcher-dialog_glade.h"
+#include "launcher-dialog_ui.h"
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
@@ -746,8 +746,8 @@ launcher_dialog_show (LauncherPlugin *plugin)
panel_return_if_fail (XFCE_IS_LAUNCHER_PLUGIN (plugin));
builder = gtk_builder_new ();
- if (gtk_builder_add_from_string (builder, launcher_dialog_glade,
- launcher_dialog_glade_length, NULL))
+ if (gtk_builder_add_from_string (builder, launcher_dialog_ui,
+ launcher_dialog_ui_length, NULL))
{
/* create structure */
dialog = g_slice_new0 (LauncherPluginDialog);
diff --git a/plugins/launcher/launcher-dialog.glade b/plugins/launcher/launcher-dialog.ui
similarity index 99%
rename from plugins/launcher/launcher-dialog.glade
rename to plugins/launcher/launcher-dialog.ui
index 29b19f2..23d2d16 100644
--- a/plugins/launcher/launcher-dialog.glade
+++ b/plugins/launcher/launcher-dialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<interface>
- <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-requires gtk+ 2.14 -->
<!-- interface-requires libxfce4ui 0.0 -->
<!-- interface-naming-policy project-wide -->
<object class="GtkListStore" id="arrow-position-model">
diff --git a/plugins/pager/Makefile.am b/plugins/pager/Makefile.am
index f48409a..e2001ee 100644
--- a/plugins/pager/Makefile.am
+++ b/plugins/pager/Makefile.am
@@ -13,7 +13,7 @@ plugin_LTLIBRARIES = \
libpager.la
libpager_built_sources = \
- pager-dialog_glade.h
+ pager-dialog_ui.h
libpager_la_SOURCES = \
$(libpager_built_sources) \
@@ -58,7 +58,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
- pager-dialog.glade \
+ pager-dialog.ui \
$(desktop_in_files)
DISTCLEANFILES = \
@@ -71,8 +71,8 @@ BUILT_SOURCES = \
DISTCLEANFILES += \
$(libpager_built_sources)
-pager-dialog_glade.h: pager-dialog.glade
- exo-csource --static --strip-comments --strip-content --name=pager_dialog_glade $< >$@
+pager-dialog_ui.h: pager-dialog.ui
+ exo-csource --static --strip-comments --strip-content --name=pager_dialog_ui $< >$@
endif
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/pager/pager-dialog.glade b/plugins/pager/pager-dialog.ui
similarity index 99%
rename from plugins/pager/pager-dialog.glade
rename to plugins/pager/pager-dialog.ui
index f4a6cfa..0e028f5 100644
--- a/plugins/pager/pager-dialog.glade
+++ b/plugins/pager/pager-dialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<interface>
- <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-requires gtk+ 2.14 -->
<!-- interface-requires libxfce4ui 0.0 -->
<!-- interface-naming-policy toplevel-contextual -->
<object class="XfceTitledDialog" id="dialog">
diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c
index a4378d3..b4db10a 100644
--- a/plugins/pager/pager.c
+++ b/plugins/pager/pager.c
@@ -31,7 +31,7 @@
#include <exo/exo.h>
#include "pager.h"
-#include "pager-dialog_glade.h"
+#include "pager-dialog_ui.h"
@@ -427,10 +427,10 @@ pager_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
panel_return_if_fail (XFCE_IS_PAGER_PLUGIN (plugin));
- /* load the dialog from the glade file */
+ /* load the dialog from the ui file */
builder = gtk_builder_new ();
- if (gtk_builder_add_from_string (builder, pager_dialog_glade,
- pager_dialog_glade_length, NULL))
+ if (gtk_builder_add_from_string (builder, pager_dialog_ui,
+ pager_dialog_ui_length, NULL))
{
/* signals to monitor number of workspace changes */
g_signal_connect (G_OBJECT (plugin->wnck_screen), "workspace-created",
diff --git a/plugins/separator/Makefile.am b/plugins/separator/Makefile.am
index c6306eb..9aa3c02 100644
--- a/plugins/separator/Makefile.am
+++ b/plugins/separator/Makefile.am
@@ -12,7 +12,7 @@ plugin_LTLIBRARIES = \
libseparator.la
libseparator_built_sources = \
- separator-dialog_glade.h
+ separator-dialog_ui.h
libseparator_la_SOURCES = \
$(libseparator_built_sources) \
@@ -57,7 +57,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
- separator-dialog.glade \
+ separator-dialog.ui \
$(desktop_in_files)
DISTCLEANFILES = \
@@ -70,8 +70,8 @@ BUILT_SOURCES = \
DISTCLEANFILES += \
$(libseparator_built_sources)
-separator-dialog_glade.h: separator-dialog.glade
- exo-csource --static --strip-comments --strip-content --name=separator_dialog_glade $< >$@
+separator-dialog_ui.h: separator-dialog.ui
+ exo-csource --static --strip-comments --strip-content --name=separator_dialog_ui $< >$@
endif
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/separator/separator-dialog.glade b/plugins/separator/separator-dialog.ui
similarity index 99%
rename from plugins/separator/separator-dialog.glade
rename to plugins/separator/separator-dialog.ui
index 5b80b20..bb5e98d 100644
--- a/plugins/separator/separator-dialog.glade
+++ b/plugins/separator/separator-dialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<interface>
- <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-requires gtk+ 2.14 -->
<!-- interface-requires libxfce4ui 0.0 -->
<!-- interface-naming-policy toplevel-contextual -->
<object class="XfceTitledDialog" id="dialog">
diff --git a/plugins/separator/separator.c b/plugins/separator/separator.c
index df569eb..baf36dd 100644
--- a/plugins/separator/separator.c
+++ b/plugins/separator/separator.c
@@ -29,7 +29,7 @@
#include <exo/exo.h>
#include "separator.h"
-#include "separator-dialog_glade.h"
+#include "separator-dialog_ui.h"
#define SEPARATOR_OFFSET (0.15)
@@ -313,9 +313,9 @@ separator_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
panel_return_if_fail (XFCE_IS_SEPARATOR_PLUGIN (plugin));
- /* load the dialog from the glade file */
+ /* load the dialog from the ui file */
builder = gtk_builder_new ();
- if (gtk_builder_add_from_string (builder, separator_dialog_glade, separator_dialog_glade_length, NULL))
+ if (gtk_builder_add_from_string (builder, separator_dialog_ui, separator_dialog_ui_length, NULL))
{
dialog = gtk_builder_get_object (builder, "dialog");
g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_object_unref, builder);
diff --git a/plugins/systray/Makefile.am b/plugins/systray/Makefile.am
index 7309984..067e210 100644
--- a/plugins/systray/Makefile.am
+++ b/plugins/systray/Makefile.am
@@ -12,7 +12,7 @@ plugin_LTLIBRARIES = \
libsystray.la
libsystray_built_sources = \
- systray-dialog_glade.h \
+ systray-dialog_ui.h \
systray-marshal.c \
systray-marshal.h
@@ -66,7 +66,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
$(desktop_in_files) \
- systray-dialog.glade \
+ systray-dialog.ui \
systray-marshal.list
DISTCLEANFILES = \
@@ -89,8 +89,8 @@ systray-marshal.c: systray-marshal.list Makefile
echo "#include \"systray-marshal.h\"" > $@ \
&& glib-genmarshal --prefix=_systray_marshal --body $< >> $@
-systray-dialog_glade.h: systray-dialog.glade
- exo-csource --static --strip-comments --strip-content --name=systray_dialog_glade $< >$@
+systray-dialog_ui.h: systray-dialog.ui
+ exo-csource --static --strip-comments --strip-content --name=systray_dialog_ui $< >$@
endif
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/systray/systray-dialog.glade b/plugins/systray/systray-dialog.ui
similarity index 99%
rename from plugins/systray/systray-dialog.glade
rename to plugins/systray/systray-dialog.ui
index 55c3d48..36d6fbf 100644
--- a/plugins/systray/systray-dialog.glade
+++ b/plugins/systray/systray-dialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<interface>
- <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-requires gtk+ 2.14 -->
<!-- interface-requires libxfce4ui 0.0 -->
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkListStore" id="applications-store">
diff --git a/plugins/systray/systray.c b/plugins/systray/systray.c
index f79432f..2729f5a 100644
--- a/plugins/systray/systray.c
+++ b/plugins/systray/systray.c
@@ -32,7 +32,7 @@
#include "systray-box.h"
#include "systray-socket.h"
#include "systray-manager.h"
-#include "systray-dialog_glade.h"
+#include "systray-dialog_ui.h"
#define ICON_SIZE (22)
@@ -452,8 +452,8 @@ systray_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
return;
builder = gtk_builder_new ();
- if (gtk_builder_add_from_string (builder, systray_dialog_glade,
- systray_dialog_glade_length, NULL))
+ if (gtk_builder_add_from_string (builder, systray_dialog_ui,
+ systray_dialog_ui_length, NULL))
{
dialog = gtk_builder_get_object (builder, "dialog");
g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_object_unref, builder);
diff --git a/plugins/tasklist/Makefile.am b/plugins/tasklist/Makefile.am
index e081d38..980f0d7 100644
--- a/plugins/tasklist/Makefile.am
+++ b/plugins/tasklist/Makefile.am
@@ -13,7 +13,7 @@ plugin_LTLIBRARIES = \
libtasklist.la
libtasklist_built_sources = \
- tasklist-dialog_glade.h
+ tasklist-dialog_ui.h
libtasklist_la_SOURCES = \
$(libtasklist_built_sources) \
@@ -59,7 +59,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
- tasklist-dialog.glade \
+ tasklist-dialog.ui \
$(desktop_in_files)
DISTCLEANFILES = \
@@ -72,8 +72,8 @@ BUILT_SOURCES = \
DISTCLEANFILES += \
$(libtasklist_built_sources)
-tasklist-dialog_glade.h: tasklist-dialog.glade
- exo-csource --static --strip-comments --strip-content --name=tasklist_dialog_glade $< >$@
+tasklist-dialog_ui.h: tasklist-dialog.ui
+ exo-csource --static --strip-comments --strip-content --name=tasklist_dialog_ui $< >$@
endif
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/tasklist/tasklist-dialog.glade b/plugins/tasklist/tasklist-dialog.ui
similarity index 99%
rename from plugins/tasklist/tasklist-dialog.glade
rename to plugins/tasklist/tasklist-dialog.ui
index c6746ad..c89c5cc 100644
--- a/plugins/tasklist/tasklist-dialog.glade
+++ b/plugins/tasklist/tasklist-dialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<interface>
- <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-requires gtk+ 2.14 -->
<!-- interface-requires libxfce4ui 0.0 -->
<!-- interface-naming-policy toplevel-contextual -->
<object class="XfceTitledDialog" id="dialog">
diff --git a/plugins/tasklist/tasklist.c b/plugins/tasklist/tasklist.c
index f4056f4..d1f5b45 100644
--- a/plugins/tasklist/tasklist.c
+++ b/plugins/tasklist/tasklist.c
@@ -27,7 +27,7 @@
#include <libxfce4panel/libxfce4panel.h>
#include "tasklist-widget.h"
-#include "tasklist-dialog_glade.h"
+#include "tasklist-dialog_ui.h"
/* TODO move to header */
GType tasklist_plugin_get_type (void) G_GNUC_CONST;
@@ -181,8 +181,8 @@ tasklist_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
GObject *object;
builder = gtk_builder_new ();
- if (gtk_builder_add_from_string (builder, tasklist_dialog_glade,
- tasklist_dialog_glade_length, NULL))
+ if (gtk_builder_add_from_string (builder, tasklist_dialog_ui,
+ tasklist_dialog_ui_length, NULL))
{
dialog = gtk_builder_get_object (builder, "dialog");
g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_object_unref, builder);
diff --git a/plugins/windowmenu/Makefile.am b/plugins/windowmenu/Makefile.am
index 792c81a..90bdffa 100644
--- a/plugins/windowmenu/Makefile.am
+++ b/plugins/windowmenu/Makefile.am
@@ -13,7 +13,7 @@ plugin_LTLIBRARIES = \
libwindowmenu.la
libwindowmenu_built_sources = \
- windowmenu-dialog_glade.h
+ windowmenu-dialog_ui.h
libwindowmenu_la_SOURCES = \
$(libwindowmenu_built_sources) \
@@ -58,7 +58,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
- windowmenu-dialog.glade \
+ windowmenu-dialog.ui \
$(desktop_in_files)
DISTCLEANFILES = \
@@ -71,8 +71,8 @@ BUILT_SOURCES = \
DISTCLEANFILES += \
$(libwindowmenu_built_sources)
-windowmenu-dialog_glade.h: windowmenu-dialog.glade
- exo-csource --static --strip-comments --strip-content --name=windowmenu_dialog_glade $< >$@
+windowmenu-dialog_ui.h: windowmenu-dialog.ui
+ exo-csource --static --strip-comments --strip-content --name=windowmenu_dialog_ui $< >$@
endif
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/plugins/windowmenu/windowmenu-dialog.glade b/plugins/windowmenu/windowmenu-dialog.ui
similarity index 99%
rename from plugins/windowmenu/windowmenu-dialog.glade
rename to plugins/windowmenu/windowmenu-dialog.ui
index 3f75bc5..2938a65 100644
--- a/plugins/windowmenu/windowmenu-dialog.glade
+++ b/plugins/windowmenu/windowmenu-dialog.ui
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<interface>
- <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-requires gtk+ 2.14 -->
<!-- interface-requires libxfce4ui 0.0 -->
<!-- interface-naming-policy toplevel-contextual -->
<object class="XfceTitledDialog" id="dialog">
diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c
index 29895f9..d9a1d66 100644
--- a/plugins/windowmenu/windowmenu.c
+++ b/plugins/windowmenu/windowmenu.c
@@ -30,7 +30,7 @@
#include <common/panel-private.h>
#include "windowmenu.h"
-#include "windowmenu-dialog_glade.h"
+#include "windowmenu-dialog_ui.h"
#define ARROW_BUTTON_SIZE (12)
#define URGENT_FLAGS (WNCK_WINDOW_STATE_DEMANDS_ATTENTION | \
@@ -494,8 +494,8 @@ window_menu_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
"style" };
builder = gtk_builder_new ();
- if (gtk_builder_add_from_string (builder, windowmenu_dialog_glade,
- windowmenu_dialog_glade_length, NULL))
+ if (gtk_builder_add_from_string (builder, windowmenu_dialog_ui,
+ windowmenu_dialog_ui_length, NULL))
{
dialog = gtk_builder_get_object (builder, "dialog");
g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_object_unref, builder);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4791db1..f69ef59 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -25,22 +25,22 @@ plugins/windowmenu/windowmenu.c
panel-preferences.desktop.in
panel-desktop-handler.desktop.in
-plugins/actions/actions.desktop.in.in
-plugins/launcher/launcher.desktop.in.in
-plugins/showdesktop/showdesktop.desktop.in.in
-plugins/separator/separator.desktop.in.in
-plugins/windowmenu/windowmenu.desktop.in.in
-plugins/tasklist/tasklist.desktop.in.in
-plugins/pager/pager.desktop.in.in
-plugins/clock/clock.desktop.in.in
-plugins/systray/systray.desktop.in.in
+plugins/actions/actions.desktop.in
+plugins/launcher/launcher.desktop.in
+plugins/showdesktop/showdesktop.desktop.in
+plugins/separator/separator.desktop.in
+plugins/windowmenu/windowmenu.desktop.in
+plugins/tasklist/tasklist.desktop.in
+plugins/pager/pager.desktop.in
+plugins/clock/clock.desktop.in
+plugins/systray/systray.desktop.in
-panel/panel-preferences-dialog.glade
-plugins/actions/actions-dialog.glade
-plugins/launcher/launcher-dialog.glade
-plugins/separator/separator-dialog.glade
-plugins/windowmenu/windowmenu-dialog.glade
-plugins/tasklist/tasklist-dialog.glade
-plugins/pager/pager-dialog.glade
-plugins/clock/clock-dialog.glade
-plugins/systray/systray-dialog.glade
+panel/panel-preferences-dialog.ui
+plugins/actions/actions-dialog.ui
+plugins/launcher/launcher-dialog.ui
+plugins/separator/separator-dialog.ui
+plugins/windowmenu/windowmenu-dialog.uilade
+plugins/tasklist/tasklist-dialog.ui
+plugins/pager/pager-dialog.ui
+plugins/clock/clock-dialog.ui
+plugins/systray/systray-dialog.ui
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
deleted file mode 100644
index 10fc1f6..0000000
--- a/po/POTFILES.skip
+++ /dev/null
@@ -1,9 +0,0 @@
-plugins/actions/actions.desktop.in
-plugins/launcher/launcher.desktop.in
-plugins/showdesktop/showdesktop.desktop.in
-plugins/separator/separator.desktop.in
-plugins/windowmenu/windowmenu.desktop.in
-plugins/tasklist/tasklist.desktop.in
-plugins/pager/pager.desktop.in
-plugins/clock/clock.desktop.in
-plugins/systray/systray.desktop.in
More information about the Xfce4-commits
mailing list