diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2009-02-21 01:14:24 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2009-06-12 00:06:32 +0800 |
| commit | 5600490e9edda705b4b58720433b476c0d744115 (patch) | |
| tree | 65bd4699ce71af5b949977a37f9ad6ffc95cd51b | |
| parent | 8ab8a754b3c23bf8d8b2298fe20bc6a7ea7dac63 (diff) | |
| download | gsoc2013-empathy-5600490e9edda705b4b58720433b476c0d744115.tar gsoc2013-empathy-5600490e9edda705b4b58720433b476c0d744115.tar.gz gsoc2013-empathy-5600490e9edda705b4b58720433b476c0d744115.tar.bz2 gsoc2013-empathy-5600490e9edda705b4b58720433b476c0d744115.tar.lz gsoc2013-empathy-5600490e9edda705b4b58720433b476c0d744115.tar.xz gsoc2013-empathy-5600490e9edda705b4b58720433b476c0d744115.tar.zst gsoc2013-empathy-5600490e9edda705b4b58720433b476c0d744115.zip | |
Port to new API
| -rw-r--r-- | libempathy-gtk/empathy-theme-adium.c | 2 | ||||
| -rw-r--r-- | src/empathy-preferences.c | 2 |
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; |