[Xfce4-commits] <xfce4-notifyd:master> Fix build: don't mix code and declarations.

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to 6b8af8b62e684b4c75c6f1317e949bbe999cfa6d (commit)
       from 9b814e99d10791d672c48c49216b322bd1b3a3fc (commit)

commit 6b8af8b62e684b4c75c6f1317e949bbe999cfa6d
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sat Sep 21 11:15:08 2013 +0200

    Fix build: don't mix code and declarations.

 xfce4-notifyd/xfce-notify-window.c |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/xfce4-notifyd/xfce-notify-window.c b/xfce4-notifyd/xfce-notify-window.c
index 6c820e2..f8ffdf6 100644
--- a/xfce4-notifyd/xfce-notify-window.c
+++ b/xfce4-notifyd/xfce-notify-window.c
@@ -626,11 +626,11 @@ xfce_notify_window_configure_event(GtkWidget *widget,
 static gboolean
 xfce_notify_window_expire_timeout(gpointer data)
 {
-    g_return_val_if_fail(XFCE_IS_NOTIFY_WINDOW(data), FALSE);
-
     XfceNotifyWindow *window = data;
     gboolean          fade_transparent;
 
+    g_return_val_if_fail(XFCE_IS_NOTIFY_WINDOW(data), FALSE);
+
     window->expire_id = 0;
 
     fade_transparent =
@@ -652,11 +652,12 @@ xfce_notify_window_expire_timeout(gpointer data)
 static gboolean
 xfce_notify_window_fade_timeout(gpointer data)
 {
-    g_return_val_if_fail(XFCE_IS_NOTIFY_WINDOW(data), FALSE);
-
     XfceNotifyWindow *window = data;
-    gdouble op = gtk_window_get_opacity(GTK_WINDOW(window));
+    gdouble op;
 
+    g_return_val_if_fail(XFCE_IS_NOTIFY_WINDOW(data), FALSE);
+
+    op = gtk_window_get_opacity(GTK_WINDOW(window));
     op -= window->op_change_delta;
     if(op < 0.0)
         op = 0.0;
@@ -677,10 +678,12 @@ static void
 xfce_notify_window_button_clicked(GtkWidget *widget,
                                   gpointer user_data)
 {
+    XfceNotifyWindow *window;
+    gchar *action_id;
+
     g_return_if_fail(XFCE_IS_NOTIFY_WINDOW(user_data));
 
-    XfceNotifyWindow *window = XFCE_NOTIFY_WINDOW(user_data);
-    gchar *action_id;
+    window = XFCE_NOTIFY_WINDOW(user_data);
 
     action_id = g_object_get_data(G_OBJECT(widget), "--action-id");
     g_assert(action_id);