From 78d59d946c86f55986db7c2f96d882bc81bdd56a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pekka=20Geh=C3=B6r?= Date: Wed, 14 Jan 2009 12:44:46 +0200 Subject: [PATCH] clean code --- irreco/configure.ac | 2 +- irreco/debian/changelog | 2 +- irreco/src/core/irreco_background_creator_dlg.c | 5 ----- irreco/src/core/irreco_button_creator_dlg.c | 18 +++++---------- irreco/src/core/irreco_theme.c | 5 ++--- irreco/src/core/irreco_theme.h | 4 ++-- irreco/src/core/irreco_theme_creator_dlg.c | 6 ----- irreco/src/core/irreco_theme_manager_dlg.c | 4 ++-- irreco/src/core/irreco_theme_save_dlg.c | 29 +++++++------------------ 9 files changed, 22 insertions(+), 53 deletions(-) diff --git a/irreco/configure.ac b/irreco/configure.ac index b5284eeb..c337cb3d 100644 --- a/irreco/configure.ac +++ b/irreco/configure.ac @@ -1,6 +1,6 @@ -AC_INIT([irreco], [0.6.5.1]) +AC_INIT([irreco], [0.7.6.1]) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST diff --git a/irreco/debian/changelog b/irreco/debian/changelog index a122192c..eadef96a 100644 --- a/irreco/debian/changelog +++ b/irreco/debian/changelog @@ -1,4 +1,4 @@ -irreco-core (0.6.5.1) unstable; urgency=low +irreco-core (0.7.6.1) unstable; urgency=low * Fixed crash situation from ThemeDownloadDlg diff --git a/irreco/src/core/irreco_background_creator_dlg.c b/irreco/src/core/irreco_background_creator_dlg.c index 78136704..1e547c11 100644 --- a/irreco/src/core/irreco_background_creator_dlg.c +++ b/irreco/src/core/irreco_background_creator_dlg.c @@ -81,9 +81,7 @@ G_DEFINE_TYPE (IrrecoBackgroundCreatorDlg, irreco_background_creator_dlg, static void irreco_background_creator_dlg_constructed(GObject *object) { - IrrecoData *irreco_data; IrrecoBackgroundCreatorDlg *self; - GtkWidget *table; GtkWidget *frame; GtkWidget *label_name; @@ -97,9 +95,6 @@ static void irreco_background_creator_dlg_constructed(GObject *object) self = IRRECO_BACKGROUND_CREATOR_DLG(object); - irreco_data = irreco_internal_dlg_get_irreco_data(IRRECO_INTERNAL_DLG( - self)); - /* Construct dialog. */ gtk_window_set_title(GTK_WINDOW(self), _("Create a Background")); gtk_window_set_modal(GTK_WINDOW(self), TRUE); diff --git a/irreco/src/core/irreco_button_creator_dlg.c b/irreco/src/core/irreco_button_creator_dlg.c index 94c74503..45abb6c0 100644 --- a/irreco/src/core/irreco_button_creator_dlg.c +++ b/irreco/src/core/irreco_button_creator_dlg.c @@ -49,7 +49,7 @@ #define IRRECO_BUTTON_PREVIEW_WIDHT (IRRECO_SCREEN_WIDTH/5) #define IRRECO_BUTTON_PREVIEW_HEIGHT (IRRECO_SCREEN_HEIGHT/5) -#define BUTTON_LIST_DIR "/home/pekka/git/irreco/irreco/src/core/button_list.conf" +#define BUTTON_LIST_DIR "/media/mmc2/irreco/.button_list.conf" /** Loader states. */ enum { @@ -108,7 +108,6 @@ static void irreco_button_creator_dlg_constructed(GObject *object) { /* TODO: Add initialization code here */ - IrrecoData *irreco_data; IrrecoButtonCreatorDlg *self; GtkWidget *scrolled_table; GtkWidget *table; @@ -136,9 +135,6 @@ static void irreco_button_creator_dlg_constructed(GObject *object) G_OBJECT_CLASS(irreco_button_creator_dlg_parent_class)->constructed(object); self = IRRECO_BUTTON_CREATOR_DLG(object); - - irreco_data = irreco_internal_dlg_get_irreco_data(IRRECO_INTERNAL_DLG(self)); - /* Construct dialog. */ gtk_window_set_title(GTK_WINDOW(self), _("Create a Button")); gtk_window_set_modal(GTK_WINDOW(self), TRUE); @@ -185,7 +181,7 @@ static void irreco_button_creator_dlg_constructed(GObject *object) label_text_format_down = gtk_label_new(_("TextFormatDown:")); self->label_sample_text_format_up = gtk_label_new(_("Sample1")); self->label_sample_text_format_down = gtk_label_new(_("Sample2")); - label_text_padding = gtk_label_new(_("Text:Padding:")); + label_text_padding = gtk_label_new(_("TextPadding:")); label_text_h_align = gtk_label_new(_("TextHAlign:")); label_text_v_align = gtk_label_new(_("TextVAlign:")); label_size = gtk_label_new(_("ButtonSize:")); @@ -254,12 +250,12 @@ static void irreco_button_creator_dlg_constructed(GObject *object) gtk_notebook_append_page(GTK_NOTEBOOK(self->notebook), irreco_gtk_align(GTK_WIDGET(scrolled_table), 0, 0, 1, 1, 8, 8, 8, 8), - gtk_label_new("BUTTONS")); + gtk_label_new("Button")); gtk_notebook_append_page(GTK_NOTEBOOK(self->notebook), irreco_gtk_align(GTK_WIDGET( scrolled_table_settings), 0, 0, 1, 1, 8, 8, 8, 8), - gtk_label_new("SETTINGS")); + gtk_label_new("Settings")); gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(self)->vbox), self->notebook); @@ -460,16 +456,14 @@ static void fill_buttons_combobox(IrrecoButtonCreatorDlg *self) gchar **keys; gsize length; gint i=0; - GError *error = NULL; + GError *error = NULL; IRRECO_ENTER button_list = g_key_file_new(); g_key_file_load_from_file(button_list, BUTTON_LIST_DIR, G_KEY_FILE_NONE, &error); - keys = g_key_file_get_keys(button_list, "button-names", &length, &error); - for(i=0; icombobox_name), g_key_file_get_string(button_list, @@ -696,7 +690,7 @@ gboolean irreco_button_creator_dlg_run(IrrecoData *irreco_data, self->irreco_data = irreco_data; self->theme = irreco_theme; - IRRECO_PRINTF("Button: %s\n", button->name->str); + IRRECO_DEBUG("Button: %s\n", button->name->str); if (g_utf8_strlen(button->name->str, 1) >0) { /* Sets the button details */ _set_button_details(self, irreco_theme, button); diff --git a/irreco/src/core/irreco_theme.c b/irreco/src/core/irreco_theme.c index 332079ef..67548371 100644 --- a/irreco/src/core/irreco_theme.c +++ b/irreco/src/core/irreco_theme.c @@ -578,7 +578,6 @@ IrrecoTheme *irreco_theme_new_from_dir(const gchar *dir) IrrecoTheme *self = NULL; IRRECO_ENTER - self = irreco_theme_new(); irreco_theme_read(self, dir); IRRECO_RETURN_PTR(self); @@ -628,8 +627,8 @@ void irreco_theme_read(IrrecoTheme *self, const gchar *dir) } -gboolean irreco_theme_save(IrrecoTheme *self, IrrecoData *irreco_data, - const gchar *theme_path) +gboolean irreco_theme_save(IrrecoTheme *self, + const gchar *theme_path) { gboolean rvalue = FALSE; IrrecoTheme *theme; diff --git a/irreco/src/core/irreco_theme.h b/irreco/src/core/irreco_theme.h index 8241ceaf..6ac9568e 100644 --- a/irreco/src/core/irreco_theme.h +++ b/irreco/src/core/irreco_theme.h @@ -109,8 +109,8 @@ IrrecoTheme *irreco_theme_copy(IrrecoTheme *self); IrrecoTheme *theme_new_from_dir(); void irreco_theme_read(IrrecoTheme *self, const gchar *dir); IrrecoTheme *irreco_theme_new_from_dir(const gchar *dir); -gboolean irreco_theme_save(IrrecoTheme *self, IrrecoData *irreco_data, - const gchar *theme_path); +gboolean irreco_theme_save(IrrecoTheme *self, + const gchar *theme_path); #endif /* __IRRECO_THEME_H__ */ /** @} */ diff --git a/irreco/src/core/irreco_theme_creator_dlg.c b/irreco/src/core/irreco_theme_creator_dlg.c index e7957070..d6e6da78 100644 --- a/irreco/src/core/irreco_theme_creator_dlg.c +++ b/irreco/src/core/irreco_theme_creator_dlg.c @@ -119,8 +119,6 @@ G_DEFINE_TYPE(IrrecoThemeCreatorDlg, irreco_theme_creator_dlg, static void irreco_theme_creator_dlg_constructed(GObject *object) { /* TODO: Add initialization code here */ - - IrrecoData *irreco_data; IrrecoThemeCreatorDlg *self; /*About widgets*/ GtkWidget *scrolled_table; @@ -138,8 +136,6 @@ static void irreco_theme_creator_dlg_constructed(GObject *object) G_OBJECT_CLASS(irreco_theme_creator_dlg_parent_class)->constructed(object); self = IRRECO_THEME_CREATOR_DLG(object); - irreco_data = irreco_internal_dlg_get_irreco_data(IRRECO_INTERNAL_DLG(self)); - /* Construct dialog. */ gtk_window_set_title(GTK_WINDOW(self), _("Create a Theme")); gtk_window_set_modal(GTK_WINDOW(self), TRUE); @@ -575,8 +571,6 @@ irreco_theme_creator_dlg_run(GtkWindow *parent_window, IrrecoData *irreco_data, gint response; gboolean loop = TRUE; gboolean rvalue = FALSE; - /*GtkTextIter startiter; - GtkTextIter enditer;*/ IRRECO_ENTER self = (IrrecoThemeCreatorDlg*)irreco_theme_creator_dlg_new(irreco_data, diff --git a/irreco/src/core/irreco_theme_manager_dlg.c b/irreco/src/core/irreco_theme_manager_dlg.c index 314c1e9a..7a32550f 100644 --- a/irreco/src/core/irreco_theme_manager_dlg.c +++ b/irreco/src/core/irreco_theme_manager_dlg.c @@ -917,9 +917,9 @@ static void irreco_theme_manager_dlg_new_theme(GtkButton *button, gchar *rm_dir; gchar *temp_dir; /* Create temp theme folder */ - temp_dir = g_strconcat("cp -f -r ", self->theme->path->str, " ", + temp_dir = g_strconcat("cp -r ", self->theme->path->str, " ", "/media/mmc2/irreco/irreco_temp", NULL); - rm_dir = g_strconcat("rm -f -r ", + rm_dir = g_strconcat("rm -r ", "/media/mmc2/irreco/irreco_temp", NULL); /* Delete temp dir */ if (irreco_is_dir("/media/mmc2/irreco/irreco_temp")) { diff --git a/irreco/src/core/irreco_theme_save_dlg.c b/irreco/src/core/irreco_theme_save_dlg.c index 08c62c65..cef3b4cd 100644 --- a/irreco/src/core/irreco_theme_save_dlg.c +++ b/irreco/src/core/irreco_theme_save_dlg.c @@ -28,8 +28,7 @@ /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ /* Prototypes */ /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ -gboolean _save_theme_to_dir(IrrecoThemeSaveDlg *self, IrrecoData *irreco_data, - IrrecoTheme *irreco_theme); +gboolean _save_theme_to_dir(IrrecoThemeSaveDlg *self); /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ /* Construction & Destruction */ /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-*/ @@ -46,7 +45,6 @@ G_DEFINE_TYPE (IrrecoThemeSaveDlg, irreco_theme_save_dlg, static void irreco_theme_save_dlg_constructed(GObject *object) { - IrrecoData *irreco_data; IrrecoThemeSaveDlg *self; GtkWidget *label; @@ -57,9 +55,6 @@ static void irreco_theme_save_dlg_constructed(GObject *object) self = IRRECO_THEME_SAVE_DLG(object); - irreco_data = irreco_internal_dlg_get_irreco_data(IRRECO_INTERNAL_DLG( - self)); - /* Construct dialog. */ gtk_window_set_title(GTK_WINDOW(self), _("Theme Save")); gtk_window_set_modal(GTK_WINDOW(self), TRUE); @@ -163,14 +158,12 @@ irreco_theme_save_dlg_create(IrrecoData *irreco_data, GtkWindow *parent_window) * @{ */ -gboolean _save_theme_to_dir(IrrecoThemeSaveDlg *self, IrrecoData *irreco_data, - IrrecoTheme *irreco_theme) +gboolean _save_theme_to_dir(IrrecoThemeSaveDlg *self) { - gboolean rvalue = FALSE; GString *theme_path; gchar *folder = NULL; - IrrecoThemeManager *theme_manager = irreco_data->theme_manager; + IrrecoThemeManager *theme_manager = self->irreco_data->theme_manager; IrrecoTheme *same_theme = NULL; gint delete_mode = 0; gchar *same_theme_folder = NULL; @@ -179,11 +172,9 @@ gboolean _save_theme_to_dir(IrrecoThemeSaveDlg *self, IrrecoData *irreco_data, gchar *redy_theme_name; IRRECO_ENTER - /* Create Theme Folder */ - theme_path = g_string_new(""); - theme_name = g_string_new(irreco_theme->name->str); + theme_name = g_string_new(self->theme->name->str); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self->radio1))) { folder = "/media/mmc1/irreco/"; @@ -210,7 +201,7 @@ gboolean _save_theme_to_dir(IrrecoThemeSaveDlg *self, IrrecoData *irreco_data, IRRECO_STRING_TABLE_FOREACH_DATA(theme_manager->themes, IrrecoTheme *, theme) /*Check theme name*/ - if (g_str_equal(irreco_theme->name->str, + if (g_str_equal(self->theme->name->str, theme->name->str)) { if (g_str_equal(theme->source->str, "deb")) { g_string_printf(message, @@ -219,7 +210,6 @@ gboolean _save_theme_to_dir(IrrecoThemeSaveDlg *self, IrrecoData *irreco_data, "Please remove it first from the\n" "Application Manager or change the name of the theme"), theme->name->str); - irreco_error_dlg(GTK_WINDOW(self), message->str); goto end; @@ -284,7 +274,7 @@ gboolean _save_theme_to_dir(IrrecoThemeSaveDlg *self, IrrecoData *irreco_data, } if (delete_mode == 2 || delete_mode == 3) { irreco_theme_manager_remove_theme( - irreco_data->theme_manager, + self->irreco_data->theme_manager, same_theme_folder); g_free(same_theme_folder); } @@ -294,7 +284,7 @@ gboolean _save_theme_to_dir(IrrecoThemeSaveDlg *self, IrrecoData *irreco_data, g_mkdir(theme_path->str, 0777); /*Create new theme*/ - irreco_theme_save(irreco_theme, irreco_data, theme_path->str); + irreco_theme_save(self->theme, theme_path->str); rvalue = TRUE; @@ -333,15 +323,12 @@ irreco_theme_save_dlg_run(IrrecoData *irreco_data, IrrecoTheme *irreco_theme, self->irreco_data = irreco_data; self->theme = irreco_theme; - - do { response = gtk_dialog_run(GTK_DIALOG(self)); switch (response) { case GTK_RESPONSE_OK: - if (_save_theme_to_dir(self, irreco_data, - irreco_theme)) { + if (_save_theme_to_dir(self)) { loop = FALSE; rvalue = TRUE; } else { -- 2.11.4.GIT