Mercurial > pidgin3 / changeset

--- a/ChangeLog.API	Tue Oct 01 03:19:16 2013 +0530
+++ b/ChangeLog.API	Tue Oct 01 04:43:26 2013 +0530
@@ -302,6 +302,7 @@
 		* purple_connection_new
 		* purple_connection_new_unregister
 		* purple_connection_destroy
+		* purple_connection_set_account
 		* purple_contact_set_alias
 		* purple_conv_chat_set_users
 		* PurpleConversationType

--- a/libpurple/connection.c	Tue Oct 01 03:19:16 2013 +0530
+++ b/libpurple/connection.c	Tue Oct 01 04:43:26 2013 +0530
@@ -259,17 +259,6 @@
 }
 
 void
-purple_connection_set_account(PurpleConnection *gc, PurpleAccount *account)
-{
-	PurpleConnectionPrivate *priv = PURPLE_CONNECTION_GET_PRIVATE(gc);
-
-	g_return_if_fail(priv != NULL);
-	g_return_if_fail(PURPLE_IS_ACCOUNT(account));
-
-	priv->account = account;
-}
-
-void
 purple_connection_set_display_name(PurpleConnection *gc, const char *name)
 {
 	PurpleConnectionPrivate *priv = PURPLE_CONNECTION_GET_PRIVATE(gc);
@@ -630,7 +619,7 @@
 			purple_connection_set_state(gc, g_value_get_enum(value));
 			break;
 		case PROP_ACCOUNT:
-			purple_connection_set_account(gc, g_value_get_object(value));
+			priv->account = g_value_get_object(value);
 			break;
 		case PROP_PASSWORD:
 			g_free(priv->password);
@@ -825,7 +814,7 @@
 	g_object_class_install_property(obj_class, PROP_ACCOUNT,
 			g_param_spec_object(PROP_ACCOUNT_S, _("Account"),
 				_("The account using the connection."), PURPLE_TYPE_ACCOUNT,
-				G_PARAM_READWRITE | G_PARAM_CONSTRUCT)
+				G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)
 			);
 
 	g_object_class_install_property(obj_class, PROP_PASSWORD,

--- a/libpurple/connection.h	Tue Oct 01 03:19:16 2013 +0530
+++ b/libpurple/connection.h	Tue Oct 01 04:43:26 2013 +0530
@@ -293,14 +293,6 @@
 void purple_connection_set_flags(PurpleConnection *gc, PurpleConnectionFlags flags);
 
 /**
- * Sets the connection's account.
- *
- * @param gc      The connection.
- * @param account The account.
- */
-void purple_connection_set_account(PurpleConnection *gc, PurpleAccount *account);
-
-/**
  * Sets the connection's displayed name.
  *
  * @param gc   The connection.

--- a/libpurple/plugins/perl/common/Connection.xs	Tue Oct 01 03:19:16 2013 +0530
+++ b/libpurple/plugins/perl/common/Connection.xs	Tue Oct 01 04:43:26 2013 +0530
@@ -51,11 +51,6 @@
 	Purple::ConnectionState state
 
 void
-purple_connection_set_account(gc, account)
-	Purple::Connection gc
-	Purple::Account account
-
-void
 purple_connection_set_display_name(gc, name)
 	Purple::Connection gc
 	const char *name