[Gaim-commits] SF.net SVN: gaim: [16169] trunk/src/cipher.c

[<the...@us...>]

Revision: 16169
Author:   thekingant
Date:     2006-05-09 19:27:09 -0700 (Tue, 09 May 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16169&view=rev

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/src/cipher.c
Modified: trunk/src/cipher.c
===================================================================
--- trunk/src/cipher.c	2006-05-10 01:27:51 UTC (rev 16168)
+++ trunk/src/cipher.c	2006-05-10 02:27:09 UTC (rev 16169)
@@ -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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.