adium-1.4 2839:c51944f7521f: im.pidgin.adium.1-4 at 960a44e5b738...
commits at adium.im
commits at adium.im
Sun Nov 29 02:43:40 UTC 2009
details: http://hg.adium.im/adium-1.4/rev/c51944f7521f
revision: 2839:c51944f7521f
author: Smew
date: Sat Nov 28 21:43:30 2009 -0500
im.pidgin.adium.1-4 at 960a44e5b738200f50808095288a3f2ab8d48193.
diffs (326 lines):
diff -r 880afc67d1d1 -r c51944f7521f Frameworks/libpurple.framework/Versions/0.6.4/Headers/ft.h
--- a/Frameworks/libpurple.framework/Versions/0.6.4/Headers/ft.h Sat Nov 28 21:29:16 2009 -0500
+++ b/Frameworks/libpurple.framework/Versions/0.6.4/Headers/ft.h Sat Nov 28 21:43:30 2009 -0500
@@ -160,7 +160,10 @@
PurpleXferStatusType status; /**< File Transfer's status. */
- /* I/O operations. */
+ /** I/O operations, which should be set by the prpl using
+ * purple_xfer_set_init_fnc() and friends. Setting #init is
+ * mandatory; all others are optional.
+ */
struct
{
void (*init)(PurpleXfer *xfer);
diff -r 880afc67d1d1 -r c51944f7521f Frameworks/libpurple.framework/Versions/0.6.4/Headers/jabber.h
--- a/Frameworks/libpurple.framework/Versions/0.6.4/Headers/jabber.h Sat Nov 28 21:29:16 2009 -0500
+++ b/Frameworks/libpurple.framework/Versions/0.6.4/Headers/jabber.h Sat Nov 28 21:43:30 2009 -0500
@@ -64,6 +64,8 @@
#include "roomlist.h"
#include "sslconn.h"
+#include "namespaces.h"
+
#include "iq.h"
#include "jutil.h"
#include "xmlnode.h"
diff -r 880afc67d1d1 -r c51944f7521f Frameworks/libpurple.framework/Versions/0.6.4/Headers/msn.h
--- a/Frameworks/libpurple.framework/Versions/0.6.4/Headers/msn.h Sat Nov 28 21:29:16 2009 -0500
+++ b/Frameworks/libpurple.framework/Versions/0.6.4/Headers/msn.h Sat Nov 28 21:43:30 2009 -0500
@@ -90,39 +90,50 @@
typedef enum
{
- MSN_CLIENT_CAP_WIN_MOBILE = 0x000001,
- MSN_CLIENT_CAP_INK_GIF = 0x000004,
- MSN_CLIENT_CAP_INK_ISF = 0x000008,
- MSN_CLIENT_CAP_VIDEO_CHAT = 0x000010,
- MSN_CLIENT_CAP_PACKET = 0x000020,
- MSN_CLIENT_CAP_MSNMOBILE = 0x000040,
- MSN_CLIENT_CAP_MSNDIRECT = 0x000080,
- MSN_CLIENT_CAP_WEBMSGR = 0x000200,
- MSN_CLIENT_CAP_TGW = 0x000800,
- MSN_CLIENT_CAP_SPACE = 0x001000,
- MSN_CLIENT_CAP_MCE = 0x002000,
- MSN_CLIENT_CAP_DIRECTIM = 0x004000,
- MSN_CLIENT_CAP_WINKS = 0x008000,
- MSN_CLIENT_CAP_SEARCH = 0x010000,
- MSN_CLIENT_CAP_BOT = 0x020000,
- MSN_CLIENT_CAP_VOICEIM = 0x040000,
- MSN_CLIENT_CAP_SCHANNEL = 0x080000,
- MSN_CLIENT_CAP_SIP_INVITE = 0x100000,
- MSN_CLIENT_CAP_SDRIVE = 0x400000
+ MSN_CLIENT_CAP_WIN_MOBILE = 0x0000001,
+ MSN_CLIENT_CAP_INK_GIF = 0x0000004,
+ MSN_CLIENT_CAP_INK_ISF = 0x0000008,
+ MSN_CLIENT_CAP_VIDEO_CHAT = 0x0000010,
+ MSN_CLIENT_CAP_PACKET = 0x0000020,
+ MSN_CLIENT_CAP_MSNMOBILE = 0x0000040,
+ MSN_CLIENT_CAP_MSNDIRECT = 0x0000080,
+ MSN_CLIENT_CAP_WEBMSGR = 0x0000200,
+ MSN_CLIENT_CAP_TGW = 0x0000800,
+ MSN_CLIENT_CAP_SPACE = 0x0001000,
+ MSN_CLIENT_CAP_MCE = 0x0002000,
+ MSN_CLIENT_CAP_DIRECTIM = 0x0004000,
+ MSN_CLIENT_CAP_WINKS = 0x0008000,
+ MSN_CLIENT_CAP_SEARCH = 0x0010000,
+ MSN_CLIENT_CAP_BOT = 0x0020000,
+ MSN_CLIENT_CAP_VOICEIM = 0x0040000,
+ MSN_CLIENT_CAP_SCHANNEL = 0x0080000,
+ MSN_CLIENT_CAP_SIP_INVITE = 0x0100000,
+ MSN_CLIENT_CAP_SDRIVE = 0x0400000,
+ MSN_CLIENT_CAP_ONECARE = 0x1000000,
+ MSN_CLIENT_CAP_P2P_TURN = 0x2000000,
+ MSN_CLIENT_CAP_P2P_BOOTSTRAP_VIA_UUN = 0x4000000,
} MsnClientCaps;
typedef enum
{
- MSN_CLIENT_VER_5_0 = 0x00,
- MSN_CLIENT_VER_6_0 = 0x10, /* MSNC1 */
- MSN_CLIENT_VER_6_1 = 0x20, /* MSNC2 */
- MSN_CLIENT_VER_6_2 = 0x30, /* MSNC3 */
- MSN_CLIENT_VER_7_0 = 0x40, /* MSNC4 */
- MSN_CLIENT_VER_7_5 = 0x50, /* MSNC5 */
- MSN_CLIENT_VER_8_0 = 0x60, /* MSNC6 */
- MSN_CLIENT_VER_8_1 = 0x70, /* MSNC7 */
- MSN_CLIENT_VER_8_5 = 0x80 /* MSNC8 */
+ MSN_CLIENT_EXT_CAP_RTC_VIDEO = 0x10,
+ MSN_CLIENT_EXT_CAP_P2PV2 = 0x20
+} MsnClientExtCaps;
+
+typedef enum
+{
+ MSN_CLIENT_VER_5_0 = 0x00,
+ MSN_CLIENT_VER_6_0 = 0x10, /* MSNC1 */
+ MSN_CLIENT_VER_6_1 = 0x20, /* MSNC2 */
+ MSN_CLIENT_VER_6_2 = 0x30, /* MSNC3 */
+ MSN_CLIENT_VER_7_0 = 0x40, /* MSNC4 */
+ MSN_CLIENT_VER_7_5 = 0x50, /* MSNC5 */
+ MSN_CLIENT_VER_8_0 = 0x60, /* MSNC6 */
+ MSN_CLIENT_VER_8_1 = 0x70, /* MSNC7 */
+ MSN_CLIENT_VER_8_5 = 0x80, /* MSNC8 */
+ MSN_CLIENT_VER_9_0 = 0x90, /* MSNC9 */
+ MSN_CLIENT_VER_14_0 = 0xA0 /* MSNC10 */
} MsnClientVerId;
@@ -133,6 +144,8 @@
((MSN_CLIENT_ID_VERSION << 24) | \
(MSN_CLIENT_ID_CAPABILITIES))
+#define MSN_CLIENT_EXT_ID 0
+
gboolean msn_email_is_valid(const char *passport);
void msn_act_id(PurpleConnection *gc, const char *entry);
void msn_send_privacy(PurpleConnection *gc);
diff -r 880afc67d1d1 -r c51944f7521f Frameworks/libpurple.framework/Versions/0.6.4/Headers/oscar.h
--- a/Frameworks/libpurple.framework/Versions/0.6.4/Headers/oscar.h Sat Nov 28 21:29:16 2009 -0500
+++ b/Frameworks/libpurple.framework/Versions/0.6.4/Headers/oscar.h Sat Nov 28 21:43:30 2009 -0500
@@ -29,10 +29,10 @@
#ifndef _OSCAR_H_
#define _OSCAR_H_
+#include "internal.h"
#include "circbuffer.h"
#include "debug.h"
#include "eventloop.h"
-#include "internal.h"
#include "proxy.h"
#include "sslconn.h"
diff -r 880afc67d1d1 -r c51944f7521f Frameworks/libpurple.framework/Versions/0.6.4/Headers/prpl.h
--- a/Frameworks/libpurple.framework/Versions/0.6.4/Headers/prpl.h Sat Nov 28 21:29:16 2009 -0500
+++ b/Frameworks/libpurple.framework/Versions/0.6.4/Headers/prpl.h Sat Nov 28 21:43:30 2009 -0500
@@ -91,14 +91,17 @@
PurpleIconScaleRules scale_rules; /**< How to stretch this icon */
};
+/** Represents an entry containing information that must be supplied by the
+ * user when joining a chat.
+ */
struct proto_chat_entry {
- const char *label;
- const char *identifier;
- gboolean required;
- gboolean is_int;
- int min;
- int max;
- gboolean secret;
+ const char *label; /**< User-friendly name of the entry */
+ const char *identifier; /**< Used by the PRPL to identify the option */
+ gboolean required; /**< True if it's required */
+ gboolean is_int; /**< True if the entry expects an integer */
+ int min; /**< Minimum value in case of integer */
+ int max; /**< Maximum value in case of integer */
+ gboolean secret; /**< True if the entry is secret (password) */
};
/** Represents "nudges" and "buzzes" that you may send to a buddy to attract
@@ -252,7 +255,26 @@
* node.
*/
GList *(*blist_node_menu)(PurpleBlistNode *node);
+
+ /**
+ * Returns a list of #proto_chat_entry structs, which represent
+ * information required by the PRPL to join a chat. libpurple will
+ * call join_chat along with the information filled by the user.
+ *
+ * @return A list of #proto_chat_entry structs
+ */
GList *(*chat_info)(PurpleConnection *);
+
+ /**
+ * Returns a hashtable which maps #proto_chat_entry struct identifiers
+ * to default options as strings based on chat_name. The resulting
+ * hashtable should be created with g_hash_table_new_full(g_str_hash,
+ * g_str_equal, NULL, g_free);. Use #get_chat_name if you instead need
+ * to extract a chat name from a hashtable.
+ *
+ * @param chat_name The chat name to be turned into components
+ * @return Hashtable containing the information extracted from chat_name
+ */
GHashTable *(*chat_info_defaults)(PurpleConnection *, const char *chat_name);
/* All the server-related functions */
@@ -314,14 +336,80 @@
void (*rem_permit)(PurpleConnection *, const char *name);
void (*rem_deny)(PurpleConnection *, const char *name);
void (*set_permit_deny)(PurpleConnection *);
+
+ /**
+ * Called when the user requests joining a chat. Should arrange for
+ * #serv_got_joined_chat to be called.
+ *
+ * @param components A hashtable containing information required to
+ * join the chat as described by the entries returned
+ * by #chat_info. It may also be called when accepting
+ * an invitation, in which case this matches the
+ * data parameter passed to #serv_got_chat_invite.
+ */
void (*join_chat)(PurpleConnection *, GHashTable *components);
+
+ /**
+ * Called when the user refuses a chat invitation.
+ *
+ * @param components A hashtable containing information required to
+ * join the chat as passed to #serv_got_chat_invite.
+ */
void (*reject_chat)(PurpleConnection *, GHashTable *components);
+
+ /**
+ * Returns a chat name based on the information in components. Use
+ * #chat_info_defaults if you instead need to generate a hashtable
+ * from a chat name.
+ *
+ * @param components A hashtable containing information about the chat.
+ */
char *(*get_chat_name)(GHashTable *components);
+
+ /**
+ * Invite a user to join a chat.
+ *
+ * @param id The id of the chat to invite the user to.
+ * @param message A message displayed to the user when the invitation
+ * is received.
+ * @param who The name of the user to send the invation to.
+ */
void (*chat_invite)(PurpleConnection *, int id,
const char *message, const char *who);
+ /**
+ * Called when the user requests leaving a chat.
+ *
+ * @param id The id of the chat to leave
+ */
void (*chat_leave)(PurpleConnection *, int id);
+
+ /**
+ * Send a whisper to a user in a chat.
+ *
+ * @param id The id of the chat.
+ * @param who The name of the user to send the whisper to.
+ * @param message The message of the whisper.
+ */
void (*chat_whisper)(PurpleConnection *, int id,
const char *who, const char *message);
+
+ /**
+ * Send a message to a chat.
+ * This PRPL function should return a positive value on success.
+ * If the message is too big to be sent, return -E2BIG. If
+ * the account is not connected, return -ENOTCONN. If the
+ * PRPL is unable to send the message for another reason, return
+ * some other negative value. You can use one of the valid
+ * errno values, or just big something. If the message should
+ * not be echoed to the conversation window, return 0.
+ *
+ * @param id The id of the chat to send the message to.
+ * @param message The message to send to the chat.
+ * @param flags A bitwise OR of #PurpleMessageFlags representing
+ * message flags.
+ * @return A positive number or 0 in case of succes,
+ * a negative error number in case of failure.
+ */
int (*chat_send)(PurpleConnection *, int id, const char *message, PurpleMessageFlags flags);
/** If implemented, this will be called regularly for this prpl's
diff -r 880afc67d1d1 -r c51944f7521f Frameworks/libpurple.framework/Versions/0.6.4/Headers/server.h
--- a/Frameworks/libpurple.framework/Versions/0.6.4/Headers/server.h Sat Nov 28 21:29:16 2009 -0500
+++ b/Frameworks/libpurple.framework/Versions/0.6.4/Headers/server.h Sat Nov 28 21:43:30 2009 -0500
@@ -168,6 +168,14 @@
const char *who, const char *message,
GHashTable *data);
+/**
+ * Called by a prpl when an account has joined a chat.
+ *
+ * @param gc The connection on which the chat was joined.
+ * @param id The id of the chat, assigned by the prpl.
+ * @param name The name of the chat.
+ * @return The resulting conversation
+ */
PurpleConversation *serv_got_joined_chat(PurpleConnection *gc,
int id, const char *name);
/**
@@ -181,7 +189,24 @@
*/
void purple_serv_got_join_chat_failed(PurpleConnection *gc, GHashTable *data);
+/**
+ * Called by a prpl when an account has left a chat.
+ *
+ * @param g The connection on which the chat was left.
+ * @param id The id of the chat, as assigned by the prpl.
+ */
void serv_got_chat_left(PurpleConnection *g, int id);
+
+/**
+ * Called by a prpl when a message has been received in a chat.
+ *
+ * @param g The connection on which the message was received.
+ * @param id The id of the chat, as assigned by the prpl.
+ * @param who The name of the user who sent the message.
+ * @param flags The flags of the message.
+ * @param message The message received in the chat.
+ * @param mtime The time when the message was received.
+ */
void serv_got_chat_in(PurpleConnection *g, int id, const char *who,
PurpleMessageFlags flags, const char *message, time_t mtime);
void serv_send_file(PurpleConnection *gc, const char *who, const char *file);
diff -r 880afc67d1d1 -r c51944f7521f Frameworks/libpurple.framework/Versions/0.6.4/Resources/ca/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/ca/LC_MESSAGES/pidgin.mo has changed
diff -r 880afc67d1d1 -r c51944f7521f Frameworks/libpurple.framework/Versions/0.6.4/Resources/de/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/de/LC_MESSAGES/pidgin.mo has changed
diff -r 880afc67d1d1 -r c51944f7521f Frameworks/libpurple.framework/Versions/0.6.4/Resources/fr/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/fr/LC_MESSAGES/pidgin.mo has changed
diff -r 880afc67d1d1 -r c51944f7521f Frameworks/libpurple.framework/Versions/0.6.4/Resources/hu/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/hu/LC_MESSAGES/pidgin.mo has changed
diff -r 880afc67d1d1 -r c51944f7521f Frameworks/libpurple.framework/Versions/0.6.4/Resources/uk/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/uk/LC_MESSAGES/pidgin.mo has changed
diff -r 880afc67d1d1 -r c51944f7521f Frameworks/libpurple.framework/Versions/0.6.4/Resources/zh_CN/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.6.4/Resources/zh_CN/LC_MESSAGES/pidgin.mo has changed
diff -r 880afc67d1d1 -r c51944f7521f Frameworks/libpurple.framework/Versions/0.6.4/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.6.4/libpurple has changed
More information about the commits
mailing list