From 47c8622c8cf8c28c02225e056954327738bf6bfd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Pekka=20Geh=C3=B6r?= <pegu6@msn.com>
Date: Thu, 22 Jan 2009 09:09:41 +0200
Subject: [PATCH] Clean code

---
 irreco/src/core/irreco_theme_manager_dlg.c | 47 ++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/irreco/src/core/irreco_theme_manager_dlg.c b/irreco/src/core/irreco_theme_manager_dlg.c
index 01fb1d92..f6b2eb62 100644
--- a/irreco/src/core/irreco_theme_manager_dlg.c
+++ b/irreco/src/core/irreco_theme_manager_dlg.c
@@ -44,7 +44,7 @@
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
 #define IRRECO_BACKGROUND_PREVIEW_WIDHT		(IRRECO_SCREEN_WIDTH / 6)
 #define IRRECO_BACKGROUND_PREVIEW_HEIGHT	(IRRECO_SCREEN_HEIGHT / 6)
-
+#define IRRECO_DEFAULT_BG  (IRRECO_BG_IMAGE_DIR "/" IRRECO_DEFAULT_BG_IMAGE)
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/
 /* Prototypes                                                                 */
@@ -895,6 +895,10 @@ static void irreco_theme_manager_dlg_upload_theme(GtkButton *button,
 	IRRECO_RETURN
 }
 
+/**
+ * Check layouts
+ *
+ */
 
 void irreco_theme_manager_dlg_set_layout_button(IrrecoThemeManagerDlg *self)
 {
@@ -910,6 +914,7 @@ void irreco_theme_manager_dlg_set_layout_button(IrrecoThemeManagerDlg *self)
 	bg_mmc = g_string_new(NULL);
 	table = self->irreco_data->irreco_layout_array;
 
+	/* Check layouts buttons */
 	IRRECO_STRING_TABLE_FOREACH_DATA(self->theme->buttons,
 					 IrrecoThemeButton *, temp_button)
 
@@ -957,27 +962,51 @@ void irreco_theme_manager_dlg_set_layout_button(IrrecoThemeManagerDlg *self)
 
 				IRRECO_PTR_ARRAY_FORWARDS_END
 
+			IRRECO_STRING_TABLE_FOREACH_END
+		}
+	IRRECO_STRING_TABLE_FOREACH_END
+
+	/* Check layouts bg:s */
+	IRRECO_STRING_TABLE_FOREACH_DATA(self->theme->backgrounds,
+					 IrrecoThemeBg *, temp_bg)
+
+		if (!irreco_is_file(temp_bg->image_name->str)) {
+
+			IRRECO_STRING_TABLE_FOREACH(table, key,
+						    IrrecoButtonLayout *,
+	  					    layout)
 				g_string_printf(bg_mmc, "%s" ,
-						irreco_button_layout_get_bg_image(layout));
+					irreco_button_layout_get_bg_image(
+					layout));
 
 				g_string_erase(bg_mmc, 10, 1);
 				g_string_insert_c(bg_mmc, 10, 1);
+				/* Check mmc1 */
 				if (irreco_is_file(bg_mmc->str)) {
 
-					irreco_button_layout_set_bg_image(layout,
-									 bg_mmc->str);
-				} else {
-					g_string_erase(bg_mmc, 10, 1);
-					g_string_insert_c(bg_mmc, 10, 2);
-					irreco_button_layout_set_bg_image(layout,
-									 bg_mmc->str);
+					irreco_button_layout_set_bg_image(
+							layout, bg_mmc->str);
 				}
 
+				g_string_erase(bg_mmc, 10, 1);
+				g_string_insert_c(bg_mmc, 10, 2);
+				/* Check mmc2 */
+				if (irreco_is_file(bg_mmc->str)) {
 
+					irreco_button_layout_set_bg_image(
+							layout, bg_mmc->str);
+				} else {
+					irreco_button_layout_set_bg_image(
+							layout,
+       							IRRECO_DEFAULT_BG);
+				}
 			IRRECO_STRING_TABLE_FOREACH_END
 		}
+
 	IRRECO_STRING_TABLE_FOREACH_END
 
+	irreco_config_save_layouts(self->irreco_data);
+
 	g_string_free(bg_mmc, TRUE);
 	if (un_mmc1 != NULL) g_free(un_mmc1);
 	if (un_mmc2 != NULL) g_free(un_mmc2);
-- 
2.11.4.GIT