clean up some return values in xp_theme

diff --git a/modules/engines/ms-windows/ChangeLog.old b/modules/engines/ms-windows/ChangeLog.old
index fb42edb47f88274109c3115a2c30afc91e713bd2..3201b78d0450d9b9610819b57f23b35078f63932 100755 (executable)
--- a/modules/engines/ms-windows/ChangeLog.old
+++ b/modules/engines/ms-windows/ChangeLog.old
@@ -11,6 +11,7 @@
 2003-10-07  Dom Lachowicz <cinamod@hotmail.com>\r
 \r
        * Added new mingw based build system, tidied up other missing bits\r
+       * src/xp_theme.c: Tidied up some return cases\r
        \r
 2003-10-07  Raymond Penners  <raymond@dotsphinx.com>\r
 \r

diff --git a/modules/engines/ms-windows/xp_theme.c b/modules/engines/ms-windows/xp_theme.c
index b529f8b1d41a4b23bbd26b8bfdbe8eb3daa84d39..378e3597263a2913f7bb4dd241f3960b800f0c36 100755 (executable)
--- a/modules/engines/ms-windows/xp_theme.c
+++ b/modules/engines/ms-windows/xp_theme.c
@@ -118,7 +118,7 @@ static DrawThemeBackgroundFunc draw_theme_background_func = NULL;
 static EnableThemeDialogTextureFunc enable_theme_dialog_texture_func = NULL;
 static IsThemeActiveFunc is_theme_active_func = NULL;
 
-static  gboolean was_theming_active = FALSE;
+static gboolean was_theming_active = FALSE;
 
 static void
 xp_theme_close_open_handles (void)
@@ -157,7 +157,6 @@ xp_theme_init (void)
     }
 }
 
-
 void
 xp_theme_reset (void)
 {
@@ -667,8 +666,6 @@ xp_theme_draw (GdkWindow *win, XpThemeElement element, GtkStyle *style,
 gboolean
 xp_theme_is_drawable (XpThemeElement element)
 {
-  gboolean ret = FALSE;
-  
   if (is_theme_active_func)
     {
       gboolean active = (*is_theme_active_func) ();
@@ -683,10 +680,11 @@ xp_theme_is_drawable (XpThemeElement element)
       
       if (active)
         {
-          ret = (xp_theme_get_handle_by_element (element) != NULL);
+          return (xp_theme_get_handle_by_element (element) != NULL);
         }
     }
-  return ret;
+
+  return FALSE;
 }
 
 gboolean