# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1147228029 0
# Node ID ff94569010f56e29eac0f6df886c9574da256cbb
# Parent  164932c4d050fd226ab7ccf0db9ebfc090cb4673
[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>

diff -r 164932c4d050 -r ff94569010f5 src/cipher.c
--- 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;