Mercurial > pidgin3 / changeset

changeset

Merged soc.2013.gobjectification branch soc.2013.gobjectification.plugins

Fri, 11 Oct 2013 15:54:01 +0530

author
Ankit Vani <a@nevitus.org>
date
Fri, 11 Oct 2013 15:54:01 +0530
branch
soc.2013.gobjectification.plugins
changeset 36872
c0099fc27ace
parent 36871
8da5914b107a (current diff)
parent 35015
e13433a4fd88 (diff)
child 36873
8a1a06af7895

Merged soc.2013.gobjectification branch

libpurple/connection.c file | annotate | diff | comparison | revisions
libpurple/conversation.c file | annotate | diff | comparison | revisions
libpurple/conversationtypes.c file | annotate | diff | comparison | revisions
libpurple/presence.c file | annotate | diff | comparison | revisions
libpurple/roomlist.c file | annotate | diff | comparison | revisions
libpurple/status.c file | annotate | diff | comparison | revisions
libpurple/whiteboard.c file | annotate | diff | comparison | revisions
libpurple/xfer.c file | annotate | diff | comparison | revisions 
--- a/libpurple/ciphers/aescipher.c	Fri Oct 11 03:11:37 2013 +0530
+++ b/libpurple/ciphers/aescipher.c	Fri Oct 11 15:54:01 2013 +0530
@@ -105,8 +105,6 @@
 		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 @@
 	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 @@
 {
 	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;
--- a/libpurple/ciphers/des3cipher.c	Fri Oct 11 03:11:37 2013 +0530
+++ b/libpurple/ciphers/des3cipher.c	Fri Oct 11 15:54:01 2013 +0530
@@ -100,8 +100,6 @@
 					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 @@
 	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 @@
 	g_return_if_fail(len == 8);
 
 	memcpy(priv->iv, iv, len);
-
-	g_object_notify(G_OBJECT(des3_cipher), "iv");
 }
 
 /******************************************************************************
--- a/libpurple/ciphers/descipher.c	Fri Oct 11 03:11:37 2013 +0530
+++ b/libpurple/ciphers/descipher.c	Fri Oct 11 15:54:01 2013 +0530
@@ -382,8 +382,6 @@
 		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
--- a/libpurple/ciphers/hmaccipher.c	Fri Oct 11 03:11:37 2013 +0530
+++ b/libpurple/ciphers/hmaccipher.c	Fri Oct 11 15:54:01 2013 +0530
@@ -59,7 +59,6 @@
 	PurpleHMACCipherPrivate *priv = PURPLE_HMAC_CIPHER_GET_PRIVATE(cipher);
 
 	priv->hash = g_object_ref(G_OBJECT(hash));
-	g_object_notify(G_OBJECT(cipher), "hash");
 }
 
 /*******************************************************************************
--- a/libpurple/ciphers/pbkdf2cipher.c	Fri Oct 11 03:11:37 2013 +0530
+++ b/libpurple/ciphers/pbkdf2cipher.c	Fri Oct 11 15:54:01 2013 +0530
@@ -72,7 +72,6 @@
 	PurplePBKDF2CipherPrivate *priv = PURPLE_PBKDF2_CIPHER_GET_PRIVATE(cipher);
 
 	priv->hash = g_object_ref(G_OBJECT(hash));
-	g_object_notify(G_OBJECT(cipher), "hash");
 }
 
 /******************************************************************************
--- a/libpurple/ciphers/rc4cipher.c	Fri Oct 11 03:11:37 2013 +0530
+++ b/libpurple/ciphers/rc4cipher.c	Fri Oct 11 15:54:01 2013 +0530
@@ -88,8 +88,6 @@
 		state[y] = temp_swap;
 		x = (x + 1) % len;
 	}
-
-	g_object_notify(G_OBJECT(rc4_cipher), "key");
 }
 
 static ssize_t
@@ -242,8 +240,6 @@
 
 	priv = PURPLE_RC4_CIPHER_GET_PRIVATE(rc4_cipher);
 	priv->key_len = key_len;
-
-	g_object_notify(G_OBJECT(rc4_cipher), "key_len");
 }
 
 gint
--- a/libpurple/connection.c	Fri Oct 11 03:11:37 2013 +0530
+++ b/libpurple/connection.c	Fri Oct 11 15:54:01 2013 +0530
@@ -241,6 +241,8 @@
 		if (ops != NULL && ops->disconnected != NULL)
 			ops->disconnected(gc);
 	}
+
+	g_object_notify(G_OBJECT(gc), "state");
 }
 
 void
@@ -251,6 +253,8 @@
 	g_return_if_fail(priv != NULL);
 
 	priv->flags = flags;
+
+	g_object_notify(G_OBJECT(gc), "flags");
 }
 
 void
@@ -262,6 +266,8 @@
 
 	g_free(priv->display_name);
 	priv->display_name = g_strdup(name);
+
+	g_object_notify(G_OBJECT(gc), "display-name");
 }
 
 void
@@ -587,13 +593,6 @@
 /**************************************************************************
  * GObject code
  **************************************************************************/
-/* GObject Property names */
-#define PROP_PROTOCOL_S      "protocol"
-#define PROP_FLAGS_S         "flags"
-#define PROP_STATE_S         "state"
-#define PROP_ACCOUNT_S       "account"
-#define PROP_PASSWORD_S      "password"
-#define PROP_DISPLAY_NAME_S  "display-name"
 
 /* Set method for GObject properties */
 static void
@@ -682,7 +681,7 @@
 
 	G_OBJECT_CLASS(parent_class)->constructed(object);
 
-	g_object_get(gc, PROP_ACCOUNT_S, &account, NULL);
+	g_object_get(gc, "account", &account, NULL);
 	purple_account_set_connection(account, gc);
 	g_object_unref(account);
 
