/soc/2013/ankitkv/gobjectification: 8fdccc60cfde: Replace g_obje...

[Ankit Vani]

Changeset: 8fdccc60cfde19824a56478383d6a0359d0aaf23
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-06-16 06:34 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/8fdccc60cfde

Description:

Replace g_object_set_property with g_object_set where we aren't passing a GValue*

diffstat:

 libpurple/plugins/ciphertest.c               |  4 ++--
 libpurple/plugins/keyrings/internalkeyring.c |  8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (33 lines):

diff --git a/libpurple/plugins/ciphertest.c b/libpurple/plugins/ciphertest.c
--- a/libpurple/plugins/ciphertest.c
+++ b/libpurple/plugins/ciphertest.c
@@ -392,8 +392,8 @@ cipher_test_pbkdf2(void)
 
 		cipher = purple_pbkdf2_cipher_new(hash);
 
-		g_object_set_property(G_OBJECT(cipher), "iter_count", GUINT_TO_POINTER(test->iter_count));
-		g_object_set_property(G_OBJECT(cipher), "out_len", GUINT_TO_POINTER(test->out_len));
+		g_object_set(G_OBJECT(cipher), "iter_count", GUINT_TO_POINTER(test->iter_count), NULL);
+		g_object_set(G_OBJECT(cipher), "out_len", GUINT_TO_POINTER(test->out_len), NULL);
 		purple_cipher_set_salt(cipher, (const guchar*)test->salt, test->salt ? strlen(test->salt): 0);
 		purple_cipher_set_key(cipher, (const guchar*)test->passphrase, strlen(test->passphrase));
 
diff --git a/libpurple/plugins/keyrings/internalkeyring.c b/libpurple/plugins/keyrings/internalkeyring.c
--- a/libpurple/plugins/keyrings/internalkeyring.c
+++ b/libpurple/plugins/keyrings/internalkeyring.c
@@ -160,11 +160,11 @@ intkeyring_derive_key(const gchar *passp
 	hash = purple_sha256_hash_new();
 	cipher = purple_pbkdf2_cipher_new(hash);
 
-	g_object_set_property(G_OBJECT(cipher), "iter_count",
+	g_object_set(G_OBJECT(cipher), "iter_count",
 		GUINT_TO_POINTER(purple_prefs_get_int(INTKEYRING_PREFS
-		"pbkdf2_iterations")));
-	g_object_set_property(G_OBJECT(cipher), "out_len", GUINT_TO_POINTER(
-		INTKEYRING_KEY_LEN));
+		"pbkdf2_iterations")), NULL);
+	g_object_set(G_OBJECT(cipher), "out_len", GUINT_TO_POINTER(
+		INTKEYRING_KEY_LEN), NULL);
 	purple_cipher_set_salt(cipher, salt->data, salt->len);
 	purple_cipher_set_key(cipher, (const guchar*)passphrase,
 		strlen(passphrase));