Mercurial > pidgin
diff libpurple/core.c @ 18243:a8b19e002cb4
propagate from branch 'im.pidgin.pidgin' (head e9da27c3123d1223162bf9fb76f58822873e18f8)
to branch 'im.pidgin.soc.2007.remotelogging' (head da5442aedd302aafb260948b66ce0549a3e0a0e4)
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 24 Jun 2007 20:01:43 +0000 |
| parents | 73ea3328b0d1 |
| children | 9db52d9b8436 9205841eed06 |
line wrap: on
line diff
--- a/libpurple/core.c Fri Jun 22 17:36:48 2007 +0000 +++ b/libpurple/core.c Sun Jun 24 20:01:43 2007 +0000 @@ -222,11 +222,10 @@ purple_sound_uninit(); purple_plugins_uninit(); - purple_signals_uninit(); - #ifdef HAVE_DBUS purple_dbus_uninit(); #endif + purple_signals_uninit(); g_free(core->ui); g_free(core); @@ -512,7 +511,7 @@ if ((linklen = readlink(name, buf, sizeof(buf) - 1) == -1)) { - char *name_utf8 = g_filename_to_utf8(name); + char *name_utf8 = g_filename_to_utf8(name, -1, NULL, NULL, NULL); purple_debug_error("core", "Error reading symlink %s: %s. Please report this at http://developer.pidgin.im\n", name_utf8, strerror(errno)); g_free(name_utf8);