From c7f1da6b0c91baf6b5f9362a78d18e55c94ece48 Mon Sep 17 00:00:00 2001 From: cinamod Date: Tue, 7 Oct 2003 20:11:27 +0000 Subject: [PATCH] clean up some return values in xp_theme --- modules/engines/ms-windows/ChangeLog.old | 1 + modules/engines/ms-windows/xp_theme.c | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/engines/ms-windows/ChangeLog.old b/modules/engines/ms-windows/ChangeLog.old index fb42edb47f..3201b78d04 100755 --- a/modules/engines/ms-windows/ChangeLog.old +++ b/modules/engines/ms-windows/ChangeLog.old @@ -11,6 +11,7 @@ 2003-10-07 Dom Lachowicz * Added new mingw based build system, tidied up other missing bits + * src/xp_theme.c: Tidied up some return cases 2003-10-07 Raymond Penners diff --git a/modules/engines/ms-windows/xp_theme.c b/modules/engines/ms-windows/xp_theme.c index b529f8b1d4..378e359726 100755 --- 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