From bf5f14f84f64b0b74cd4f4ba1f8a5eecfd3ed292 Mon Sep 17 00:00:00 2001
From: Jerome Guelfucci <jeromeg@xfce.org>
Date: Fri, 2 Jan 2009 15:22:15 +0000
Subject: [PATCH] * Improve the compiler flags set. * configure.ac.in:
- use @LINGUAS@ instead of copying things from po/LINGUAS manually. - set
debugging as full for svn snapshots. * panel-plugin/screenshooter-plugin.c:
directly use button instead of pd->button.
(Old svn revision: 6394)
---
ChangeLog | 9 +++++++++
configure.ac.in | 7 ++++++-
lib/Makefile.am | 4 +++-
panel-plugin/Makefile.am | 4 +++-
panel-plugin/screenshooter-plugin.c | 4 ++--
src/Makefile.am | 4 +++-
6 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b958e973..fac13c60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-02
+
+ * Improve the compiler flags set.
+ * configure.ac.in:
+ - use @LINGUAS@ instead of copying things from po/LINGUAS manually.
+ - set debugging as full for svn snapshots.
+ * panel-plugin/screenshooter-plugin.c: directly use button instead of
+ pd->button.
+
2009-01-02
* Post release bump.
diff --git a/configure.ac.in b/configure.ac.in
index 111aa846..55f1acc8 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -11,6 +11,11 @@ m4_define([xfce4_screenshooter_version_build], [r@REVISION@])
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()])])
+dnl *******************************************
+dnl *** Debugging support for SVN snapshots ***
+dnl *******************************************
+m4_define([xfce4_screenshooter_debug_default], [ifelse(xfce4_screenshooter_version_tag(), [svn], [full], [minimum])])
+
AC_INIT([xfce4-screenshooter], [xfce4_screenshooter_version], [http://bugzilla.xfce.org/], [xfce4-screenshooter])
AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
@@ -51,7 +56,7 @@ dnl Optionnal check for gio
XDT_CHECK_OPTIONAL_PACKAGE([GIO], [gio-2.0], [2.16])
dnl Translations
-XDT_I18N([ar ca cs da de el en_GB es eu fi fr gl hr hu id ja lv nb_NO nl pl pt_BR pt_PT sq tr uk ur zh_TW])
+XDT_I18N([@LINGUAS@])
dnl Check for debugging support
XDT_FEATURE_DEBUG()
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e6e9b130..97f31ba9 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -13,7 +13,9 @@ libscreenshooter_la_CFLAGS = \
@GLIB_CFLAGS@ \
@LIBXFCE4UTIL_CFLAGS@ \
@LIBXFCEGUI4_CFLAGS@ \
- -DPACKAGE_LOCALE_DIR=\"$(localedir)\" -Wall -Werror
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+ -Wall -Wextra -Werror -Wno-unused-parameter \
+ -Wno-missing-field-initializers
libscreenshooter_la_LIBADD = \
@GTK_LIBS@ \
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 928a5110..0fe6e5e9 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -5,7 +5,9 @@ xfce4_screenshooter_plugin_CFLAGS = \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-I$(top_srcdir) \
-I$(top_srcdir)/lib \
- @LIBXFCE4PANEL_CFLAGS@ -Wall -Werror
+ @LIBXFCE4PANEL_CFLAGS@ \
+ -Wall -Wextra -Werror -Wno-unused-parameter \
+ -Wno-missing-field-initializers
xfce4_screenshooter_plugin_LDFLAGS = \
@LIBXFCE4PANEL_LIBS@ \
diff --git a/panel-plugin/screenshooter-plugin.c b/panel-plugin/screenshooter-plugin.c
index 320c9de8..7f015fe9 100644
--- a/panel-plugin/screenshooter-plugin.c
+++ b/panel-plugin/screenshooter-plugin.c
@@ -156,12 +156,12 @@ cb_button_clicked (GtkWidget *button, PluginData *pd)
{
/* Make the button unclickable so that the user does not press it while
another screenshot is in progress */
- gtk_widget_set_sensitive (GTK_WIDGET (pd->button), FALSE);
+ gtk_widget_set_sensitive (GTK_WIDGET (button), FALSE);
screenshooter_take_and_output_screenshot (pd->sd);
/* Make the panel button clickable */
- gtk_widget_set_sensitive (GTK_WIDGET (pd->button), TRUE);
+ gtk_widget_set_sensitive (GTK_WIDGET (button), TRUE);
}
diff --git a/src/Makefile.am b/src/Makefile.am
index 734b5dcd..79b84908 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,9 @@ xfce4_screenshooter_CFLAGS = \
@LIBXFCE4UTIL_CFLAGS@ \
@LIBXFCEGUI4_CFLAGS@ \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- -I$(top_srcdir)/lib -Wall -Werror
+ -I$(top_srcdir)/lib \
+ -Wall -Wextra -Werror -Wno-unused-parameter \
+ -Wno-missing-field-initializers
xfce4_screenshooter_LDFLAGS = \
@GTK_LIBS@ \
--
GitLab