Mercurial > pidgin.yaz
changeset 13758:ff94569010f5
[gaim-migrate @ 16169]
This should eliminate an assertion failure when the cipher
code initializes and you're using Dbus. The cipher code
was not registering the cipher with Dbus. It's all good,
brother.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Wed, 10 May 2006 02:27:09 +0000 |
| parents | 164932c4d050 |
| children | a849cf259d00 |
| files | src/cipher.c |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cipher.c Wed May 10 01:27:51 2006 +0000 +++ b/src/cipher.c Wed May 10 02:27:09 2006 +0000 @@ -56,6 +56,7 @@ #include "internal.h" #include "cipher.h" +#include "dbus-maybe.h" #include "debug.h" #include "signals.h" #include "value.h" @@ -1380,6 +1381,7 @@ g_return_val_if_fail(!gaim_ciphers_find_cipher(name), NULL); cipher = g_new0(GaimCipher, 1); + GAIM_DBUS_REGISTER_POINTER(cipher, GaimCipher); cipher->name = g_strdup(name); cipher->ops = ops; @@ -1401,6 +1403,8 @@ ciphers = g_list_remove(ciphers, cipher); g_free(cipher->name); + + GAIM_DBUS_UNREGISTER_POINTER(cipher); g_free(cipher); return TRUE;