[Xfce4-commits] <xfdesktop:master> Fix a runtime warning

[Eric Koegel]

Updating branch refs/heads/master
         to 19df3baad37c51d2ebc8cef0d3b0dfa8ab098033 (commit)
       from 22fd6840660e5154a7051647051deefea90bfe27 (commit)

commit 19df3baad37c51d2ebc8cef0d3b0dfa8ab098033
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Wed Feb 26 13:46:57 2014 +0300

    Fix a runtime warning
    
    If one of the checks in the style refresh happened then the
    refresh timer was destroyed with a return FALSE, but our source
    id for that timer wasn't cleared. This fixes it.

 src/xfce-desktop.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c
index 53be20e..5e1bb0a 100644
--- a/src/xfce-desktop.c
+++ b/src/xfce-desktop.c
@@ -1268,7 +1268,9 @@ style_refresh_cb(gpointer *w)
 
     TRACE("entering");
 
-    g_return_if_fail(XFCE_IS_DESKTOP(desktop));
+    desktop->priv->style_refresh_timer = 0;
+
+    g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), FALSE);
 
     if(!gtk_widget_get_realized(GTK_WIDGET(desktop)))
         return FALSE;
@@ -1286,8 +1288,6 @@ style_refresh_cb(gpointer *w)
     xfce_desktop_setup_icon_view(desktop);
 #endif
 
-    desktop->priv->style_refresh_timer = 0;
-
     return FALSE;
 }