Update autogen.sh script,

Add internationalization support
Add french locale
Add dependency on libxfcegui4 v .14
Other stuff I don't remember :)


(Old svn revision: 10854)

3 files changed, 34 insertions, 12 deletions

diff --git a/mcs-plugin/Makefile.am b/mcs-plugin/Makefile.am
index 27801ad7e..56adebe8c 100644
--- a/mcs-plugin/Makefile.am
+++ b/mcs-plugin/Makefile.am
@@ -5,7 +5,7 @@ xfwm4_plugin_la_LDFLAGS =  -module -avoid-version
 
 xfwm4_plugin_la_SOURCES = xfwm4_plugin.c inline-icon.h
 
-xfwm4_plugin_la_CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ @MCS_MANAGER_CFLAGS@ @XFCE_MCS_MANAGER_CFLAGS@ -I$(top_builddir)/common -DG_DISABLE_DEPRECATED -DSYSCONFDIR=\"$(sysconfdir)\" -DDATADIR=\"$(pkgdatadir)\" 
+xfwm4_plugin_la_CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ @MCS_MANAGER_CFLAGS@ @XFCE_MCS_MANAGER_CFLAGS@ -I$(top_builddir)/common -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DG_DISABLE_DEPRECATED -DSYSCONFDIR=\"$(sysconfdir)\" -DDATADIR=\"$(pkgdatadir)\" 
 xfwm4_plugin_la_LIBADD = @LIBS@ @X_LIBS@ @BASE_DEPENDENCIES_LIBS@ @MCS_MANAGER_LIBS@ @XFCE_MCS_MANAGER_LIBS@
 
 IMAGES=icon.png
diff --git a/mcs-plugin/Makefile.in b/mcs-plugin/Makefile.in
index 6b3770066..29a8ec057 100644
--- a/mcs-plugin/Makefile.in
+++ b/mcs-plugin/Makefile.in
@@ -46,12 +46,15 @@ AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
 BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO = @ECHO@
@@ -61,12 +64,17 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
 GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -75,11 +83,16 @@ LIBXFCE4MCS_REQUIRED_VERSION = @LIBXFCE4MCS_REQUIRED_VERSION@
 LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MCS_CLIENT_CFLAGS = @MCS_CLIENT_CFLAGS@
 MCS_CLIENT_LIBS = @MCS_CLIENT_LIBS@
 MCS_MANAGER_CFLAGS = @MCS_MANAGER_CFLAGS@
 MCS_MANAGER_LIBS = @MCS_MANAGER_LIBS@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -90,13 +103,19 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PANGO_REQUIRED_VERSION = @PANGO_REQUIRED_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XFCE_MCS_MANAGER_CFLAGS = @XFCE_MCS_MANAGER_CFLAGS@
 XFCE_MCS_MANAGER_LIBS = @XFCE_MCS_MANAGER_LIBS@
+XGETTEXT = @XGETTEXT@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
@@ -142,7 +161,7 @@ xfwm4_plugin_la_LDFLAGS = -module -avoid-version
 
 xfwm4_plugin_la_SOURCES = xfwm4_plugin.c inline-icon.h
 
-xfwm4_plugin_la_CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ @MCS_MANAGER_CFLAGS@ @XFCE_MCS_MANAGER_CFLAGS@ -I$(top_builddir)/common -DG_DISABLE_DEPRECATED -DSYSCONFDIR=\"$(sysconfdir)\" -DDATADIR=\"$(pkgdatadir)\" 
+xfwm4_plugin_la_CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ @MCS_MANAGER_CFLAGS@ @XFCE_MCS_MANAGER_CFLAGS@ -I$(top_builddir)/common -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DG_DISABLE_DEPRECATED -DSYSCONFDIR=\"$(sysconfdir)\" -DDATADIR=\"$(pkgdatadir)\" 
 xfwm4_plugin_la_LIBADD = @LIBS@ @X_LIBS@ @BASE_DEPENDENCIES_LIBS@ @MCS_MANAGER_LIBS@ @XFCE_MCS_MANAGER_LIBS@
 
 IMAGES = icon.png
