Skip to content
Snippets Groups Projects
Commit 985e5624 authored by Jerome Guelfucci's avatar Jerome Guelfucci
Browse files

Fix build with --disable-maintainer-mode on some platforms.

(Old svn revision: 6105)
parent 0f4fb32e
No related branches found
No related tags found
No related merge requests found
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 2008-11-14 jeromeg
* Prepare another release candidate... * Prepare another release candidate...
......
...@@ -6,7 +6,7 @@ dnl ...@@ -6,7 +6,7 @@ dnl
m4_define([xfce4_screenshooter_plugin_version_major], [1]) m4_define([xfce4_screenshooter_plugin_version_major], [1])
m4_define([xfce4_screenshooter_plugin_version_minor], [3]) m4_define([xfce4_screenshooter_plugin_version_minor], [3])
m4_define([xfce4_screenshooter_plugin_version_micro], [9]) 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@REVISION@]) m4_define([xfce4_screenshooter_plugin_version_build], [r@REVISION@])
m4_define([xfce4_screenshooter_plugin_version_tag], []) 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()])]) 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()])])
......
...@@ -12,8 +12,7 @@ libscreenshooter_la_CFLAGS = \ ...@@ -12,8 +12,7 @@ libscreenshooter_la_CFLAGS = \
@GLIB_CFLAGS@ \ @GLIB_CFLAGS@ \
@LIBXFCE4UTIL_CFLAGS@ \ @LIBXFCE4UTIL_CFLAGS@ \
@LIBXFCEGUI4_CFLAGS@ \ @LIBXFCEGUI4_CFLAGS@ \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
-Werror
libscreenshooter_la_LIBADD = \ libscreenshooter_la_LIBADD = \
@GTK_LIBS@ \ @GTK_LIBS@ \
......
...@@ -300,8 +300,7 @@ GtkWidget *screenshooter_dialog_new (ScreenshotData *sd, gboolean plugin) ...@@ -300,8 +300,7 @@ GtkWidget *screenshooter_dialog_new (ScreenshotData *sd, gboolean plugin)
GtkWidget *modes_frame, *modes_box; GtkWidget *modes_frame, *modes_box;
GtkWidget *active_window_button, *fullscreen_button; GtkWidget *active_window_button, *fullscreen_button;
GtkWidget *options_frame, *options_box; GtkWidget *options_frame, *options_box;
GtkWidget *save_button; GtkWidget *save_button = NULL;
GtkWidget *default_save_label, *dir_chooser;
GtkWidget *delay_label, *delay_box, *delay_spinner, *label2; GtkWidget *delay_label, *delay_box, *delay_spinner, *label2;
#ifdef HAVE_GIO #ifdef HAVE_GIO
GtkWidget *open_with_label; GtkWidget *open_with_label;
...@@ -411,6 +410,8 @@ GtkWidget *screenshooter_dialog_new (ScreenshotData *sd, gboolean plugin) ...@@ -411,6 +410,8 @@ GtkWidget *screenshooter_dialog_new (ScreenshotData *sd, gboolean plugin)
if (plugin) if (plugin)
{ {
/* Default save location */ /* Default save location */
GtkWidget *default_save_label, *dir_chooser;
default_save_label = gtk_label_new (""); default_save_label = gtk_label_new ("");
gtk_label_set_markup (GTK_LABEL (default_save_label), gtk_label_set_markup (GTK_LABEL (default_save_label),
_("<span weight=\"bold\" stretch=\"semiexpanded\">Default save location</span>")); _("<span weight=\"bold\" stretch=\"semiexpanded\">Default save location</span>"));
......
...@@ -5,7 +5,7 @@ xfce4_screenshooter_plugin_CFLAGS = \ ...@@ -5,7 +5,7 @@ xfce4_screenshooter_plugin_CFLAGS = \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \
@LIBXFCE4PANEL_CFLAGS@ -Werror @LIBXFCE4PANEL_CFLAGS@
xfce4_screenshooter_plugin_LDFLAGS = \ xfce4_screenshooter_plugin_LDFLAGS = \
@LIBXFCE4PANEL_LIBS@ \ @LIBXFCE4PANEL_LIBS@ \
......
...@@ -5,7 +5,7 @@ xfce4_screenshooter_CFLAGS = \ ...@@ -5,7 +5,7 @@ xfce4_screenshooter_CFLAGS = \
@GLIB_CFLAGS@ \ @GLIB_CFLAGS@ \
@LIBXFCE4UTIL_CFLAGS@ \ @LIBXFCE4UTIL_CFLAGS@ \
@LIBXFCEGUI4_CFLAGS@ \ @LIBXFCEGUI4_CFLAGS@ \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" -Werror \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-I$(top_srcdir)/lib -I$(top_srcdir)/lib
xfce4_screenshooter_LDFLAGS = \ xfce4_screenshooter_LDFLAGS = \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment