Port to new API

diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index b1da87bc8a7a120858bfaaeda5aa8c0c06a6a730..b11bfa9fa8921d9c60e8e0e441c03e16e4fdace3 100644 (file)
--- 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 b74c85c6193cca7aa48aaf779eab0050348e8fea..4c88db675b528a258cfa0a11567bf023e2942252 100644 (file)
--- 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;