@@ -182,10 +201,10 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  mcs-plugin/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
 xfwm4_pluginLTLIBRARIES_INSTALL = $(INSTALL)
 install-xfwm4_pluginLTLIBRARIES: $(xfwm4_plugin_LTLIBRARIES)
diff --git a/mcs-plugin/xfwm4_plugin.c b/mcs-plugin/xfwm4_plugin.c
index c51c44869..c4ad1ca7b 100644
--- a/mcs-plugin/xfwm4_plugin.c
+++ b/mcs-plugin/xfwm4_plugin.c
@@ -1250,17 +1250,15 @@ Itf *create_dialog(McsPlugin * mcs_plugin)
     gtk_label_set_justify(GTK_LABEL(dialog->label37), GTK_JUSTIFY_LEFT);
     gtk_misc_set_alignment(GTK_MISC(dialog->label37), 0, 0.5);
 
-    dialog->label38 = gtk_label_new(_("<small><i>Slow</i></small>"));
+    dialog->label38 = small_label(_("Slow"));
     gtk_widget_show(dialog->label38);
     gtk_table_attach(GTK_TABLE(dialog->table2), dialog->label38, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
-    gtk_label_set_use_markup(GTK_LABEL(dialog->label38), TRUE);
     gtk_label_set_justify(GTK_LABEL(dialog->label38), GTK_JUSTIFY_LEFT);
     gtk_misc_set_alignment(GTK_MISC(dialog->label38), 1, 0.5);
 
-    dialog->label39 = gtk_label_new(_("<small><i>Fast</i></small>"));
+    dialog->label39 = small_label(_("Fast"));
     gtk_widget_show(dialog->label39);
     gtk_table_attach(GTK_TABLE(dialog->table2), dialog->label39, 2, 3, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
-    gtk_label_set_use_markup(GTK_LABEL(dialog->label39), TRUE);
     gtk_label_set_justify(GTK_LABEL(dialog->label39), GTK_JUSTIFY_LEFT);
     gtk_misc_set_alignment(GTK_MISC(dialog->label39), 0, 0.5);
 
@@ -1327,17 +1325,15 @@ Itf *create_dialog(McsPlugin * mcs_plugin)
     gtk_label_set_justify(GTK_LABEL(dialog->label41), GTK_JUSTIFY_LEFT);
     gtk_misc_set_alignment(GTK_MISC(dialog->label41), 0, 0.5);
 
-    dialog->label42 = gtk_label_new(_("<small><i>Small</i></small>"));
+    dialog->label42 = small_label(_("Small"));
     gtk_widget_show(dialog->label42);
     gtk_table_attach(GTK_TABLE(dialog->table3), dialog->label42, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
-    gtk_label_set_use_markup(GTK_LABEL(dialog->label42), TRUE);
     gtk_label_set_justify(GTK_LABEL(dialog->label42), GTK_JUSTIFY_LEFT);
     gtk_misc_set_alignment(GTK_MISC(dialog->label42), 1, 0.5);
 
-    dialog->label43 = gtk_label_new(_("<small><i>Wide</i></small>"));
+    dialog->label43 = small_label(_("Wide"));
     gtk_widget_show(dialog->label43);
     gtk_table_attach(GTK_TABLE(dialog->table3), dialog->label43, 2, 3, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
-    gtk_label_set_use_markup(GTK_LABEL(dialog->label43), TRUE);
     gtk_label_set_justify(GTK_LABEL(dialog->label43), GTK_JUSTIFY_LEFT);
     gtk_misc_set_alignment(GTK_MISC(dialog->label43), 0, 0.5);
 
@@ -1749,6 +1745,13 @@ static void run_dialog(McsPlugin * mcs_plugin)
     if(is_running)
         return;
 
+#ifdef ENABLE_NLS
+    bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+    textdomain (GETTEXT_PACKAGE);
+#endif
+    gtk_set_locale ();
+
     is_running = TRUE;
 
     dialog = create_dialog(mcs_plugin);