[Xfce4-commits] <ristretto:master> Fix several return-value bugs, thanks to Guido Berhoerster for reporting

[Stephan Arts]

Updating branch refs/heads/master
         to ab3c87660d4ea15225c3a909ec47c9e68ac2e80c (commit)
       from fbfd3c509419cf5f8f10639e01c063473ccc93d4 (commit)

commit ab3c87660d4ea15225c3a909ec47c9e68ac2e80c
Author: Stephan Arts <stephan at xfce.org>
Date:   Fri Oct 7 08:11:07 2011 +0200

    Fix several return-value bugs, thanks to Guido Berhoerster for reporting

 src/image_viewer.c    |    4 +++-
 src/monitor_chooser.c |    6 ++++++
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/image_viewer.c b/src/image_viewer.c
index b8fef76..7017577 100644
--- a/src/image_viewer.c
+++ b/src/image_viewer.c
@@ -1798,6 +1798,8 @@ cb_rstto_image_viewer_queued_repaint (RsttoImageViewer *viewer)
 
 
     rstto_image_viewer_paint (GTK_WIDGET (viewer));
+
+    return FALSE;
 }
 
 static gboolean
@@ -2281,7 +2283,7 @@ static gboolean
 rstto_popup_menu (
         GtkWidget *widget)
 {
-    RsttoImageViewer *viewer = RSTTO_IMAGE_VIEWER (viewer);
+    RsttoImageViewer *viewer = RSTTO_IMAGE_VIEWER (widget);
 
     if (viewer->priv->menu)
     {
diff --git a/src/monitor_chooser.c b/src/monitor_chooser.c
index adda9f3..3100f7f 100644
--- a/src/monitor_chooser.c
+++ b/src/monitor_chooser.c
@@ -335,6 +335,7 @@ rstto_monitor_chooser_paint(GtkWidget *widget)
                     TRUE);
         }
     }
+    return FALSE;
 }
 
 static void
@@ -549,6 +550,8 @@ rstto_monitor_chooser_set_pixbuf (
         GError **error)
 {
     Monitor *monitor = g_slist_nth_data (chooser->priv->monitors, monitor_id);
+    gint retval = -1;
+
     if (monitor)
     {
         if (monitor->pixbuf)
@@ -556,11 +559,14 @@ rstto_monitor_chooser_set_pixbuf (
             g_object_unref (monitor->pixbuf);
         }
         monitor->pixbuf = pixbuf;
+        retval = monitor_id;
     }
     if (GTK_WIDGET_REALIZED (GTK_WIDGET(chooser)))
     {
         rstto_monitor_chooser_paint (GTK_WIDGET(chooser));
     }
+
+    return retval;
 }
 
 static void