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

[Jerome Guelfucci]

Author: jeromeg
Date: 2009-01-02 09:40:01 +0000 (Fri, 02 Jan 2009)
New Revision: 6392

Modified:
   xfce4-screenshooter/trunk/ChangeLog
   xfce4-screenshooter/trunk/configure.ac.in
   xfce4-screenshooter/trunk/lib/Makefile.am
   xfce4-screenshooter/trunk/lib/screenshooter-utils.c
   xfce4-screenshooter/trunk/panel-plugin/Makefile.am
   xfce4-screenshooter/trunk/panel-plugin/screenshooter-plugin.c
   xfce4-screenshooter/trunk/src/Makefile.am
   xfce4-screenshooter/trunk/src/main.c
Log:
Post release bump and fix two compiler warnings

Modified: xfce4-screenshooter/trunk/ChangeLog
===================================================================
--- xfce4-screenshooter/trunk/ChangeLog	2009-01-02 09:01:48 UTC (rev 6391)
+++ xfce4-screenshooter/trunk/ChangeLog	2009-01-02 09:40:01 UTC (rev 6392)
@@ -1,5 +1,10 @@
 2009-01-02
 
+  * Post release bump.
+  * Fix two compiler warnings.
+
+2009-01-02
+
   * Get ready for 1.4.90:
     - set version name
     - update changelog

Modified: xfce4-screenshooter/trunk/configure.ac.in
===================================================================
--- xfce4-screenshooter/trunk/configure.ac.in	2009-01-02 09:01:48 UTC (rev 6391)
+++ xfce4-screenshooter/trunk/configure.ac.in	2009-01-02 09:40:01 UTC (rev 6392)
@@ -6,9 +6,9 @@
 m4_define([xfce4_screenshooter_version_major], [1])
 m4_define([xfce4_screenshooter_version_minor], [4])
 m4_define([xfce4_screenshooter_version_micro], [90])
-m4_define([xfce4_screenshooter_version_nano],  [0]) dnl leave this empty to have no nano version
+m4_define([xfce4_screenshooter_version_nano],  [1]) dnl leave this empty to have no nano version
 m4_define([xfce4_screenshooter_version_build], [r at REVISION@])
-m4_define([xfce4_screenshooter_version_tag],   [])
+m4_define([xfce4_screenshooter_version_tag],   [svn])
 m4_define([xfce4_screenshooter_version], [xfce4_screenshooter_version_major().xfce4_screenshooter_version_minor().xfce4_screenshooter_version_micro()ifelse(xfce4_screenshooter_version_nano(), [], [], [.xfce4_screenshooter_version_nano()])ifelse(xfce4_screenshooter_version_tag(), [svn], [xfce4_screenshooter_version_tag()-xfce4_screenshooter_version_build()], [xfce4_screenshooter_version_tag()])])
 
 AC_INIT([xfce4-screenshooter], [xfce4_screenshooter_version], [http://bugzilla.xfce.org/], [xfce4-screenshooter])

Modified: xfce4-screenshooter/trunk/lib/Makefile.am
===================================================================
--- xfce4-screenshooter/trunk/lib/Makefile.am	2009-01-02 09:01:48 UTC (rev 6391)
+++ xfce4-screenshooter/trunk/lib/Makefile.am	2009-01-02 09:40:01 UTC (rev 6392)
@@ -13,7 +13,7 @@
 	@GLIB_CFLAGS@ \
 	@LIBXFCE4UTIL_CFLAGS@ \
 	@LIBXFCEGUI4_CFLAGS@ \
-	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
+	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" -Wall -Werror
 
 libscreenshooter_la_LIBADD = \
   @GTK_LIBS@ \

Modified: xfce4-screenshooter/trunk/lib/screenshooter-utils.c
===================================================================
--- xfce4-screenshooter/trunk/lib/screenshooter-utils.c	2009-01-02 09:01:48 UTC (rev 6391)
+++ xfce4-screenshooter/trunk/lib/screenshooter-utils.c	2009-01-02 09:40:01 UTC (rev 6392)
@@ -283,7 +283,7 @@
 */
 GdkPixbuf *screenshooter_take_screenshot (gint region, gint delay)
 {
-  GdkPixbuf *screenshot;
+  GdkPixbuf *screenshot = NULL;
   GdkWindow *window = NULL;
   GdkScreen *screen;
       

Modified: xfce4-screenshooter/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-screenshooter/trunk/panel-plugin/Makefile.am	2009-01-02 09:01:48 UTC (rev 6391)
+++ xfce4-screenshooter/trunk/panel-plugin/Makefile.am	2009-01-02 09:40:01 UTC (rev 6392)
@@ -5,7 +5,7 @@
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	-I$(top_srcdir)								\
 	-I$(top_srcdir)/lib							\
-	@LIBXFCE4PANEL_CFLAGS@
+	@LIBXFCE4PANEL_CFLAGS@ -Wall -Werror
 
 xfce4_screenshooter_plugin_LDFLAGS =						\
 	@LIBXFCE4PANEL_LIBS@ \

Modified: xfce4-screenshooter/trunk/panel-plugin/screenshooter-plugin.c
===================================================================
--- xfce4-screenshooter/trunk/panel-plugin/screenshooter-plugin.c	2009-01-02 09:01:48 UTC (rev 6391)
+++ xfce4-screenshooter/trunk/panel-plugin/screenshooter-plugin.c	2009-01-02 09:40:01 UTC (rev 6392)
@@ -171,8 +171,7 @@
 pd: the associated PluginData.
 */
 static void
-cb_style_set (XfcePanelPlugin *plugin, gpointer ignored,
-                       PluginData *pd)
+cb_style_set (XfcePanelPlugin *plugin, gpointer ignored, PluginData *pd)
 {
   cb_set_size (plugin, xfce_panel_plugin_get_size (plugin), pd);
 }

Modified: xfce4-screenshooter/trunk/src/Makefile.am
===================================================================
--- xfce4-screenshooter/trunk/src/Makefile.am	2009-01-02 09:01:48 UTC (rev 6391)
+++ xfce4-screenshooter/trunk/src/Makefile.am	2009-01-02 09:40:01 UTC (rev 6392)
@@ -6,7 +6,7 @@
 	@LIBXFCE4UTIL_CFLAGS@ \
 	@LIBXFCEGUI4_CFLAGS@ \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-	-I$(top_srcdir)/lib
+	-I$(top_srcdir)/lib -Wall -Werror
 	
 xfce4_screenshooter_LDFLAGS =                       \
 	@GTK_LIBS@ \

Modified: xfce4-screenshooter/trunk/src/main.c
===================================================================
--- xfce4-screenshooter/trunk/src/main.c	2009-01-02 09:01:48 UTC (rev 6391)
+++ xfce4-screenshooter/trunk/src/main.c	2009-01-02 09:40:01 UTC (rev 6392)
@@ -37,10 +37,7 @@
 
 
 
-/* Set cli options. The -p option creates a conf file named xfce4-screenshooter 
-   in ~/.config/xfce4/. This file only contains one entry, the name of the 
-   default save folder. 
-*/
+/* Set cli options. */
 static GOptionEntry entries[] =
 {
     {    "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &version,
@@ -77,7 +74,7 @@
         N_("Application to open the screenshot"),
         NULL
     },
-    { NULL }
+    { NULL, ' ', 0, 0, NULL, NULL, NULL }
 };
 
 static void