adium 4822:b8433d1b5cbb: SHA1 is deprecated, switch to CC_SHA1.

commits at adium.im commits at adium.im
Sun May 13 20:11:29 UTC 2012


details:	http://hg.adium.im/adium/rev/b8433d1b5cbb
revision:	4822:b8433d1b5cbb
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Mon Apr 30 19:34:32 2012 -0400

SHA1 is deprecated, switch to CC_SHA1.
(transplanted from 83faeadfec199e6e9890999c7a76a05310887192)
Subject: adium 4823:dd240a257110: Undeprecate some Keychain lookups.

details:	http://hg.adium.im/adium/rev/dd240a257110
revision:	4823:dd240a257110
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Mon Apr 30 23:02:50 2012 -0400

Undeprecate some Keychain lookups.
Subject: adium 4824:3865cea13ddb: More 1.5.1 changes

details:	http://hg.adium.im/adium/rev/3865cea13ddb
revision:	4824:3865cea13ddb
branch:		adium-1.5.1
author:		Frank Dowsett <wixardy at adium.im>
date:		Sun May 13 16:08:00 2012 -0400

More 1.5.1 changes
Subject: adium 4825:a944b9e676d3: merge

details:	http://hg.adium.im/adium/rev/a944b9e676d3
revision:	4825:a944b9e676d3
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Sun May 13 16:11:03 2012 -0400

merge

diffs (truncated from 87674 to 1000 lines):

diff -r 7e8948b71619 -r a944b9e676d3 Dependencies/build.sh
--- a/Dependencies/build.sh	Tue May 01 14:43:59 2012 -0400
+++ b/Dependencies/build.sh	Sun May 13 16:11:03 2012 -0400
@@ -22,8 +22,8 @@
 NUMBER_OF_CORES=`sysctl -n hw.activecpu`
 
 # Also try /Developer-old, just in case XCode 4 is installed
-DEVELOPER="/Developer"
-SDK_ROOT="${DEVELOPER}/SDKs/MacOSX10.6.sdk"
+DEVELOPER=$(xcode-select -print-path)
+SDK_ROOT="${DEVELOPER}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"
 
 MIN_OS_VERSION="10.6"
 BASE_CFLAGS="-fstack-protector -isysroot $SDK_ROOT \
@@ -161,8 +161,8 @@
 	eval `$DEVELOPER/usr/bin/pump --startup`
 else
 	# Try to find the right gcc, even when XCode4 is installed
-	export CC="$DEVELOPER/usr/bin/gcc"
-	export CXX="$DEVELOPER/usr/bin/g++"
+	export CC="/opt/local/bin/gcc-apple-4.2"
+	export CXX="/opt/local/bin/g++-apple-4.2"
 	export CCAS="$CC"
 	export OBJC="$CC"
 fi
diff -r 7e8948b71619 -r a944b9e676d3 Frameworks/AIUtilities Framework/Source/AIKeychain.m
--- a/Frameworks/AIUtilities Framework/Source/AIKeychain.m	Tue May 01 14:43:59 2012 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIKeychain.m	Sun May 13 16:11:03 2012 -0400
@@ -838,79 +838,63 @@
 	NSDictionary *result = nil;
 
 	// Search for keychain items whose server is our key
