/soc/2013/ankitkv/gobjectification: 21864c2f543f: Removed g_obje...
Ankit Vani
a at nevitus.org
Fri Oct 11 07:25:53 EDT 2013
Changeset: 21864c2f543fb7c38204aa3d2faf69804874026d
Author: Ankit Vani <a at nevitus.org>
Date: 2013-10-11 15:34 +0530
Branch: soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/21864c2f543f
Description:
Removed g_object_notify calls from ciphers and hashes
diffstat:
libpurple/ciphers/aescipher.c | 8 +-------
libpurple/ciphers/des3cipher.c | 6 ------
libpurple/ciphers/descipher.c | 2 --
libpurple/ciphers/hmaccipher.c | 1 -
libpurple/ciphers/pbkdf2cipher.c | 1 -
libpurple/ciphers/rc4cipher.c | 4 ----
6 files changed, 1 insertions(+), 21 deletions(-)
diffs (118 lines):
diff --git a/libpurple/ciphers/aescipher.c b/libpurple/ciphers/aescipher.c
--- a/libpurple/ciphers/aescipher.c
+++ b/libpurple/ciphers/aescipher.c
@@ -105,8 +105,6 @@ purple_aes_cipher_set_iv(PurpleCipher *c
memset(priv->iv, 0, sizeof(priv->iv));
else
memcpy(priv->iv, iv, len);
-
- g_object_notify(G_OBJECT(cipher), "iv");
}
static void
@@ -125,8 +123,6 @@ purple_aes_cipher_set_key(PurpleCipher *
memset(priv->key, 0, sizeof(priv->key));
if (len > 0)
memcpy(priv->key, key, len);
-
- g_object_notify(G_OBJECT(cipher), "key");
}
static guchar *
@@ -507,10 +503,8 @@ purple_aes_cipher_set_batch_mode(PurpleC
{
PurpleAESCipherPrivate *priv = PURPLE_AES_CIPHER_GET_PRIVATE(cipher);
- if (mode == PURPLE_CIPHER_BATCH_MODE_CBC) {
- g_object_notify(G_OBJECT(cipher), "batch_mode");
+ if (mode == PURPLE_CIPHER_BATCH_MODE_CBC)
return;
- }
purple_debug_error("cipher-aes", "unsupported batch mode\n");
priv->failure = TRUE;
diff --git a/libpurple/ciphers/des3cipher.c b/libpurple/ciphers/des3cipher.c
--- a/libpurple/ciphers/des3cipher.c
+++ b/libpurple/ciphers/des3cipher.c
@@ -100,8 +100,6 @@ purple_des3_cipher_set_key(PurpleCipher
purple_cipher_get_key_size(PURPLE_CIPHER(priv->key2)));
purple_cipher_set_key(PURPLE_CIPHER(priv->key3), key + 16,
purple_cipher_get_key_size(PURPLE_CIPHER(priv->key3)));
-
- g_object_notify(G_OBJECT(des3_cipher), "key");
}
static ssize_t
@@ -353,8 +351,6 @@ purple_des3_cipher_set_batch_mode(Purple
PurpleDES3CipherPrivate *priv = PURPLE_DES3_CIPHER_GET_PRIVATE(des3_cipher);
priv->mode = mode;
-
- g_object_notify(G_OBJECT(des3_cipher), "batch_mode");
}
static PurpleCipherBatchMode
@@ -375,8 +371,6 @@ purple_des3_cipher_set_iv(PurpleCipher *
g_return_if_fail(len == 8);
memcpy(priv->iv, iv, len);
-
- g_object_notify(G_OBJECT(des3_cipher), "iv");
}
/******************************************************************************
diff --git a/libpurple/ciphers/descipher.c b/libpurple/ciphers/descipher.c
--- a/libpurple/ciphers/descipher.c
+++ b/libpurple/ciphers/descipher.c
@@ -382,8 +382,6 @@ purple_des_cipher_set_key(PurpleCipher *
priv->decrypt_subkeys[i] = priv->encrypt_subkeys[30 - i];
priv->decrypt_subkeys[i + 1] = priv->encrypt_subkeys[31 - i];
}
-
- g_object_notify(G_OBJECT(cipher), "key");
}
static size_t
diff --git a/libpurple/ciphers/hmaccipher.c b/libpurple/ciphers/hmaccipher.c
--- a/libpurple/ciphers/hmaccipher.c
+++ b/libpurple/ciphers/hmaccipher.c
@@ -59,7 +59,6 @@ purple_hmac_cipher_set_hash(PurpleCipher
PurpleHMACCipherPrivate *priv = PURPLE_HMAC_CIPHER_GET_PRIVATE(cipher);
priv->hash = g_object_ref(G_OBJECT(hash));
- g_object_notify(G_OBJECT(cipher), "hash");
}
/*******************************************************************************
diff --git a/libpurple/ciphers/pbkdf2cipher.c b/libpurple/ciphers/pbkdf2cipher.c
--- a/libpurple/ciphers/pbkdf2cipher.c
+++ b/libpurple/ciphers/pbkdf2cipher.c
@@ -72,7 +72,6 @@ purple_pbkdf2_cipher_set_hash(PurpleCiph
PurplePBKDF2CipherPrivate *priv = PURPLE_PBKDF2_CIPHER_GET_PRIVATE(cipher);
priv->hash = g_object_ref(G_OBJECT(hash));
- g_object_notify(G_OBJECT(cipher), "hash");
}
/******************************************************************************
diff --git a/libpurple/ciphers/rc4cipher.c b/libpurple/ciphers/rc4cipher.c
--- a/libpurple/ciphers/rc4cipher.c
+++ b/libpurple/ciphers/rc4cipher.c
@@ -88,8 +88,6 @@ purple_rc4_cipher_set_key(PurpleCipher *
state[y] = temp_swap;
x = (x + 1) % len;
}
-
- g_object_notify(G_OBJECT(rc4_cipher), "key");
}
static ssize_t
@@ -242,8 +240,6 @@ purple_rc4_cipher_set_key_len(PurpleRC4C
priv = PURPLE_RC4_CIPHER_GET_PRIVATE(rc4_cipher);
priv->key_len = key_len;
-
- g_object_notify(G_OBJECT(rc4_cipher), "key_len");
}
gint
More information about the Commits
mailing list