Mercurial > pidgin.yaz
comparison libpurple/dbus-server.c @ 29663:af5c36fe8d6f
propagate from branch 'im.pidgin.pidgin' (head e602a35f60e3d423d43bacc72fcb7239c8b43cf0)
to branch 'im.pidgin.cpw.attention_ui' (head d6e2d83ffb82d0028d802e5959d57de1d61b4faf)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Tue, 13 Jan 2009 18:39:52 +0000 |
| parents | 2307f8124407 |
| children | 3a0552df3379 |
comparison
equal
deleted
inserted
replaced
| 29662:9ea6842536ba | 29663:af5c36fe8d6f |
|---|---|
| 801 } | 801 } |
| 802 | 802 |
| 803 void | 803 void |
| 804 purple_dbus_init(void) | 804 purple_dbus_init(void) |
| 805 { | 805 { |
| 806 if (g_thread_supported()) | |
| 807 dbus_g_thread_init(); | |
| 808 | |
| 806 purple_dbus_init_ids(); | 809 purple_dbus_init_ids(); |
| 807 | 810 |
| 808 g_free(init_error); | 811 g_free(init_error); |
| 809 init_error = NULL; | 812 init_error = NULL; |
| 810 purple_dbus_dispatch_init(); | 813 purple_dbus_dispatch_init(); |