@@ -774,40 +773,40 @@
 	obj_class->set_property = purple_connection_set_property;
 
 	g_object_class_install_property(obj_class, PROP_PROTOCOL,
-			g_param_spec_object(PROP_PROTOCOL_S, _("Protocol"),
+			g_param_spec_object("protocol", _("Protocol"),
 				_("The protocol that the connection is using."),
 				PURPLE_TYPE_PROTOCOL,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)
 			);
 
 	g_object_class_install_property(obj_class, PROP_FLAGS,
-			g_param_spec_flags(PROP_FLAGS_S, _("Connection flags"),
+			g_param_spec_flags("flags", _("Connection flags"),
 				_("The flags of the connection."),
 				PURPLE_TYPE_CONNECTION_FLAGS, 0,
 				G_PARAM_READWRITE)
 			);
 
 	g_object_class_install_property(obj_class, PROP_STATE,
-			g_param_spec_enum(PROP_STATE_S, _("Connection state"),
+			g_param_spec_enum("state", _("Connection state"),
 				_("The current state of the connection."),
 				PURPLE_TYPE_CONNECTION_STATE, PURPLE_CONNECTION_DISCONNECTED,
 				G_PARAM_READWRITE)
 			);
 
 	g_object_class_install_property(obj_class, PROP_ACCOUNT,
-			g_param_spec_object(PROP_ACCOUNT_S, _("Account"),
+			g_param_spec_object("account", _("Account"),
 				_("The account using the connection."), PURPLE_TYPE_ACCOUNT,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)
 			);
 
 	g_object_class_install_property(obj_class, PROP_PASSWORD,
-			g_param_spec_string(PROP_PASSWORD_S, _("Password"),
+			g_param_spec_string("password", _("Password"),
 				_("The password used for connection."), NULL,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)
 			);
 
 	g_object_class_install_property(obj_class, PROP_DISPLAY_NAME,
-			g_param_spec_string(PROP_DISPLAY_NAME_S, _("Display name"),
+			g_param_spec_string("display-name", _("Display name"),
 				_("Your name that appears to other people."), NULL,
 				G_PARAM_READWRITE)
 			);
@@ -888,9 +887,9 @@
 				password);
 	else
 		gc = g_object_new(PURPLE_TYPE_CONNECTION,
-				PROP_PROTOCOL_S,  protocol,
-				PROP_ACCOUNT_S,   account,
-				PROP_PASSWORD_S,  password,
+				"protocol",  protocol,
+				"account",   account,
+				"password",  password,
 				NULL);
 
 	g_return_if_fail(gc != NULL);
@@ -955,9 +954,9 @@
 				password);
 	else
 		gc = g_object_new(PURPLE_TYPE_CONNECTION,
-				PROP_PROTOCOL_S,  protocol,
-				PROP_ACCOUNT_S,   account,
-				PROP_PASSWORD_S,  password,
+				"protocol",  protocol,
+				"account",   account,
+				"password",  password,
 				NULL);
 
 	g_return_if_fail(gc != NULL);
--- a/libpurple/conversation.c	Fri Oct 11 03:11:37 2013 +0530
+++ b/libpurple/conversation.c	Fri Oct 11 15:54:01 2013 +0530
@@ -425,6 +425,8 @@
 	priv->name = g_strdup(name);
 
 	purple_conversation_autoset_title(conv);
+
+	purple_conversation_update(conv, PURPLE_CONVERSATION_UPDATE_NAME);
 }
 
 const char *
@@ -908,13 +910,6 @@
  * GObject code
  **************************************************************************/
 
-/* GObject Property names */
-#define PROP_ACCOUNT_S   "account"
-#define PROP_NAME_S      "name"
-#define PROP_TITLE_S     "title"
-#define PROP_LOGGING_S   "logging"
-#define PROP_FEATURES_S  "features"
-
 /* Set method for GObject properties */
 static void
 purple_conversation_set_property(GObject *obj, guint param_id, const GValue *value,
@@ -987,7 +982,7 @@
 
 	parent_class->constructed(object);
 
-	g_object_get(object, PROP_ACCOUNT_S, &account, NULL);
+	g_object_get(object, "account", &account, NULL);
 	gc = purple_account_get_connection(account);
 
 	/* copy features from the connection. */
@@ -1061,31 +1056,31 @@
 	obj_class->set_property = purple_conversation_set_property;
 
 	g_object_class_install_property(obj_class, PROP_ACCOUNT,
-			g_param_spec_object(PROP_ACCOUNT_S, _("Account"),
+			g_param_spec_object("account", _("Account"),
 				_("The account for the conversation."), PURPLE_TYPE_ACCOUNT,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT)
 			);
 
 	g_object_class_install_property(obj_class, PROP_NAME,
-			g_param_spec_string(PROP_NAME_S, _("Name"),
+			g_param_spec_string("name", _("Name"),
 				_("The name of the conversation."), NULL,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT)
 			);
 
 	g_object_class_install_property(obj_class, PROP_TITLE,
-			g_param_spec_string(PROP_TITLE_S, _("Title"),
+			g_param_spec_string("title", _("Title"),
 				_("The title of the conversation."), NULL,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT)
 			);
 
 	g_object_class_install_property(obj_class, PROP_LOGGING,
-			g_param_spec_boolean(PROP_LOGGING_S, _("Logging status"),
+			g_param_spec_boolean("logging", _("Logging status"),
 				_("Whether logging is enabled or not."), FALSE,
 				G_PARAM_READWRITE)
 			);
 
 	g_object_class_install_property(obj_class, PROP_FEATURES,
-			g_param_spec_flags(PROP_FEATURES_S, _("Connection features"),
+			g_param_spec_flags("features", _("Connection features"),
 				_("The connection features of the conversation."),
 				PURPLE_TYPE_CONNECTION_FLAGS, 0,
 				G_PARAM_READWRITE)
--- a/libpurple/conversation.h	Fri Oct 11 03:11:37 2013 +0530
+++ b/libpurple/conversation.h	Fri Oct 11 15:54:01 2013 +0530
@@ -72,6 +72,7 @@
 	PURPLE_CONVERSATION_ACCOUNT_OFFLINE, /**< One of the user's accounts went offline. */
 	PURPLE_CONVERSATION_UPDATE_AWAY,     /**< The other user went away.                */
 	PURPLE_CONVERSATION_UPDATE_ICON,     /**< The other user's buddy icon changed.     */
+	PURPLE_CONVERSATION_UPDATE_NAME,
 	PURPLE_CONVERSATION_UPDATE_TITLE,
 	PURPLE_CONVERSATION_UPDATE_CHATLEFT,
 
--- a/libpurple/conversationtypes.c	Fri Oct 11 03:11:37 2013 +0530
+++ b/libpurple/conversationtypes.c	Fri Oct 11 15:54:01 2013 +0530
@@ -119,7 +119,6 @@
 	CU_PROP_CHAT,
 	CU_PROP_NAME,
 	CU_PROP_ALIAS,
-	CU_PROP_BUDDY,
 	CU_PROP_FLAGS,
 	CU_PROP_LAST
 };
@@ -374,10 +373,6 @@
  * GObject code for IMs
  **************************************************************************/
 
-/* GObject Property names */
-#define IM_PROP_TYPING_STATE_S  "typing-state"
-#define IM_PROP_ICON_S          "icon"
-
 /* Set method for GObject properties */
 static void
 purple_im_conversation_set_property(GObject *obj, guint param_id, const GValue *value,
@@ -516,14 +511,14 @@
 	conv_class->write_message = im_conversation_write_message;
 
 	g_object_class_install_property(obj_class, IM_PROP_TYPING_STATE,
-			g_param_spec_enum(IM_PROP_TYPING_STATE_S, _("Typing state"),
+			g_param_spec_enum("typing-state", _("Typing state"),
 				_("Status of the user's typing of a message."),
 				PURPLE_TYPE_IM_TYPING_STATE, PURPLE_IM_NOT_TYPING,
 				G_PARAM_READWRITE)
 			);
 
 	g_object_class_install_property(obj_class, IM_PROP_ICON,
-			g_param_spec_pointer(IM_PROP_ICON_S, _("Buddy icon"),
+			g_param_spec_pointer("icon", _("Buddy icon"),
 				_("The buddy icon for the IM."),
 				G_PARAM_READWRITE)
 			);
@@ -762,6 +757,8 @@
 	g_return_if_fail(priv != NULL);
 
 	priv->id = id;
+
+	g_object_notify(G_OBJECT(chat), "chat-id");
 }
 
 int
@@ -892,7 +889,6 @@
 				purple_chat_conversation_is_ignored_user(chat, user);
 
 		chatuser = purple_chat_user_new(chat, user, alias, flag);
-		purple_chat_user_set_buddy(chatuser, purple_blist_find_buddy(account, user) != NULL);
 
 		priv->in_room = g_list_prepend(priv->in_room, chatuser);
 		g_hash_table_replace(priv->users,
@@ -992,7 +988,6 @@
 
 	flags = purple_chat_user_get_flags(purple_chat_conversation_find_user(chat, old_user));
 	cb = purple_chat_user_new(chat, new_user, new_alias, flags);
-	purple_chat_user_set_buddy(cb, purple_blist_find_buddy(account, new_user) != NULL);
 
 	priv->in_room = g_list_prepend(priv->in_room, cb);
 	g_hash_table_replace(priv->users,
@@ -1197,6 +1192,8 @@
 	g_free(priv->nick);
 	priv->nick = g_strdup(purple_normalize(
 			purple_conversation_get_account(PURPLE_CONVERSATION(chat)), nick));
+
+	g_object_notify(G_OBJECT(chat), "nick");
 }
 
 const char *purple_chat_conversation_get_nick(PurpleChatConversation *chat) {
@@ -1341,13 +1338,6 @@
  * GObject code for chats
  **************************************************************************/
 
-/* GObject Property names */
-#define CHAT_PROP_TOPIC_WHO_S  "topic-who"
-#define CHAT_PROP_TOPIC_S      "topic"
-#define CHAT_PROP_ID_S         "chat-id"
-#define CHAT_PROP_NICK_S       "nick"
-#define CHAT_PROP_LEFT_S       "left"
-
 /* Set method for GObject properties */
 static void
 purple_chat_conversation_set_property(GObject *obj, guint param_id, const GValue *value,
@@ -1549,31 +1539,31 @@
 	conv_class->write_message = chat_conversation_write_message;
 
 	g_object_class_install_property(obj_class, CHAT_PROP_TOPIC_WHO,
-			g_param_spec_string(CHAT_PROP_TOPIC_WHO_S, _("Who set topic"),
+			g_param_spec_string("topic-who", _("Who set topic"),
 				_("Who set the chat topic."), NULL,
 				G_PARAM_READABLE)
 			);
 
 	g_object_class_install_property(obj_class, CHAT_PROP_TOPIC,
-			g_param_spec_string(CHAT_PROP_TOPIC_S, _("Topic"),
+			g_param_spec_string("topic", _("Topic"),
 				_("Topic of the chat."), NULL,
 				G_PARAM_READABLE)
 			);
 
 	g_object_class_install_property(obj_class, CHAT_PROP_ID,
-			g_param_spec_int(CHAT_PROP_ID_S, _("Chat ID"),
+			g_param_spec_int("chat-id", _("Chat ID"),
 				_("The ID of the chat."), G_MININT, G_MAXINT, 0,
 				G_PARAM_READWRITE)
 			);
 
 	g_object_class_install_property(obj_class, CHAT_PROP_NICK,
-			g_param_spec_string(CHAT_PROP_NICK_S, _("Nickname"),
+			g_param_spec_string("nick", _("Nickname"),
 				_("The nickname of the user in a chat."), NULL,
 				G_PARAM_READWRITE)
 			);
 
 	g_object_class_install_property(obj_class, CHAT_PROP_LEFT,
-			g_param_spec_boolean(CHAT_PROP_LEFT_S, _("Left the chat"),
+			g_param_spec_boolean("left", _("Left the chat"),
 				_("Whether the user has left the chat."), FALSE,
 				G_PARAM_READWRITE)
 			);
@@ -1794,18 +1784,6 @@
 	return priv->chat;
 }
 
-void
-purple_chat_user_set_buddy(const PurpleChatUser *cb,
-		gboolean buddy)
-{
-	PurpleChatUserPrivate *priv;
-	priv = PURPLE_CHAT_USER_GET_PRIVATE(cb);
-
-	g_return_if_fail(priv != NULL);
-
-	priv->buddy = buddy;
-}
-
 gboolean
 purple_chat_user_is_buddy(const PurpleChatUser *cb)
 {
@@ -1821,13 +1799,6 @@
  * GObject code for chat user
  **************************************************************************/
 
-/* GObject Property names */
-#define CU_PROP_CHAT_S   "chat"
-#define CU_PROP_NAME_S   "name"
-#define CU_PROP_ALIAS_S  "alias"
-#define CU_PROP_BUDDY_S  "buddy"
-#define CU_PROP_FLAGS_S  "flags"
-
 /* Set method for GObject properties */
 static void
 purple_chat_user_set_property(GObject *obj, guint param_id, const GValue *value,
@@ -1848,9 +1819,6 @@
 			g_free(priv->alias);
 			priv->alias = g_strdup(g_value_get_string(value));
 			break;
-		case CU_PROP_BUDDY:
-			priv->buddy = g_value_get_boolean(value);
-			break;
 		case CU_PROP_FLAGS:
 			priv->flags = g_value_get_flags(value);
 			break;
@@ -1877,9 +1845,6 @@
 		case CU_PROP_ALIAS:
 			g_value_set_string(value, purple_chat_user_get_alias(cb));
 			break;
-		case CU_PROP_BUDDY:
-			g_value_set_boolean(value, purple_chat_user_is_buddy(cb));
-			break;
 		case CU_PROP_FLAGS:
 			g_value_set_flags(value, purple_chat_user_get_flags(cb));
 			break;
@@ -1896,6 +1861,21 @@
 	PURPLE_DBUS_REGISTER_POINTER(PURPLE_CHAT_USER(instance), PurpleChatUser);
 }
 
+/* Called when done constructing */
+static void
+purple_chat_user_constructed(GObject *object)
+{
+	PurpleChatUserPrivate *priv = PURPLE_CHAT_USER_GET_PRIVATE(object);
+	PurpleAccount *account;
+
+	cb_parent_class->constructed(object);
+
+	account = purple_conversation_get_account(PURPLE_CONVERSATION(priv->chat));
+
+	if (purple_blist_find_buddy(account, priv->name) != NULL)
+		priv->buddy = TRUE;
+}
+
 /* GObject finalize function */
 static void
 purple_chat_user_finalize(GObject *object)
@@ -1922,6 +1902,7 @@
 
 	cb_parent_class = g_type_class_peek_parent(klass);
 
+	obj_class->constructed = purple_chat_user_constructed;
 	obj_class->finalize = purple_chat_user_finalize;
 
 	/* Setup properties */
@@ -1929,31 +1910,25 @@
 	obj_class->set_property = purple_chat_user_set_property;
 
 	g_object_class_install_property(obj_class, CU_PROP_CHAT,
-			g_param_spec_object(CU_PROP_CHAT_S, _("Chat"),
+			g_param_spec_object("chat", _("Chat"),
 				_("The chat the buddy belongs to."), PURPLE_TYPE_CHAT_CONVERSATION,
-				G_PARAM_READWRITE | G_PARAM_CONSTRUCT)
+				G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)
 			);
 
 	g_object_class_install_property(obj_class, CU_PROP_NAME,
-			g_param_spec_string(CU_PROP_NAME_S, _("Name"),
+			g_param_spec_string("name", _("Name"),
 				_("Name of the chat user."), NULL,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT)
 			);
 
 	g_object_class_install_property(obj_class, CU_PROP_ALIAS,
-			g_param_spec_string(CU_PROP_ALIAS_S, _("Alias"),
+			g_param_spec_string("alias", _("Alias"),
 				_("Alias of the chat user."), NULL,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT)
 			);
 
-	g_object_class_install_property(obj_class, CU_PROP_BUDDY,
-			g_param_spec_boolean(CU_PROP_BUDDY_S, _("Is buddy"),
-				_("Whether the chat user is in the buddy list."), FALSE,
-				G_PARAM_READWRITE)
-			);
-
 	g_object_class_install_property(obj_class, CU_PROP_FLAGS,
-			g_param_spec_flags(CU_PROP_FLAGS_S, _("Buddy flags"),
+			g_param_spec_flags("flags", _("Buddy flags"),
 				_("The flags for the chat user."),
 				PURPLE_TYPE_CHAT_USER_FLAGS, PURPLE_CHAT_USER_NONE,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT)
@@ -1999,10 +1974,10 @@
 	g_return_val_if_fail(name != NULL, NULL);
 
 	cb = g_object_new(PURPLE_TYPE_CHAT_USER,
-			CU_PROP_CHAT_S,  chat,
-			CU_PROP_NAME_S,  name,
-			CU_PROP_ALIAS_S, alias,
-			CU_PROP_FLAGS_S, flags,
+			"chat",  chat,
+			"name",  name,
+			"alias", alias,
+			"flags", flags,
 			NULL);
 
 	return cb;
--- a/libpurple/conversationtypes.h	Fri Oct 11 03:11:37 2013 +0530
+++ b/libpurple/conversationtypes.h	Fri Oct 11 15:54:01 2013 +0530
@@ -684,14 +684,6 @@
 PurpleChatUserFlags purple_chat_user_get_flags(const PurpleChatUser *cb);
 
 /**
- * Sets if this chat user is on the buddy list.
- *
- * @param cb	The chat user.
- * @param buddy TRUE if the chat user is on the buddy list.
- */
-void purple_chat_user_set_buddy(const PurpleChatUser *cb, gboolean buddy);
-
-/**
  * Indicates if this chat user is on the buddy list.
  *
  * @param cb	The chat user.
--- a/libpurple/presence.c	Fri Oct 11 03:11:37 2013 +0530
+++ b/libpurple/presence.c	Fri Oct 11 15:54:01 2013 +0530
@@ -171,6 +171,8 @@
 		return;
 
 	priv->login_time = login_time;
+
+	g_object_notify(G_OBJECT(presence), "login-time");
 }
 
 GList *
@@ -321,13 +323,6 @@
  * GObject code for PurplePresence
  **************************************************************************/
 
-/* GObject Property names */
-#define PRES_PROP_IDLE_S           "idle"
-#define PRES_PROP_IDLE_TIME_S      "idle-time"
-#define PRES_PROP_LOGIN_TIME_S     "login-time"
-#define PRES_PROP_STATUSES_S       "statuses"
-#define PRES_PROP_ACTIVE_STATUS_S  "active-status"
-
 /* Set method for GObject properties */
 static void
 purple_presence_set_property(GObject *obj, guint param_id, const GValue *value,
@@ -462,7 +457,7 @@
 	obj_class->set_property = purple_presence_set_property;
 
 	g_object_class_install_property(obj_class, PRES_PROP_IDLE,
-			g_param_spec_boolean(PRES_PROP_IDLE_S, _("Idle"),
+			g_param_spec_boolean("idle", _("Idle"),
 				_("Whether the presence is in idle state."), FALSE,
 				G_PARAM_READWRITE)
 			);
@@ -476,7 +471,7 @@
 #else
 #error Unknown size of time_t
 #endif
-				(PRES_PROP_IDLE_TIME_S, _("Idle time"),
+				("idle-time", _("Idle time"),
 				_("The idle time of the presence"),
 #if SIZEOF_TIME_T == 4
 				G_MININT, G_MAXINT, 0,
@@ -496,7 +491,7 @@
 #else
 #error Unknown size of time_t
 #endif
-				(PRES_PROP_LOGIN_TIME_S, _("Login time"),
+				("login-time", _("Login time"),
 				_("The login time of the presence."),
 #if SIZEOF_TIME_T == 4
 				G_MININT, G_MAXINT, 0,
@@ -509,13 +504,13 @@
 			);
 
 	g_object_class_install_property(obj_class, PRES_PROP_STATUSES,
-			g_param_spec_pointer(PRES_PROP_STATUSES_S, _("Statuses"),
+			g_param_spec_pointer("statuses", _("Statuses"),
 				_("The list of statuses in the presence."),
 				G_PARAM_READABLE)
 			);
 
 	g_object_class_install_property(obj_class, PRES_PROP_ACTIVE_STATUS,
-			g_param_spec_object(PRES_PROP_ACTIVE_STATUS_S, _("Active status"),
+			g_param_spec_object("active-status", _("Active status"),
 				_("The active status for the presence."), PURPLE_TYPE_STATUS,
 				G_PARAM_READWRITE)
 			);
@@ -684,9 +679,6 @@
  * GObject code for PurpleAccountPresence
  **************************************************************************/
 
-/* GObject Property names */
-#define ACPRES_PROP_ACCOUNT_S  "account"
-
 /* Set method for GObject properties */
 static void
 purple_account_presence_set_property(GObject *obj, guint param_id, const GValue *value,
@@ -753,7 +745,7 @@
 	obj_class->set_property = purple_account_presence_set_property;
 
 	g_object_class_install_property(obj_class, ACPRES_PROP_ACCOUNT,
-			g_param_spec_object(ACPRES_PROP_ACCOUNT_S, _("Account"),
+			g_param_spec_object("account", _("Account"),
 				_("The account that this presence is of."), PURPLE_TYPE_ACCOUNT,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)
 			);
@@ -794,7 +786,7 @@
 	g_return_val_if_fail(PURPLE_IS_ACCOUNT(account), NULL);
 
 	return g_object_new(PURPLE_TYPE_ACCOUNT_PRESENCE,
-			ACPRES_PROP_ACCOUNT_S, account,
+			"account", account,
 			NULL);
 }
 
@@ -879,9 +871,6 @@
  * GObject code for PurpleBuddyPresence
  **************************************************************************/
 
-/* GObject Property names */
-#define BUDPRES_PROP_BUDDY_S  "buddy"
-
 /* Set method for GObject properties */
 static void
 purple_buddy_presence_set_property(GObject *obj, guint param_id, const GValue *value,
@@ -950,7 +939,7 @@
 	obj_class->set_property = purple_buddy_presence_set_property;
 
 	g_object_class_install_property(obj_class, BUDPRES_PROP_BUDDY,
-			g_param_spec_object(BUDPRES_PROP_BUDDY_S, _("Buddy"),
+			g_param_spec_object("buddy", _("Buddy"),
 				_("The buddy that this presence is of."), PURPLE_TYPE_BUDDY,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)
 			);
@@ -991,6 +980,6 @@
 	g_return_val_if_fail(PURPLE_IS_BUDDY(buddy), NULL);
 
 	return g_object_new(PURPLE_TYPE_BUDDY_PRESENCE,
-			BUDPRES_PROP_BUDDY_S, buddy,
+			"buddy", buddy,
 			NULL);
 }
--- a/libpurple/roomlist.c	Fri Oct 11 03:11:37 2013 +0530
+++ b/libpurple/roomlist.c	Fri Oct 11 15:54:01 2013 +0530
@@ -117,6 +117,8 @@
 
 	if (ops && ops->set_fields)
 		ops->set_fields(list, fields);
+
+	g_object_notify(G_OBJECT(list), "fields");
 }
 
 void purple_roomlist_set_in_progress(PurpleRoomlist *list, gboolean in_progress)
@@ -129,6 +131,8 @@
 
 	if (ops && ops->in_progress)
 		ops->in_progress(list, in_progress);
+
+	g_object_notify(G_OBJECT(list), "in-progress");
 }
 
 gboolean purple_roomlist_get_in_progress(PurpleRoomlist *list)
@@ -255,11 +259,6 @@
 /**************************************************************************/
 /*@{*/
 
-/* GObject Property names */
-#define PROP_ACCOUNT_S      "account"
-#define PROP_FIELDS_S       "fields"
-#define PROP_IN_PROGRESS_S  "in-progress"
-
 /* Set method for GObject properties */
 static void
 purple_roomlist_set_property(GObject *obj, guint param_id, const GValue *value,
@@ -360,20 +359,20 @@
 	obj_class->set_property = purple_roomlist_set_property;
 
 	g_object_class_install_property(obj_class, PROP_ACCOUNT,
-			g_param_spec_object(PROP_ACCOUNT_S, _("Account"),
+			g_param_spec_object("account", _("Account"),
 				_("The account for the room list."),
 				PURPLE_TYPE_ACCOUNT,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)
 			);
 
 	g_object_class_install_property(obj_class, PROP_FIELDS,
-			g_param_spec_pointer(PROP_FIELDS_S, _("Fields"),
+			g_param_spec_pointer("fields", _("Fields"),
 				_("The list of fields for a roomlist."),
 				G_PARAM_READWRITE)
 			);
 
 	g_object_class_install_property(obj_class, PROP_IN_PROGRESS,
-			g_param_spec_boolean(PROP_IN_PROGRESS_S, _("In progress"),
+			g_param_spec_boolean("in-progress", _("In progress"),
 				_("Whether the room list is being fetched."), FALSE,
 				G_PARAM_READWRITE)
 			);
@@ -422,7 +421,7 @@
 		list = purple_protocol_factory_iface_roomlist_new(protocol, account);
 	else
 		list = g_object_new(PURPLE_TYPE_ROOMLIST,
-			PROP_ACCOUNT_S, account,
+			"account", account,
 			NULL
 		);
 
--- a/libpurple/smiley.c	Fri Oct 11 03:11:37 2013 +0530
+++ b/libpurple/smiley.c	Fri Oct 11 15:54:01 2013 +0530
@@ -285,9 +285,6 @@
 	PROP_IMGSTORE
 };
 
-#define PROP_SHORTCUT_S "shortcut"
-#define PROP_IMGSTORE_S "image"
-
 enum
 {
 	SIG_DESTROY,
@@ -355,8 +352,6 @@
 				} else {
 					priv->checksum = NULL;
 				}
-
-				g_object_notify(object, PROP_IMGSTORE_S);
 			}
 			break;
 		default:
@@ -410,14 +405,14 @@
 	gobj_class->dispose = purple_smiley_dispose;
 
 	/* Shortcut */
-	pspec = g_param_spec_string(PROP_SHORTCUT_S, _("Shortcut"),
+	pspec = g_param_spec_string("shortcut", _("Shortcut"),
 			_("The text-shortcut for the smiley"),
 			NULL,
 			G_PARAM_READWRITE);
 	g_object_class_install_property(gobj_class, PROP_SHORTCUT, pspec);
 
 	/* Stored Image */
-	pspec = g_param_spec_pointer(PROP_IMGSTORE_S, _("Stored Image"),
+	pspec = g_param_spec_pointer("image", _("Stored Image"),
 			_("Stored Image. (that'll have to do for now)"),
 			G_PARAM_READWRITE);
 	g_object_class_install_property(gobj_class, PROP_IMGSTORE, pspec);
@@ -640,7 +635,7 @@
 
 	new_img = purple_smiley_data_new(smiley_data, smiley_data_len);
 
-	g_object_set(G_OBJECT(smiley), PROP_IMGSTORE_S, new_img, NULL);
+	g_object_set(G_OBJECT(smiley), "image", new_img, NULL);
 
 	/* If the old and new image files have different names we need
 	 * to unstore old image file. */
@@ -665,7 +660,7 @@
 {
 	PurpleSmiley *smiley;
 
-	smiley = PURPLE_SMILEY(g_object_new(PURPLE_TYPE_SMILEY, PROP_SHORTCUT_S, shortcut, NULL));
+	smiley = PURPLE_SMILEY(g_object_new(PURPLE_TYPE_SMILEY, "shortcut", shortcut, NULL));
 
 	return smiley;
 }
@@ -686,7 +681,7 @@
 	if (!smiley)
 		return NULL;
 
-	g_object_set(G_OBJECT(smiley), PROP_IMGSTORE_S, img, NULL);
+	g_object_set(G_OBJECT(smiley), "image", img, NULL);
 
 	return smiley;
 }
@@ -769,7 +764,7 @@
 	g_free(priv->shortcut);
 	priv->shortcut = g_strdup(shortcut);
 
-	g_object_notify(G_OBJECT(smiley), PROP_SHORTCUT_S);
+	g_object_notify(G_OBJECT(smiley), "shortcut");
 
 	purple_smileys_save();
 
--- a/libpurple/status.c	Fri Oct 11 03:11:37 2013 +0530
+++ b/libpurple/status.c	Fri Oct 11 15:54:01 2013 +0530
@@ -593,6 +593,9 @@
 		if (old_status != NULL && (old_status != status))
 			PURPLE_STATUS_GET_PRIVATE(old_status)->active = FALSE;
 		g_object_set(presence, "active-status", status, NULL);
+
+		g_object_notify(G_OBJECT(old_status), "active");
+		g_object_notify(G_OBJECT(status), "active");
 	}
 	else
 		old_status = NULL;
@@ -1111,11 +1114,6 @@
 * GObject code
 **************************************************************************/
 
-/* GObject Property names */
-#define PROP_STATUS_TYPE_S  "status-type"
-#define PROP_PRESENCE_S     "presence"
-#define PROP_ACTIVE_S       "active"
-
 /* Set method for GObject properties */
 static void
 purple_status_set_property(GObject *obj, guint param_id, const GValue *value,
@@ -1228,19 +1226,19 @@
 	obj_class->set_property = purple_status_set_property;
 
 	g_object_class_install_property(obj_class, PROP_STATUS_TYPE,
-			g_param_spec_pointer(PROP_STATUS_TYPE_S, _("Status type"),
+			g_param_spec_pointer("status-type", _("Status type"),
 				_("The PurpleStatusType of the status."),
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)
 			);
 
 	g_object_class_install_property(obj_class, PROP_PRESENCE,
-			g_param_spec_object(PROP_PRESENCE_S, _("Presence"),
+			g_param_spec_object("presence", _("Presence"),
 				_("The presence that the status belongs to."), PURPLE_TYPE_PRESENCE,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)
 			);
 
 	g_object_class_install_property(obj_class, PROP_ACTIVE,
-			g_param_spec_boolean(PROP_ACTIVE_S, _("Active"),
+			g_param_spec_boolean("active", _("Active"),
 				_("Whether the status is active or not."), FALSE,
 				G_PARAM_READWRITE)
 			);
@@ -1282,8 +1280,8 @@
 	g_return_val_if_fail(PURPLE_IS_PRESENCE(presence), NULL);
 
 	return g_object_new(PURPLE_TYPE_STATUS,
-			PROP_STATUS_TYPE_S,  status_type,
-			PROP_PRESENCE_S,     presence,
+			"status-type",  status_type,
+			"presence",     presence,
 			NULL);
 }
 
--- a/libpurple/whiteboard.c	Fri Oct 11 03:11:37 2013 +0530
+++ b/libpurple/whiteboard.c	Fri Oct 11 15:54:01 2013 +0530
@@ -113,6 +113,8 @@
 	g_return_if_fail(priv != NULL);
 
 	priv->state = state;
+
+	g_object_notify(G_OBJECT(wb), "state");
 }
 
 int purple_whiteboard_get_state(const PurpleWhiteboard *wb)
@@ -283,6 +285,8 @@
 	g_return_if_fail(priv != NULL);
 
 	priv->draw_list = draw_list;
+
+	g_object_notify(G_OBJECT(wb), "draw-list");
 }
 
 void purple_whiteboard_set_protocol_data(PurpleWhiteboard *wb, gpointer proto_data)
@@ -320,12 +324,6 @@
 /******************************************************************************
  * GObject code
  *****************************************************************************/
-/* GObject Property names */
-#define PROP_STATE_S      "state"
-#define PROP_ACCOUNT_S    "account"
-#define PROP_WHO_S        "who"
-#define PROP_DRAW_LIST_S  "draw-list"
-
 /* Set method for GObject properties */
 static void
 purple_whiteboard_set_property(GObject *obj, guint param_id, const GValue *value,
@@ -442,26 +440,26 @@
 	obj_class->set_property = purple_whiteboard_set_property;
 
 	g_object_class_install_property(obj_class, PROP_STATE,
-			g_param_spec_int(PROP_STATE_S, _("State"),
+			g_param_spec_int("state", _("State"),
 				_("State of the whiteboard."),
 				G_MININT, G_MAXINT, 0,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT)
 			);
 
 	g_object_class_install_property(obj_class, PROP_ACCOUNT,
-			g_param_spec_object(PROP_ACCOUNT_S, _("Account"),
+			g_param_spec_object("account", _("Account"),
 				_("The whiteboard's account."), PURPLE_TYPE_ACCOUNT,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)
 			);
 
 	g_object_class_install_property(obj_class, PROP_WHO,
-			g_param_spec_string(PROP_WHO_S, _("Who"),
+			g_param_spec_string("who", _("Who"),
 				_("Who you're drawing with."), NULL,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)
 			);
 
 	g_object_class_install_property(obj_class, PROP_DRAW_LIST,
-			g_param_spec_pointer(PROP_DRAW_LIST_S, _("Draw list"),
+			g_param_spec_pointer("draw-list", _("Draw list"),
 				_("A list of points to draw to the buddy."),
 				G_PARAM_READWRITE)
 			);
@@ -512,9 +510,9 @@
 				who, state);
 	else
 		wb = g_object_new(PURPLE_TYPE_WHITEBOARD,
-			PROP_ACCOUNT_S, account,
-			PROP_WHO_S,     who,
-			PROP_STATE_S,   state,
+			"account", account,
+			"who",     who,
+			"state",   state,
 			NULL
 		);
 
--- a/libpurple/xfer.c	Fri Oct 11 03:11:37 2013 +0530
+++ b/libpurple/xfer.c	Fri Oct 11 15:54:01 2013 +0530
@@ -738,6 +738,8 @@
 
 	g_free(priv->who);
 	priv->who = g_strdup(who);
+
+	g_object_notify(G_OBJECT(xfer), "remote-user");
 }
 
 const char *
@@ -899,6 +901,8 @@
 	g_return_if_fail(priv != NULL);
 
 	priv->fd = fd;
+
+	g_object_notify(G_OBJECT(xfer), "fd");
 }
 
 void purple_xfer_set_watcher(PurpleXfer *xfer, int watcher)
@@ -908,6 +912,8 @@
 	g_return_if_fail(priv != NULL);
 
 	priv->watcher = watcher;
+
+	g_object_notify(G_OBJECT(xfer), "watcher");
 }
 
 void
@@ -967,6 +973,8 @@
 
 	g_free(priv->message);
 	priv->message = g_strdup(message);
+
+	g_object_notify(G_OBJECT(xfer), "message");
 }
 
 const char *
@@ -988,6 +996,8 @@
 
 	g_free(priv->filename);
 	priv->filename = g_strdup(filename);
+
+	g_object_notify(G_OBJECT(xfer), "filename");
 }
 
 void
@@ -999,6 +1009,8 @@
 
 	g_free(priv->local_filename);
 	priv->local_filename = g_strdup(filename);
+
+	g_object_notify(G_OBJECT(xfer), "local-filename");
 }
 
 void
@@ -1010,6 +1022,8 @@
 
 	priv->size = size;
 	priv->bytes_remaining = priv->size - purple_xfer_get_bytes_sent(xfer);
+
+	g_object_notify(G_OBJECT(xfer), "file-size");
 }
 
 void
@@ -1020,6 +1034,8 @@
 	g_return_if_fail(priv != NULL);
 
 	priv->local_port = local_port;
+
+	g_object_notify(G_OBJECT(xfer), "local-port");
 }
 
 void
@@ -1031,6 +1047,8 @@
 
 	priv->bytes_sent = bytes_sent;
 	priv->bytes_remaining = purple_xfer_get_size(xfer) - bytes_sent;
+
+	g_object_notify(G_OBJECT(xfer), "bytes-sent");
 }
 
 PurpleXferUiOps *
@@ -1926,24 +1944,6 @@
 /**************************************************************************
  * GObject code
  **************************************************************************/
-/* GObject Property names */
-#define PROP_TYPE_S            "type"
-#define PROP_ACCOUNT_S         "account"
-#define PROP_REMOTE_USER_S     "remote-user"
-#define PROP_MESSAGE_S         "message"
-#define PROP_FILENAME_S        "filename"
-#define PROP_LOCAL_FILENAME_S  "local-filename"
-#define PROP_FILE_SIZE_S       "file-size"
-#define PROP_REMOTE_IP_S       "remote-ip"
-#define PROP_LOCAL_PORT_S      "local-port"
-#define PROP_REMOTE_PORT_S     "remote-port"
-#define PROP_FD_S              "fd"
-#define PROP_WATCHER_S         "watcher"
-#define PROP_BYTES_SENT_S      "bytes-sent"
-#define PROP_START_TIME_S      "start-time"
-#define PROP_END_TIME_S        "end-time"
-#define PROP_STATUS_S          "status"
-
 /* Set method for GObject properties */
 static void
 purple_xfer_set_property(GObject *obj, guint param_id, const GValue *value,
@@ -2163,86 +2163,86 @@
 	obj_class->set_property = purple_xfer_set_property;
 
 	g_object_class_install_property(obj_class, PROP_TYPE,
-			g_param_spec_enum(PROP_TYPE_S, _("Transfer type"),
+			g_param_spec_enum("type", _("Transfer type"),
 				_("The type of file transfer."), PURPLE_TYPE_XFER_TYPE,
 				PURPLE_XFER_TYPE_UNKNOWN,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)
 			);
 
 	g_object_class_install_property(obj_class, PROP_ACCOUNT,
-			g_param_spec_object(PROP_ACCOUNT_S, _("Account"),
+			g_param_spec_object("account", _("Account"),
 				_("The account sending or receiving the file."),
 				PURPLE_TYPE_ACCOUNT,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)
 			);
 
 	g_object_class_install_property(obj_class, PROP_REMOTE_USER,
-			g_param_spec_string(PROP_REMOTE_USER_S, _("Remote user"),
+			g_param_spec_string("remote-user", _("Remote user"),
 				_("The name of the remote user."), NULL,
 				G_PARAM_READWRITE | G_PARAM_CONSTRUCT)
 			);
 
 	g_object_class_install_property(obj_class, PROP_MESSAGE,
-			g_param_spec_string(PROP_MESSAGE_S, _("Message"),
+			g_param_spec_string("message", _("Message"),
 				_("The message for the file transfer."), NULL,
 				G_PARAM_READWRITE)
 			);
 
 	g_object_class_install_property(obj_class, PROP_FILENAME,
-			g_param_spec_string(PROP_FILENAME_S, _("Filename"),
+			g_param_spec_string("filename", _("Filename"),
 				_("The filename for the file transfer."), NULL,
 				G_PARAM_READWRITE)
 			);
 
 	g_object_class_install_property(obj_class, PROP_LOCAL_FILENAME,
-			g_param_spec_string(PROP_LOCAL_FILENAME_S, _("Local filename"),
+			g_param_spec_string("local-filename", _("Local filename"),
 				_("The local filename for the file transfer."), NULL,
 				G_PARAM_READWRITE)
 			);
 
 	g_object_class_install_property(obj_class, PROP_FILE_SIZE,
-			g_param_spec_int64(PROP_FILE_SIZE_S, _("File size"),
+			g_param_spec_int64("file-size", _("File size"),
 				_("Size of the file in a file transfer."),
 				G_MININT64, G_MAXINT64, 0,
 				G_PARAM_READWRITE)
 			);
 
 	g_object_class_install_property(obj_class, PROP_REMOTE_IP,
-			g_param_spec_string(PROP_REMOTE_IP_S, _("Remote IP"),
+			g_param_spec_string("remote-ip", _("Remote IP"),
 				_("The remote IP address in the file transfer."), NULL,
 				G_PARAM_READABLE)
 			);
 
 	g_object_class_install_property(obj_class, PROP_LOCAL_PORT,
-			g_param_spec_int(PROP_LOCAL_PORT_S, _("Local port"),
+			g_param_spec_int("local-port", _("Local port"),
 				_("The local port number in the file transfer."),
 				G_MININT, G_MAXINT, 0,
 				G_PARAM_READWRITE)
 			);
 
 	g_object_class_install_property(obj_class, PROP_REMOTE_PORT,
-			g_param_spec_int(PROP_REMOTE_PORT_S, _("Remote port"),
+			g_param_spec_int("remote-port", _("Remote port"),
 				_("The remote port number in the file transfer."),
 				G_MININT, G_MAXINT, 0,
 				G_PARAM_READABLE)
 			);
 
 	g_object_class_install_property(obj_class, PROP_FD,
-			g_param_spec_int(PROP_FD_S, _("Socket FD"),
+			g_param_spec_int("fd", _("Socket FD"),
 				_("The socket file descriptor."),
 				G_MININT, G_MAXINT, 0,
 				G_PARAM_READWRITE)
 			);
 
 	g_object_class_install_property(obj_class, PROP_WATCHER,
-			g_param_spec_int(PROP_WATCHER_S, _("Watcher"),
+			g_param_spec_int("watcher", _("Watcher"),
 				_("The watcher for the file transfer."),
 				G_MININT, G_MAXINT, 0,
 				G_PARAM_READWRITE)
 			);
 
 	g_object_class_install_property(obj_class, PROP_BYTES_SENT,
-			g_param_spec_int64(PROP_BYTES_SENT_S, _("Bytes sent"),
+			g_param_spec_int64("bytes-sent", _("Bytes sent"),
 				_("The number of bytes sent (or received) so far."),
 				G_MININT64, G_MAXINT64, 0,
 				G_PARAM_READWRITE)
@@ -2256,7 +2256,7 @@
 #else
 #error Unknown size of time_t
 #endif
-				(PROP_START_TIME_S, _("Start time"),
+				("start-time", _("Start time"),
 				_("The time the transfer of a file started."),
 #if SIZEOF_TIME_T == 4
 				G_MININT, G_MAXINT, 0,
@@ -2276,7 +2276,7 @@
 #else
 #error Unknown size of time_t
 #endif
-				(PROP_END_TIME_S, _("End time"),
+				("end-time", _("End time"),
 				_("The time the transfer of a file ended."),
 #if SIZEOF_TIME_T == 4
 				G_MININT, G_MAXINT, 0,
@@ -2289,7 +2289,7 @@
 			);
 
 	g_object_class_install_property(obj_class, PROP_STATUS,
-			g_param_spec_enum(PROP_STATUS_S, _("Status"),
+			g_param_spec_enum("status", _("Status"),
 				_("The current status for the file transfer."),
 				PURPLE_TYPE_XFER_STATUS, PURPLE_XFER_STATUS_UNKNOWN,
 				G_PARAM_READWRITE)
@@ -2343,9 +2343,9 @@
 				who);
 	else
 		xfer = g_object_new(PURPLE_TYPE_XFER,
-			PROP_ACCOUNT_S,     account,
-			PROP_TYPE_S,        type,
-			PROP_REMOTE_USER_S, who,
+			"account",     account,
+			"type",        type,
+			"remote-user", who,
 			NULL
 		);

Mercurial Repository: pidgin3

mercurial