From e7b72c07832eb6454eacd813c864ba4a579135e7 Mon Sep 17 00:00:00 2001
From: Jerome Guelfucci <jeromeg@xfce.org>
Date: Fri, 2 Jan 2009 09:40:01 +0000
Subject: [PATCH] Post release bump and fix two compiler warnings
(Old svn revision: 6392)
---
ChangeLog | 5 +++++
configure.ac.in | 4 ++--
lib/Makefile.am | 2 +-
lib/screenshooter-utils.c | 2 +-
panel-plugin/Makefile.am | 2 +-
panel-plugin/screenshooter-plugin.c | 3 +--
src/Makefile.am | 2 +-
src/main.c | 7 ++-----
8 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2eb36547..b958e973 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-02
+
+ * Post release bump.
+ * Fix two compiler warnings.
+
2009-01-02
* Get ready for 1.4.90:
diff --git a/configure.ac.in b/configure.ac.in
index 6a24ec3f..111aa846 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -6,9 +6,9 @@ dnl
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@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])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index fbc554f3..e6e9b130 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -13,7 +13,7 @@ libscreenshooter_la_CFLAGS = \
@GLIB_CFLAGS@ \
@LIBXFCE4UTIL_CFLAGS@ \
@LIBXFCEGUI4_CFLAGS@ \
- -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" -Wall -Werror
libscreenshooter_la_LIBADD = \
@GTK_LIBS@ \
diff --git a/lib/screenshooter-utils.c b/lib/screenshooter-utils.c
index c3137860..54620e66 100644
--- a/lib/screenshooter-utils.c
+++ b/lib/screenshooter-utils.c
@@ -283,7 +283,7 @@ returns: the screenshot in a *GdkPixbuf.
*/
GdkPixbuf *screenshooter_take_screenshot (gint region, gint delay)
{
- GdkPixbuf *screenshot;
+ GdkPixbuf *screenshot = NULL;
GdkWindow *window = NULL;
GdkScreen *screen;
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 479ff611..928a5110 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -5,7 +5,7 @@ xfce4_screenshooter_plugin_CFLAGS = \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-I$(top_srcdir) \
-I$(top_srcdir)/lib \
- @LIBXFCE4PANEL_CFLAGS@
+ @LIBXFCE4PANEL_CFLAGS@ -Wall -Werror
xfce4_screenshooter_plugin_LDFLAGS = \
@LIBXFCE4PANEL_LIBS@ \
diff --git a/panel-plugin/screenshooter-plugin.c b/panel-plugin/screenshooter-plugin.c
index 4de943f8..320c9de8 100644
--- a/panel-plugin/screenshooter-plugin.c
+++ b/panel-plugin/screenshooter-plugin.c
@@ -171,8 +171,7 @@ plugin: a XfcePanelPlugin (a screenshooter one).
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);
}
diff --git a/src/Makefile.am b/src/Makefile.am
index 586bd4fa..734b5dcd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ xfce4_screenshooter_CFLAGS = \
@LIBXFCE4UTIL_CFLAGS@ \
@LIBXFCEGUI4_CFLAGS@ \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- -I$(top_srcdir)/lib
+ -I$(top_srcdir)/lib -Wall -Werror
xfce4_screenshooter_LDFLAGS = \
@GTK_LIBS@ \
diff --git a/src/main.c b/src/main.c
index fd30063f..d6367d9c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -37,10 +37,7 @@ gint delay = 0;
-/* 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 @@ static GOptionEntry entries[] =
N_("Application to open the screenshot"),
NULL
},
- { NULL }
+ { NULL, ' ', 0, 0, NULL, NULL, NULL }
};
static void
--
GitLab