[Goodies-commits] r6105 - in xfce4-screenshooter-plugin/trunk: . lib panel-plugin src

[Jerome Guelfucci]

Author: jeromeg
Date: 2008-11-15 12:17:30 +0000 (Sat, 15 Nov 2008)
New Revision: 6105

Modified:
   xfce4-screenshooter-plugin/trunk/ChangeLog
   xfce4-screenshooter-plugin/trunk/configure.ac.in
   xfce4-screenshooter-plugin/trunk/lib/Makefile.am
   xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.c
   xfce4-screenshooter-plugin/trunk/panel-plugin/Makefile.am
   xfce4-screenshooter-plugin/trunk/src/Makefile.am
Log:
Fix build with --disable-maintainer-mode on some platforms.

Modified: xfce4-screenshooter-plugin/trunk/ChangeLog
===================================================================
--- xfce4-screenshooter-plugin/trunk/ChangeLog	2008-11-15 10:31:08 UTC (rev 6104)
+++ xfce4-screenshooter-plugin/trunk/ChangeLog	2008-11-15 12:17:30 UTC (rev 6105)
@@ -1,3 +1,13 @@
+2008-11-15 jeromeg
+
+  * configure.ac.in: bump version.
+  * src/Makefile.am, lib/Makefile.am, panel-plugin/Makefile.am:
+    - Remove -Werror.
+  * lib/screenshooter-dialogs.c:
+    - (screenshooter_dialog_new) fix build with --disable-maintainer-mode.
+
+  === 1.3.9.3 ===
+
 2008-11-14 jeromeg
 
   * Prepare another release candidate...

Modified: xfce4-screenshooter-plugin/trunk/configure.ac.in
===================================================================
--- xfce4-screenshooter-plugin/trunk/configure.ac.in	2008-11-15 10:31:08 UTC (rev 6104)
+++ xfce4-screenshooter-plugin/trunk/configure.ac.in	2008-11-15 12:17:30 UTC (rev 6105)
@@ -6,7 +6,7 @@
 m4_define([xfce4_screenshooter_plugin_version_major], [1])
 m4_define([xfce4_screenshooter_plugin_version_minor], [3])
 m4_define([xfce4_screenshooter_plugin_version_micro], [9])
-m4_define([xfce4_screenshooter_plugin_version_nano],  [3]) dnl leave this empty to have no nano version
+m4_define([xfce4_screenshooter_plugin_version_nano],  [4]) dnl leave this empty to have no nano version
 m4_define([xfce4_screenshooter_plugin_version_build], [r at REVISION@])
 m4_define([xfce4_screenshooter_plugin_version_tag],   [])
 m4_define([xfce4_screenshooter_plugin_version], [xfce4_screenshooter_plugin_version_major().xfce4_screenshooter_plugin_version_minor().xfce4_screenshooter_plugin_version_micro()ifelse(xfce4_screenshooter_plugin_version_nano(), [], [], [.xfce4_screenshooter_plugin_version_nano()])ifelse(xfce4_screenshooter_plugin_version_tag(), [svn], [xfce4_screenshooter_plugin_version_tag()-xfce4_screenshooter_plugin_version_build()], [xfce4_screenshooter_plugin_version_tag()])])

Modified: xfce4-screenshooter-plugin/trunk/lib/Makefile.am
===================================================================
--- xfce4-screenshooter-plugin/trunk/lib/Makefile.am	2008-11-15 10:31:08 UTC (rev 6104)
+++ xfce4-screenshooter-plugin/trunk/lib/Makefile.am	2008-11-15 12:17:30 UTC (rev 6105)
@@ -12,8 +12,7 @@
 	@GLIB_CFLAGS@ \
 	@LIBXFCE4UTIL_CFLAGS@ \
 	@LIBXFCEGUI4_CFLAGS@ \
-	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-	-Werror
+	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
 
 libscreenshooter_la_LIBADD = \
   @GTK_LIBS@ \

Modified: xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.c
===================================================================
--- xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.c	2008-11-15 10:31:08 UTC (rev 6104)
+++ xfce4-screenshooter-plugin/trunk/lib/screenshooter-dialogs.c	2008-11-15 12:17:30 UTC (rev 6105)
@@ -300,8 +300,7 @@
   GtkWidget *modes_frame, *modes_box;
   GtkWidget *active_window_button, *fullscreen_button;
   GtkWidget *options_frame, *options_box;
-  GtkWidget *save_button;
-  GtkWidget *default_save_label, *dir_chooser;
+  GtkWidget *save_button = NULL;
   GtkWidget *delay_label, *delay_box, *delay_spinner, *label2;
 #ifdef HAVE_GIO
   GtkWidget *open_with_label;
@@ -411,6 +410,8 @@
   if (plugin)
     {
 		  /* Default save location */          
+		  GtkWidget *default_save_label, *dir_chooser;
+		  
 		  default_save_label = gtk_label_new ("");
 		  gtk_label_set_markup (GTK_LABEL (default_save_label),
 			_("<span weight=\"bold\" stretch=\"semiexpanded\">Default save location</span>"));

Modified: xfce4-screenshooter-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-screenshooter-plugin/trunk/panel-plugin/Makefile.am	2008-11-15 10:31:08 UTC (rev 6104)
+++ xfce4-screenshooter-plugin/trunk/panel-plugin/Makefile.am	2008-11-15 12:17:30 UTC (rev 6105)
@@ -5,7 +5,7 @@
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	-I$(top_srcdir)								\
 	-I$(top_srcdir)/lib							\
-	@LIBXFCE4PANEL_CFLAGS@ -Werror
+	@LIBXFCE4PANEL_CFLAGS@
 
 xfce4_screenshooter_plugin_LDFLAGS =						\
 	@LIBXFCE4PANEL_LIBS@ \

Modified: xfce4-screenshooter-plugin/trunk/src/Makefile.am
===================================================================
--- xfce4-screenshooter-plugin/trunk/src/Makefile.am	2008-11-15 10:31:08 UTC (rev 6104)
+++ xfce4-screenshooter-plugin/trunk/src/Makefile.am	2008-11-15 12:17:30 UTC (rev 6105)
@@ -5,7 +5,7 @@
 	@GLIB_CFLAGS@ \
 	@LIBXFCE4UTIL_CFLAGS@ \
 	@LIBXFCEGUI4_CFLAGS@ \
-	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" -Werror \
+	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
 	-I$(top_srcdir)/lib
 	
 xfce4_screenshooter_LDFLAGS =                       \