aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy-gtk/empathy-theme-adium.c2
-rw-r--r--src/empathy-preferences.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index b1da87bc8..b11bfa9fa 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -752,7 +752,7 @@ empathy_theme_adium_init (EmpathyThemeAdium *theme)
theme->priv = priv;
- priv->smiley_manager = empathy_smiley_manager_new ();
+ priv->smiley_manager = empathy_smiley_manager_dup_singleton ();
g_signal_connect (theme, "load-finished",
G_CALLBACK (theme_adium_load_finished_cb),
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index b74c85c61..4c88db675 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -974,7 +974,7 @@ preferences_theme_adium_path_notify_cb (EmpathyConf *conf,
return;
}
- if (G_STR_EMPTY (value)) {
+ if (EMP_STR_EMPTY (value)) {
path = g_get_home_dir ();
} else {
path = value;