[Xfce4-commits] <ristretto:master> Fix bug #8134 (Fix compile with --enable-debug=full)

[Stephan Arts]

Updating branch refs/heads/master
         to c3bb5cc57e77fcd46fd18d1d17a914d584e3edd8 (commit)
       from 8055fc9f3aee18f7f12d175684977b07dd4160bf (commit)

commit c3bb5cc57e77fcd46fd18d1d17a914d584e3edd8
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Fri Nov 11 19:12:41 2011 +0100

    Fix bug #8134 (Fix compile with --enable-debug=full)
    
    - Patch slightly modified by Stephan Arts <stephan at xfce.org>
      ( Notebook is allowed to be removed )

 src/properties_dialog.c      |    3 +--
 src/util.c                   |    5 +++--
 src/xfce_wallpaper_manager.c |    9 ++++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/properties_dialog.c b/src/properties_dialog.c
index 9f88d8d..0d29acc 100644
--- a/src/properties_dialog.c
+++ b/src/properties_dialog.c
@@ -59,7 +59,7 @@ properties_dialog_set_file (
 
 static GtkWidgetClass *parent_class = NULL;
 
-static enum
+enum
 {
     EXIF_PROP_DATE_TIME = 0,
     EXIF_PROP_MODEL,
@@ -125,7 +125,6 @@ static void
 rstto_properties_dialog_init (RsttoPropertiesDialog *dialog)
 {
     GtkWidget *vbox;
-    GtkWidget *notebook;
     GtkWidget *table;
     /* General tab */
     GtkWidget *general_label;
diff --git a/src/util.c b/src/util.c
index 1acfd27..53e42fe 100644
--- a/src/util.c
+++ b/src/util.c
@@ -18,11 +18,12 @@
 
 #include <config.h>
 #include <glib.h>
-
+#include <locale.h>
 #include <exo/exo.h>
 
+void rstto_launch_help (void);
 
-gboolean
+void
 rstto_launch_help (void)
 {
     gchar *locale = NULL;
diff --git a/src/xfce_wallpaper_manager.c b/src/xfce_wallpaper_manager.c
index 1f12d3a..9c66ce5 100644
--- a/src/xfce_wallpaper_manager.c
+++ b/src/xfce_wallpaper_manager.c
@@ -119,12 +119,15 @@ rstto_xfce_wallpaper_manager_configure_dialog_run (
         RsttoWallpaperManager *self,
         RsttoFile *file)
 {
+    GdkPixbuf *monitor_pixbuf;
+    gdouble saturation;
+    gdouble brightness;
     RsttoXfceWallpaperManager *manager = RSTTO_XFCE_WALLPAPER_MANAGER (self);
     gint response = 0;
     manager->priv->file = file;
-    GdkPixbuf *monitor_pixbuf = NULL;
-    gdouble saturation = gtk_adjustment_get_value (GTK_ADJUSTMENT(manager->priv->saturation_adjustment));
-    gdouble brightness = gtk_adjustment_get_value (GTK_ADJUSTMENT(manager->priv->brightness_adjustment));
+    monitor_pixbuf = NULL;
+    saturation = gtk_adjustment_get_value (GTK_ADJUSTMENT(manager->priv->saturation_adjustment));
+    brightness = gtk_adjustment_get_value (GTK_ADJUSTMENT(manager->priv->brightness_adjustment));
 
     if (manager->priv->pixbuf)
     {