From 409c23a382f6f4cb737f2c9a7abf456cb772080c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pekka=20Geh=C3=B6r?= Date: Fri, 16 Jan 2009 09:28:56 +0200 Subject: [PATCH] modified irreco_theme_button_read() functio --- irreco/src/core/irreco_theme_button.c | 9 ++++----- irreco/src/core/irreco_theme_button.h | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/irreco/src/core/irreco_theme_button.c b/irreco/src/core/irreco_theme_button.c index 39b0bdb9..448772bd 100644 --- a/irreco/src/core/irreco_theme_button.c +++ b/irreco/src/core/irreco_theme_button.c @@ -238,13 +238,12 @@ irreco_theme_button_new_from_dir(const gchar *dir, const gchar *theme_name) IRRECO_ENTER - self = irreco_theme_button_new(NULL); - irreco_theme_button_read(self, dir, theme_name); + self = irreco_theme_button_new(theme_name); + irreco_theme_button_read(self, dir); IRRECO_RETURN_PTR(self); } -void irreco_theme_button_read(IrrecoThemeButton *self, const gchar *dir, - const gchar *theme_name) +void irreco_theme_button_read(IrrecoThemeButton *self, const gchar *dir) { IrrecoKeyFile *keyfile; GString *conf = NULL; @@ -257,7 +256,7 @@ void irreco_theme_button_read(IrrecoThemeButton *self, const gchar *dir, gint text_padding = 5; gfloat text_h_align = 0.5; gfloat text_v_align = 0.5; - GString *style_name = g_string_new(theme_name); + GString *style_name = g_string_new(self->theme_name->str); IRRECO_ENTER conf = g_string_new(dir); diff --git a/irreco/src/core/irreco_theme_button.h b/irreco/src/core/irreco_theme_button.h index 4dc791ec..5803ebd8 100644 --- a/irreco/src/core/irreco_theme_button.h +++ b/irreco/src/core/irreco_theme_button.h @@ -99,8 +99,7 @@ void irreco_theme_button_set_from_button(IrrecoThemeButton *self, IrrecoThemeButton *button); IrrecoThemeButton * irreco_theme_button_new_from_dir(const gchar *dir, const gchar *theme_name); -void irreco_theme_button_read(IrrecoThemeButton *self, const gchar *dir, - const gchar *theme_name); +void irreco_theme_button_read(IrrecoThemeButton *self, const gchar *dir); void irreco_theme_button_print(IrrecoThemeButton *self); IrrecoThemeButton *irreco_theme_button_copy(IrrecoThemeButton *self); gboolean -- 2.11.4.GIT