-	SecKeychainSearchRef search = NULL;
+	SecKeychainItemRef item = NULL;
+	UInt32 passwordLength = 0U;
+	void  *passwordBytes = NULL;
+	
+	// If keychainRef is NULL, the user's default keychain search list will be used
+	OSStatus err = SecKeychainFindInternetPassword(keychainRef,
+												   (unsigned int)[server length],
+												   [server UTF8String],
+												   0,
+												   NULL,
+												   0,
+												   NULL,
+												   0,
+												   NULL,
+												   0,
+												   protocol,
+												   kSecAuthenticationTypeAny,
+												   &passwordLength,
+												   &passwordBytes,
+												   &item);
+	
+	if (err == errSecItemNotFound) {
+		// No matching server found
+	} else if (err == noErr) {
+		// Output storage.
+		struct SecKeychainAttributeList *attrList = NULL;
 
-	struct SecKeychainAttribute searchAttrs[] = {
-		{
-			.tag    = kSecServerItemAttr,
-			.length = (UInt32)[server length],
-			.data   = (void *)[server UTF8String],
-		},
-		{
-			.tag    = kSecProtocolItemAttr,
-			.length = sizeof(SecProtocolType),
-			.data   = &protocol,
-		}
-	};
-
-	struct SecKeychainAttributeList searchAttrList = {
-		.count = 2,
-		.attr  = searchAttrs,
-	};
-
-	// If keychainRef is NULL, the users's default keychain search list will be used
-	OSStatus err = SecKeychainSearchCreateFromAttributes(keychainRef, kSecInternetPasswordItemClass, &searchAttrList, &search);
-	
-	if (err == noErr) {
-		SecKeychainItemRef item = NULL;
+		// First, grab the username.
+		UInt32    tags[] = { kSecAccountItemAttr };
+		UInt32 formats[] = { CSSM_DB_ATTRIBUTE_FORMAT_STRING };
+		struct SecKeychainAttributeInfo info = {
+			.count  = 1,
+			.tag    = tags,
+			.format = formats,
+		};
+		
+		err = SecKeychainItemCopyAttributesAndData(item,
+												   &info,
+												   /* itemClass */ NULL,
+												   &attrList,
+												   &passwordLength,
+												   &passwordBytes);
+		if (err == noErr) {
+			NSString *username = [NSString stringWithBytes:attrList->attr[0].data length:attrList->attr[0].length encoding:NSUTF8StringEncoding];
+			NSString *password = [NSString stringWithBytes:passwordBytes length:passwordLength encoding:NSUTF8StringEncoding];
+			result = [NSDictionary dictionaryWithObjectsAndKeys:
+				username, @"Username",
+				password, @"Password",
+				nil];
 			
-		err = SecKeychainSearchCopyNext(search, &item);
-
-		if (err == errSecItemNotFound) {
-			// No matching server found
-		} else if (err == noErr) {
-			// Output storage.
-			struct SecKeychainAttributeList *attrList = NULL;
-			UInt32 passwordLength = 0U;
-			void  *passwordBytes = NULL;
-
-			// First, grab the username.
-			UInt32    tags[] = { kSecAccountItemAttr };
-			UInt32 formats[] = { CSSM_DB_ATTRIBUTE_FORMAT_STRING };
-			struct SecKeychainAttributeInfo info = {
-				.count  = 1,
-				.tag    = tags,
-				.format = formats,
-			};
-			
-			err = SecKeychainItemCopyAttributesAndData(item,
-													   &info,
-													   /* itemClass */ NULL,
-													   &attrList,
-													   &passwordLength,
-													   &passwordBytes);
-			if (err == noErr) {
-				NSString *username = [NSString stringWithBytes:attrList->attr[0].data length:attrList->attr[0].length encoding:NSUTF8StringEncoding];
-				NSString *password = [NSString stringWithBytes:passwordBytes length:passwordLength encoding:NSUTF8StringEncoding];
-				result = [NSDictionary dictionaryWithObjectsAndKeys:
-					username, @"Username",
-					password, @"Password",
-					nil];
-				
-				SecKeychainItemFreeAttributesAndData(attrList, passwordBytes);
-			} else {
-				NSLog(@"Error extracting infomation from keychain item");
-			}
-
-			if (item) {
-				CFRelease(item);
-			}
+			SecKeychainItemFreeAttributesAndData(attrList, passwordBytes);
 		} else {
-			NSLog(@"%@: Error in SecKeychainSearchCopyNext(); err is %ld", self, (long)err);	
+			NSLog(@"Error extracting infomation from keychain item");
 		}
 
-		if (search)	{
-			CFRelease(search);
+		if (item) {
+			CFRelease(item);
 		}
 	} else {
 		NSLog(@"%@: Could not create search; err is %ld", self, (long)err);
diff -r 7e8948b71619 -r a944b9e676d3 Frameworks/libglib.framework/Versions/2.0.0/libglib
Binary file Frameworks/libglib.framework/Versions/2.0.0/libglib has changed
diff -r 7e8948b71619 -r a944b9e676d3 Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule
Binary file Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule has changed
diff -r 7e8948b71619 -r a944b9e676d3 Frameworks/libgobject.framework/Versions/2.0.0/libgobject
Binary file Frameworks/libgobject.framework/Versions/2.0.0/libgobject has changed
diff -r 7e8948b71619 -r a944b9e676d3 Frameworks/libgthread.framework/Versions/2.0.0/libgthread
Binary file Frameworks/libgthread.framework/Versions/2.0.0/libgthread has changed
diff -r 7e8948b71619 -r a944b9e676d3 Frameworks/libintl.framework/Versions/8/libintl
Binary file Frameworks/libintl.framework/Versions/8/libintl has changed
diff -r 7e8948b71619 -r a944b9e676d3 Frameworks/libpurple.framework/Headers
--- a/Frameworks/libpurple.framework/Headers	Tue May 01 14:43:59 2012 -0400
+++ b/Frameworks/libpurple.framework/Headers	Sun May 13 16:11:03 2012 -0400
@@ -1,1 +1,1 @@
-Versions/0.10.0/Headers
\ No newline at end of file
+Versions/0.10.5/Headers
\ No newline at end of file
diff -r 7e8948b71619 -r a944b9e676d3 Frameworks/libpurple.framework/Resources
--- a/Frameworks/libpurple.framework/Resources	Tue May 01 14:43:59 2012 -0400
+++ b/Frameworks/libpurple.framework/Resources	Sun May 13 16:11:03 2012 -0400
@@ -1,1 +1,1 @@
-Versions/0.10.0/Resources
\ No newline at end of file
+Versions/0.10.5/Resources
\ No newline at end of file
diff -r 7e8948b71619 -r a944b9e676d3 Frameworks/libpurple.framework/Versions/0.10.0/Headers/account.h
--- a/Frameworks/libpurple.framework/Versions/0.10.0/Headers/account.h	Tue May 01 14:43:59 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1194 +0,0 @@
-/**
- * @file account.h Account API
- * @ingroup core
- * @see @ref account-signals
- */
-
-/* purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
-#ifndef _PURPLE_ACCOUNT_H_
-#define _PURPLE_ACCOUNT_H_
-
-#include <glib.h>
-#include <glib-object.h>
-
-/** @copydoc _PurpleAccountUiOps */
-typedef struct _PurpleAccountUiOps PurpleAccountUiOps;
-/** @copydoc _PurpleAccount */
-typedef struct _PurpleAccount      PurpleAccount;
-
-typedef gboolean (*PurpleFilterAccountFunc)(PurpleAccount *account);
-typedef void (*PurpleAccountRequestAuthorizationCb)(void *);
-typedef void (*PurpleAccountRegistrationCb)(PurpleAccount *account, gboolean succeeded, void *user_data);
-typedef void (*PurpleAccountUnregistrationCb)(PurpleAccount *account, gboolean succeeded, void *user_data);
-typedef void (*PurpleSetPublicAliasSuccessCallback)(PurpleAccount *account, const char *new_alias);
-typedef void (*PurpleSetPublicAliasFailureCallback)(PurpleAccount *account, const char *error);
-typedef void (*PurpleGetPublicAliasSuccessCallback)(PurpleAccount *account, const char *alias);
-typedef void (*PurpleGetPublicAliasFailureCallback)(PurpleAccount *account, const char *error);
-
-#include "connection.h"
-#include "log.h"
-#include "privacy.h"
-#include "proxy.h"
-#include "prpl.h"
-#include "status.h"
-
-/**
- * Account request types.
- */
-typedef enum
-{
-	PURPLE_ACCOUNT_REQUEST_AUTHORIZATION = 0 /* Account authorization request */
-} PurpleAccountRequestType;
-
-/**
- * Account request response types
- */
-typedef enum
-{
-	PURPLE_ACCOUNT_RESPONSE_IGNORE = -2,
-	PURPLE_ACCOUNT_RESPONSE_DENY = -1,
-	PURPLE_ACCOUNT_RESPONSE_PASS = 0,
-	PURPLE_ACCOUNT_RESPONSE_ACCEPT = 1
-} PurpleAccountRequestResponse;
-
-/**  Account UI operations, used to notify the user of status changes and when
- *   buddies add this account to their buddy lists.
- */
-struct _PurpleAccountUiOps
-{
-	/** A buddy who is already on this account's buddy list added this account
-	 *  to their buddy list.
-	 */
-	void (*notify_added)(PurpleAccount *account,
-	                     const char *remote_user,
-	                     const char *id,
-	                     const char *alias,
-	                     const char *message);
-
-	/** This account's status changed. */
-	void (*status_changed)(PurpleAccount *account,
-	                       PurpleStatus *status);
-
-	/** Someone we don't have on our list added us; prompt to add them. */
-	void (*request_add)(PurpleAccount *account,
-	                    const char *remote_user,
-	                    const char *id,
-	                    const char *alias,
-	                    const char *message);
-
-	/** Prompt for authorization when someone adds this account to their buddy
-	 * list.  To authorize them to see this account's presence, call \a
-	 * authorize_cb (\a user_data); otherwise call \a deny_cb (\a user_data);
-	 * @return a UI-specific handle, as passed to #close_account_request.
-	 */
-	void *(*request_authorize)(PurpleAccount *account,
-	                           const char *remote_user,
-	                           const char *id,
-	                           const char *alias,
-	                           const char *message,
-	                           gboolean on_list,
-	                           PurpleAccountRequestAuthorizationCb authorize_cb,
-	                           PurpleAccountRequestAuthorizationCb deny_cb,
-	                           void *user_data);
-
-	/** Close a pending request for authorization.  \a ui_handle is a handle
-	 *  as returned by #request_authorize.
-	 */
-	void (*close_account_request)(void *ui_handle);
-
-	void (*_purple_reserved1)(void);
-	void (*_purple_reserved2)(void);
-	void (*_purple_reserved3)(void);
-	void (*_purple_reserved4)(void);
-};
-
-/** Structure representing an account.
- */
-struct _PurpleAccount
-{
-	char *username;             /**< The username.                          */
-	char *alias;                /**< How you appear to yourself.            */
-	char *password;             /**< The account password.                  */
-	char *user_info;            /**< User information.                      */
-
-	char *buddy_icon_path;      /**< The buddy icon's non-cached path.      */
-
-	gboolean remember_pass;     /**< Remember the password.                 */
-
-	char *protocol_id;          /**< The ID of the protocol.                */
-
-	PurpleConnection *gc;         /**< The connection handle.                 */
-	gboolean disconnecting;     /**< The account is currently disconnecting */
-
-	GHashTable *settings;       /**< Protocol-specific settings.            */
-	GHashTable *ui_settings;    /**< UI-specific settings.                  */
-
-	PurpleProxyInfo *proxy_info;  /**< Proxy information.  This will be set   */
-								/*   to NULL when the account inherits      */
-								/*   proxy settings from global prefs.      */
-
-	/*
-	 * TODO: Supplementing the next two linked lists with hash tables
-	 * should help performance a lot when these lists are long.  This
-	 * matters quite a bit for protocols like MSN, where all your
-	 * buddies are added to your permit list.  Currently we have to
-	 * iterate through the entire list if we want to check if someone
-	 * is permitted or denied.  We should do this for 3.0.0.
-	 * Or maybe use a GTree.
-	 */
-	GSList *permit;             /**< Permit list.                           */
-	GSList *deny;               /**< Deny list.                             */
-	PurplePrivacyType perm_deny;  /**< The permit/deny setting.               */
-
-	GList *status_types;        /**< Status types.                          */
-
-	PurplePresence *presence;     /**< Presence.                              */
-	PurpleLog *system_log;        /**< The system log                         */
-
-	void *ui_data;              /**< The UI can put data here.              */
-	PurpleAccountRegistrationCb registration_cb;
-	void *registration_cb_user_data;
-
-	gpointer priv;              /**< Pointer to opaque private data. */
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**************************************************************************/
-/** @name Account API                                                     */
-/**************************************************************************/
-/*@{*/
-
-/**
- * Creates a new account.
- *
- * @param username    The username.
- * @param protocol_id The protocol ID.
- *
- * @return The new account.
- */
-PurpleAccount *purple_account_new(const char *username, const char *protocol_id);
-
-/**
- * Destroys an account.
- *
- * @param account The account to destroy.
- */
-void purple_account_destroy(PurpleAccount *account);
-
-/**
- * Connects to an account.
- *
- * @param account The account to connect to.
- */
-void purple_account_connect(PurpleAccount *account);
-
-/**
- * Sets the callback for successful registration.
- *
- * @param account	The account for which this callback should be used
- * @param cb	The callback
- * @param user_data	The user data passed to the callback
- */
-void purple_account_set_register_callback(PurpleAccount *account, PurpleAccountRegistrationCb cb, void *user_data);
-
-/**
- * Registers an account.
- *
- * @param account The account to register.
- */
-void purple_account_register(PurpleAccount *account);
-
-/**
- * Unregisters an account (deleting it from the server).
- *
- * @param account The account to unregister.
- * @param cb Optional callback to be called when unregistration is complete
- * @param user_data user data to pass to the callback
- */
-void purple_account_unregister(PurpleAccount *account, PurpleAccountUnregistrationCb cb, void *user_data);
-
-/**
- * Disconnects from an account.
- *
- * @param account The account to disconnect from.
- */
-void purple_account_disconnect(PurpleAccount *account);
-
-/**
- * Notifies the user that the account was added to a remote user's
- * buddy list.
- *
- * This will present a dialog informing the user that he was added to the
- * remote user's buddy list.
- *
- * @param account     The account that was added.
- * @param remote_user The name of the user that added this account.
- * @param id          The optional ID of the local account. Rarely used.
- * @param alias       The optional alias of the user.
- * @param message     The optional message sent from the user adding you.
- */
-void purple_account_notify_added(PurpleAccount *account, const char *remote_user,
-                               const char *id, const char *alias,
-                               const char *message);
-
-/**
- * Notifies the user that the account was addded to a remote user's buddy
- * list and asks ther user if they want to add the remote user to their buddy
- * list.
- *
- * This will present a dialog informing the local user that the remote user
- * added them to the remote user's buddy list and will ask if they want to add
- * the remote user to the buddy list.
- *
- * @param account     The account that was added.
- * @param remote_user The name of the user that added this account.
- * @param id          The optional ID of the local account. Rarely used.
- * @param alias       The optional alias of the user.
- * @param message     The optional message sent from the user adding you.
- */
-void purple_account_request_add(PurpleAccount *account, const char *remote_user,
-                              const char *id, const char *alias,
-                              const char *message);
-
-/**
- * Notifies the user that a remote user has wants to add the local user
- * to his or her buddy list and requires authorization to do so.
- *
- * This will present a dialog informing the user of this and ask if the
- * user authorizes or denies the remote user from adding him.
- *
- * @param account      The account that was added
- * @param remote_user  The name of the user that added this account.
- * @param id           The optional ID of the local account. Rarely used.
- * @param alias        The optional alias of the remote user.
- * @param message      The optional message sent by the user wanting to add you.
- * @param on_list      Is the remote user already on the buddy list?
- * @param auth_cb      The callback called when the local user accepts
- * @param deny_cb      The callback called when the local user rejects
- * @param user_data    Data to be passed back to the above callbacks
- *
- * @return A UI-specific handle.
- */
-void *purple_account_request_authorization(PurpleAccount *account, const char *remote_user,
-					const char *id, const char *alias, const char *message, gboolean on_list,
-					PurpleAccountRequestAuthorizationCb auth_cb, PurpleAccountRequestAuthorizationCb deny_cb, void *user_data);
-
-/**
- * Close account requests registered for the given PurpleAccount
- *
- * @param account	   The account for which requests should be closed
- */
-void purple_account_request_close_with_account(PurpleAccount *account);
-
-/**
- * Close the account request for the given ui handle
- *
- * @param ui_handle	   The ui specific handle for which requests should be closed
- */
-void purple_account_request_close(void *ui_handle);
-
-/**
- * Requests a password from the user for the account. Does not set the
- * account password on success; do that in ok_cb if desired.
- *
- * @param account     The account to request the password for.
- * @param ok_cb       The callback for the OK button.
- * @param cancel_cb   The callback for the cancel button.
- * @param user_data   User data to be passed into callbacks.
- */
-void purple_account_request_password(PurpleAccount *account, GCallback ok_cb,
-				     GCallback cancel_cb, void *user_data);
-
-/**
- * Requests information from the user to change the account's password.
- *
- * @param account The account to change the password on.
- */
-void purple_account_request_change_password(PurpleAccount *account);
-
-/**
- * Requests information from the user to change the account's
- * user information.
- *
- * @param account The account to change the user information on.
- */
-void purple_account_request_change_user_info(PurpleAccount *account);
-
-/**
- * Sets the account's username.
- *
- * @param account  The account.
- * @param username The username.
- */
-void purple_account_set_username(PurpleAccount *account, const char *username);
-
-/**
- * Sets the account's password.
- *
- * @param account  The account.
- * @param password The password.
- */
-void purple_account_set_password(PurpleAccount *account, const char *password);
-
-/**
- * Sets the account's alias.
- *
- * @param account The account.
- * @param alias   The alias.
- */
-void purple_account_set_alias(PurpleAccount *account, const char *alias);
-
-/**
- * Sets the account's user information
- *
- * @param account   The account.
- * @param user_info The user information.
- */
-void purple_account_set_user_info(PurpleAccount *account, const char *user_info);
-
-/**
- * Sets the account's buddy icon path.
- *
- * @param account The account.
- * @param path	  The buddy icon non-cached path.
- */
-void purple_account_set_buddy_icon_path(PurpleAccount *account, const char *path);
-
-/**
- * Sets the account's protocol ID.
- *
- * @param account     The account.
- * @param protocol_id The protocol ID.
- */
-void purple_account_set_protocol_id(PurpleAccount *account,
-								  const char *protocol_id);
-
-/**
- * Sets the account's connection.
- *
- * @param account The account.
- * @param gc      The connection.
- */
-void purple_account_set_connection(PurpleAccount *account, PurpleConnection *gc);
-
-/**
- * Sets whether or not this account should save its password.
- *
- * @param account The account.
- * @param value   @c TRUE if it should remember the password.
- */
-void purple_account_set_remember_password(PurpleAccount *account, gboolean value);
-
-/**
- * Sets whether or not this account should check for mail.
- *
- * @param account The account.
- * @param value   @c TRUE if it should check for mail.
- */
-void purple_account_set_check_mail(PurpleAccount *account, gboolean value);
-
-/**
- * Sets whether or not this account is enabled for the specified
- * UI.
- *
- * @param account The account.
- * @param ui      The UI.
- * @param value   @c TRUE if it is enabled.
- */
-void purple_account_set_enabled(PurpleAccount *account, const char *ui,
-			      gboolean value);
-
-/**
- * Sets the account's proxy information.
- *
- * @param account The account.
- * @param info    The proxy information.
- */
-void purple_account_set_proxy_info(PurpleAccount *account, PurpleProxyInfo *info);
-
-/**
- * Sets the account's privacy type.
- *
- * @param account      The account.
- * @param privacy_type The privacy type.
- *
- * @since 2.7.0
- */
-void purple_account_set_privacy_type(PurpleAccount *account, PurplePrivacyType privacy_type);
-
-/**
- * Sets the account's status types.
- *
- * @param account      The account.
- * @param status_types The list of status types.
- */
-void purple_account_set_status_types(PurpleAccount *account, GList *status_types);
-
-/**
- * Variadic version of purple_account_set_status_list(); the variadic list
- * replaces @a attrs, and should be <tt>NULL</tt>-terminated.
- *
- * @copydoc purple_account_set_status_list()
- */
-void purple_account_set_status(PurpleAccount *account, const char *status_id,
-	gboolean active, ...) G_GNUC_NULL_TERMINATED;
-
-
-/**
- * Activates or deactivates a status.  All changes to the statuses of
- * an account go through this function or purple_account_set_status().
- *
- * You can only deactivate an exclusive status by activating another exclusive
- * status.  So, if @a status_id is an exclusive status and @a active is @c
- * FALSE, this function does nothing.
- *
- * @param account   The account.
- * @param status_id The ID of the status.
- * @param active    Whether @a status_id is to be activated (<tt>TRUE</tt>) or
- *                  deactivated (<tt>FALSE</tt>).
- * @param attrs     A list of <tt>const char *</tt> attribute names followed by
- *                  <tt>const char *</tt> attribute values for the status.
- *                  (For example, one pair might be <tt>"message"</tt> followed
- *                  by <tt>"hello, talk to me!"</tt>.)
- */
-void purple_account_set_status_list(PurpleAccount *account,
-	const char *status_id, gboolean active, GList *attrs);
-
-/**
- * Set a server-side (public) alias for this account.  The account
- * must already be connected.
- *
- * Currently, the public alias is not stored locally, although this
- * may change in a later version.
- *
- * @param account    The account
- * @param alias      The new public alias for this account or NULL
- *                   to unset the alias/nickname (or return it to
- *                   a protocol-specific "default", like the username)
- * @param success_cb A callback which will be called if the alias
- *                   is successfully set on the server (or NULL).
- * @param failure_cb A callback which will be called if the alias
- *                   is not successfully set on the server (or NULL).
- *
- * @since 2.7.0
- */
-void purple_account_set_public_alias(PurpleAccount *account,
-	const char *alias, PurpleSetPublicAliasSuccessCallback success_cb,
-	PurpleSetPublicAliasFailureCallback failure_cb);
-
-/**
- * Fetch the server-side (public) alias for this account.  The account
- * must already be connected.
- *
- * @param account    The account
- * @param success_cb A callback which will be called with the alias
- * @param failure_cb A callback which will be called if the prpl is
- *                   unable to retrieve the server-side alias.
- * @since 2.7.0
- */
-void purple_account_get_public_alias(PurpleAccount *account,
-	PurpleGetPublicAliasSuccessCallback success_cb,
-	PurpleGetPublicAliasFailureCallback failure_cb);
-
-/**
- * Return whether silence suppression is used during voice call.
- *
- * @param account The account.
- *
- * @return @c TRUE if suppression is used, or @c FALSE if not.
- */
-gboolean purple_account_get_silence_suppression(const PurpleAccount *account);
-
-/**
- * Sets whether silence suppression is used during voice call.
- *
- * @param account The account.
- * @param value   @c TRUE if suppression should be used.
- */
-void purple_account_set_silence_suppression(PurpleAccount *account,
-											gboolean value);
-
-/**
- * Clears all protocol-specific settings on an account.
- *
- * @param account The account.
- */
-void purple_account_clear_settings(PurpleAccount *account);
-
-/**
- * Removes an account-specific setting by name.
- *
- * @param account The account.
- * @param setting The setting to remove.
- *
- * @since 2.6.0
- */
-void purple_account_remove_setting(PurpleAccount *account, const char *setting);
-
-/**
- * Sets a protocol-specific integer setting for an account.
- *
- * @param account The account.
- * @param name    The name of the setting.
- * @param value   The setting's value.
- */
-void purple_account_set_int(PurpleAccount *account, const char *name, int value);
-
-/**
- * Sets a protocol-specific string setting for an account.
- *
- * @param account The account.
- * @param name    The name of the setting.
- * @param value   The setting's value.
- */
-void purple_account_set_string(PurpleAccount *account, const char *name,
-							 const char *value);
-
-/**
- * Sets a protocol-specific boolean setting for an account.
- *
- * @param account The account.
- * @param name    The name of the setting.
- * @param value   The setting's value.
- */
-void purple_account_set_bool(PurpleAccount *account, const char *name,
-						   gboolean value);
-
-/**
- * Sets a UI-specific integer setting for an account.
- *
- * @param account The account.
- * @param ui      The UI name.
- * @param name    The name of the setting.
- * @param value   The setting's value.
- */
-void purple_account_set_ui_int(PurpleAccount *account, const char *ui,
-							 const char *name, int value);
-
-/**
- * Sets a UI-specific string setting for an account.
- *
- * @param account The account.
- * @param ui      The UI name.
- * @param name    The name of the setting.
- * @param value   The setting's value.
- */
-void purple_account_set_ui_string(PurpleAccount *account, const char *ui,
-								const char *name, const char *value);
-
-/**
- * Sets a UI-specific boolean setting for an account.
- *
- * @param account The account.
- * @param ui      The UI name.
- * @param name    The name of the setting.
- * @param value   The setting's value.
- */
-void purple_account_set_ui_bool(PurpleAccount *account, const char *ui,
-							  const char *name, gboolean value);
-
-/**
- * Returns whether or not the account is connected.
- *
- * @param account The account.
- *
- * @return @c TRUE if connected, or @c FALSE otherwise.
- */
-gboolean purple_account_is_connected(const PurpleAccount *account);
-
-/**
- * Returns whether or not the account is connecting.
- *
- * @param account The account.
- *
- * @return @c TRUE if connecting, or @c FALSE otherwise.
- */
-gboolean purple_account_is_connecting(const PurpleAccount *account);
-
-/**
- * Returns whether or not the account is disconnected.
- *
- * @param account The account.
- *
- * @return @c TRUE if disconnected, or @c FALSE otherwise.
- */
-gboolean purple_account_is_disconnected(const PurpleAccount *account);
-
-/**
- * Returns the account's username.
- *
- * @param account The account.
- *
- * @return The username.
- */
-const char *purple_account_get_username(const PurpleAccount *account);
-
-/**
- * Returns the account's password.
- *
- * @param account The account.
- *
- * @return The password.
- */
-const char *purple_account_get_password(const PurpleAccount *account);
-
-/**
- * Returns the account's alias.
- *
- * @param account The account.
- *
- * @return The alias.
- */
-const char *purple_account_get_alias(const PurpleAccount *account);
-
-/**
- * Returns the account's user information.
- *
- * @param account The account.
- *
- * @return The user information.
- */
-const char *purple_account_get_user_info(const PurpleAccount *account);
-
-/**
- * Gets the account's buddy icon path.
- *
- * @param account The account.
- *
- * @return The buddy icon's non-cached path.
- */
-const char *purple_account_get_buddy_icon_path(const PurpleAccount *account);
-
-/**
- * Returns the account's protocol ID.
- *
- * @param account The account.
- *
- * @return The protocol ID.
- */
-const char *purple_account_get_protocol_id(const PurpleAccount *account);
-
-/**
- * Returns the account's protocol name.
- *
- * @param account The account.
- *
- * @return The protocol name.
- */
-const char *purple_account_get_protocol_name(const PurpleAccount *account);
-
-/**
- * Returns the account's connection.
- *
- * @param account The account.
- *
- * @return The connection.
- */
-PurpleConnection *purple_account_get_connection(const PurpleAccount *account);
-
-/**
- * Returns a name for this account appropriate for display to the user. In
- * order of preference: the account's alias; the contact or buddy alias (if
- * the account exists on its own buddy list); the connection's display name;
- * the account's username.
- *
- * @param account The account.
- *
- * @return The name to display.
- *
- * @since 2.7.0
- */
-const gchar *purple_account_get_name_for_display(const PurpleAccount *account);
-
-/**
- * Returns whether or not this account should save its password.
- *
- * @param account The account.
- *
- * @return @c TRUE if it should remember the password.
- */
-gboolean purple_account_get_remember_password(const PurpleAccount *account);
-
-/**
- * Returns whether or not this account should check for mail.
- *
- * @param account The account.
- *
- * @return @c TRUE if it should check for mail.
- */
-gboolean purple_account_get_check_mail(const PurpleAccount *account);
-
-/**
- * Returns whether or not this account is enabled for the
- * specified UI.
- *
- * @param account The account.
- * @param ui      The UI.
- *
- * @return @c TRUE if it enabled on this UI.
- */
-gboolean purple_account_get_enabled(const PurpleAccount *account,
-				  const char *ui);
-
-/**
- * Returns the account's proxy information.
- *
- * @param account The account.
- *
- * @return The proxy information.
- */
-PurpleProxyInfo *purple_account_get_proxy_info(const PurpleAccount *account);
-
-/**
- * Returns the account's privacy type.
- *
- * @param account   The account.
- *
- * @return The privacy type.
- *
- * @since 2.7.0
- */
-PurplePrivacyType purple_account_get_privacy_type(const PurpleAccount *account);
-
-/**
- * Returns the active status for this account.  This looks through
- * the PurplePresence associated with this account and returns the
- * PurpleStatus that has its active flag set to "TRUE."  There can be
- * only one active PurpleStatus in a PurplePresence.
- *
- * @param account   The account.
- *
- * @return The active status.
- */
-PurpleStatus *purple_account_get_active_status(const PurpleAccount *account);
-
-/**
- * Returns the account status with the specified ID.
- *
- * Note that this works differently than purple_buddy_get_status() in that
- * it will only return NULL if the status was not registered.
- *
- * @param account   The account.
- * @param status_id The status ID.
- *
- * @return The status, or NULL if it was never registered.
- */
-PurpleStatus *purple_account_get_status(const PurpleAccount *account,
-									const char *status_id);
-
-/**
- * Returns the account status type with the specified ID.
- *
- * @param account The account.
- * @param id      The ID of the status type to find.
- *
- * @return The status type if found, or NULL.
- */
-PurpleStatusType *purple_account_get_status_type(const PurpleAccount *account,
-											 const char *id);




More information about the commits mailing list