[Xfce4-commits] <xfce4-panel:master> Small code cleanups.

[Nick Schermer]

Updating branch refs/heads/master
         to fc6318e7831d1763019f17cda445239827081ac2 (commit)
       from 79310a0c941bb29791ea97b47724bc7dbf04c974 (commit)

commit fc6318e7831d1763019f17cda445239827081ac2
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Dec 18 13:59:18 2010 +0100

    Small code cleanups.

 panel/panel-application.c |    5 ++---
 panel/panel-window.c      |    4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/panel/panel-application.c b/panel/panel-application.c
index 6e268b0..5b907a3 100644
--- a/panel/panel-application.c
+++ b/panel/panel-application.c
@@ -176,8 +176,7 @@ panel_application_class_init (PanelApplicationClass *klass)
 static void
 panel_application_init (PanelApplication *application)
 {
-  PanelWindow *window;
-  GError      *error = NULL;
+  GError *error = NULL;
 
   application->windows = NULL;
   application->dialogs = NULL;
@@ -217,7 +216,7 @@ panel_application_init (PanelApplication *application)
 
   /* create empty window if everything else failed */
   if (G_UNLIKELY (application->windows == NULL))
-    window = panel_application_new_window (application, NULL, TRUE);
+    panel_application_new_window (application, NULL, TRUE);
 }
 
 
diff --git a/panel/panel-window.c b/panel/panel-window.c
index cb24128..875245f 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -1405,7 +1405,7 @@ panel_window_screen_struts_set (PanelWindow *window)
   GdkRectangle  *alloc = &window->alloc;
   guint          i;
   gboolean       update_struts = FALSE;
-  gint           n = -1;
+  gint           n;
   const gchar   *strut_border[] = { "left", "right", "top", "bottom" };
   const gchar   *strut_xy[] = { "y", "y", "x", "x" };
 
@@ -1487,6 +1487,8 @@ panel_window_screen_struts_set (PanelWindow *window)
 
   if (G_UNLIKELY (panel_debug_flags != 0))
     {
+      n = -1;
+
       if (struts[STRUT_LEFT] != 0)
         n = STRUT_LEFT;
       else if (struts[STRUT_RIGHT] != 0)