aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2012-06-29 12:14:45 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-07-02 16:03:23 +0800
commitfa00d369ea01b464f62a7835e8f61d65f94bc29f (patch)
tree2a3839eeccfa85b1bab412864cd4a0e133fb617c
parent518d54667e1934f0e339e3368d77cfc953a34314 (diff)
downloadgsoc2013-empathy-fa00d369ea01b464f62a7835e8f61d65f94bc29f.tar
gsoc2013-empathy-fa00d369ea01b464f62a7835e8f61d65f94bc29f.tar.gz
gsoc2013-empathy-fa00d369ea01b464f62a7835e8f61d65f94bc29f.tar.bz2
gsoc2013-empathy-fa00d369ea01b464f62a7835e8f61d65f94bc29f.tar.lz
gsoc2013-empathy-fa00d369ea01b464f62a7835e8f61d65f94bc29f.tar.xz
gsoc2013-empathy-fa00d369ea01b464f62a7835e8f61d65f94bc29f.tar.zst
gsoc2013-empathy-fa00d369ea01b464f62a7835e8f61d65f94bc29f.zip
theme-manager: we can now look up themes in the path
-rw-r--r--libempathy-gtk/empathy-theme-manager.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index 81b15d5ca..13d98af73 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);
}