[empathy] theme-manager: we can now look up themes in the path
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] theme-manager: we can now look up themes in the path
- Date: Mon, 2 Jul 2012 12:14:03 +0000 (UTC)
commit fa00d369ea01b464f62a7835e8f61d65f94bc29f
Author: Danielle Madeley <danielle madeley collabora co uk>
Date: Fri Jun 29 14:14:45 2012 +1000
theme-manager: we can now look up themes in the path
libempathy-gtk/empathy-theme-manager.c | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index 81b15d5..13d98af 100644
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -272,7 +272,6 @@ theme_manager_migrate_from_legacy_theme (EmpathyThemeManager *self)
char *theme = g_settings_get_string (priv->gsettings_chat,
EMPATHY_PREFS_CHAT_THEME);
const char *adium_theme, *variant = "";
- char *path;
if (!tp_strdiff (theme, "adium")) {
goto finally;
@@ -291,21 +290,15 @@ theme_manager_migrate_from_legacy_theme (EmpathyThemeManager *self)
adium_theme = "Classic";
}
- path = g_strjoin (NULL, DATADIR, "/adium/message-styles/",
- adium_theme, ".AdiumMessageStyle",
- NULL);
-
- DEBUG ("Migrating to '%s' variant '%s'", path, variant);
+ DEBUG ("Migrating to '%s' variant '%s'", adium_theme, variant);
g_settings_set_string (priv->gsettings_chat,
EMPATHY_PREFS_CHAT_THEME, "adium");
g_settings_set_string (priv->gsettings_chat,
- EMPATHY_PREFS_CHAT_ADIUM_PATH, path);
+ EMPATHY_PREFS_CHAT_ADIUM_PATH, adium_theme);
g_settings_set_string (priv->gsettings_chat,
EMPATHY_PREFS_CHAT_THEME_VARIANT, variant);
- g_free (path);
-
finally:
g_free (theme);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]