Mercurial > pidgin.yaz
changeset 17548:95203f9325a3
merge of '65a2625990bbafe0f7d435e23be894ec9a7dc189'
and '9000e0be743fc6ffde1eb0eff1f861bbdaec9a06'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Fri, 01 Jun 2007 00:50:19 +0000 |
| parents | 42444b7071d3 (diff) bfdc5995d54a (current diff) |
| children | c1d67fef5eb3 c5663c1d146f |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/sync.c Fri Jun 01 00:49:26 2007 +0000 +++ b/libpurple/protocols/msn/sync.c Fri Jun 01 00:50:19 2007 +0000 @@ -195,6 +195,8 @@ user = sync->last_user; + g_return_if_fail(user != NULL); + type = cmd->params[0]; value = cmd->params[1];
--- a/pidgin/gtkmain.c Fri Jun 01 00:49:26 2007 +0000 +++ b/pidgin/gtkmain.c Fri Jun 01 00:50:19 2007 +0000 @@ -473,6 +473,9 @@ #else debug_enabled = FALSE; #endif + + /* This is the first Glib function call. Make sure to initialize GThread bfeore then */ + g_thread_init(NULL); #ifdef ENABLE_NLS bindtextdomain(PACKAGE, LOCALEDIR);