cpw.darkrain42.irc: b1d87ddb: @since, whitespace, and ChangeLog.API
darkrain42 at pidgin.im
darkrain42 at pidgin.im
Sun Jul 12 17:30:27 EDT 2009
-----------------------------------------------------------------
Revision: b1d87ddb17a41c811f20b47e71402f9c38c51f97
Ancestor: 8b61c7377aa6cc0a70bad84c90cac96a45ddd45e
Author: darkrain42 at pidgin.im
Date: 2009-07-12T19:21:56
Branch: im.pidgin.cpw.darkrain42.irc
URL: http://d.pidgin.im/viewmtn/revision/info/b1d87ddb17a41c811f20b47e71402f9c38c51f97
Modified files:
ChangeLog.API libpurple/conversation.c
libpurple/conversation.h
ChangeLog:
@since, whitespace, and ChangeLog.API
-------------- next part --------------
============================================================
--- ChangeLog.API 84ae5cf6009f85260133c88d4e57f2f203550ee7
+++ ChangeLog.API 2bf5796167b8f6d071dfc5e591bd6febec81708c
@@ -31,6 +31,10 @@ version 2.6.0 (??/??/2009):
* purple_connection_set_protocol_data
* purple_contact_destroy
* purple_conv_chat_invite_user
+ * purple_conv_chat_cb_get_attribute
+ * purple_conv_chat_cb_get_attribute_keys
+ * purple_conv_chat_cb_set_attribute
+ * purple_conv_chat_cb_set_attributes
* purple_debug_is_unsafe
* purple_debug_is_verbose
* purple_debug_set_unsafe
@@ -79,6 +83,7 @@ version 2.6.0 (??/??/2009):
* Added a client_type field in the get_ui_info core UI op. See
core.h for details.
* Added introspection of signals exposed via the D-Bus API.
+ * Added PURPLE_CBCFLAGS_AWAY to PurpleConvChatBuddyFlags enum.
Deprecated:
* buddy-added and buddy-removed blist signals
============================================================
--- libpurple/conversation.c e4a1006b2970594a741c3ccfd3c97bfedccc74fd
+++ libpurple/conversation.c ac715edc2f1fcba1a2531105bed9611fbcb6334d
@@ -2084,7 +2084,7 @@ purple_conv_chat_cb_new(const char *name
cb->flags = flags;
cb->alias = g_strdup(alias);
cb->attributes = g_hash_table_new_full(g_str_hash, g_str_equal,
- g_free, g_free);
+ g_free, g_free);
PURPLE_DBUS_REGISTER_POINTER(cb, PurpleConvChatBuddy);
return cb;
@@ -2136,7 +2136,7 @@ purple_conv_chat_cb_get_attribute(Purple
{
g_return_val_if_fail(cb != NULL, NULL);
g_return_val_if_fail(key != NULL, NULL);
-
+
return g_hash_table_lookup(cb->attributes, key);
}
@@ -2151,11 +2151,11 @@ purple_conv_chat_cb_get_attribute_keys(P
purple_conv_chat_cb_get_attribute_keys(PurpleConvChatBuddy *cb)
{
GList *keys = NULL;
-
+
g_return_val_if_fail(cb != NULL, NULL);
-
+
g_hash_table_foreach(cb->attributes, (GHFunc)append_attribute_key, &keys);
-
+
return keys;
}
@@ -2164,16 +2164,16 @@ purple_conv_chat_cb_set_attribute(Purple
{
PurpleConversation *conv;
PurpleConversationUiOps *ops;
-
+
g_return_if_fail(cb != NULL);
g_return_if_fail(key != NULL);
g_return_if_fail(value != NULL);
-
+
g_hash_table_replace(cb->attributes, g_strdup(key), g_strdup(value));
-
+
conv = purple_conv_chat_get_conversation(chat);
ops = purple_conversation_get_ui_ops(conv);
-
+
if (ops != NULL && ops->chat_update_user != NULL)
ops->chat_update_user(conv, cb->name);
}
@@ -2183,20 +2183,20 @@ purple_conv_chat_cb_set_attributes(Purpl
{
PurpleConversation *conv;
PurpleConversationUiOps *ops;
-
+
g_return_if_fail(cb != NULL);
g_return_if_fail(keys != NULL);
g_return_if_fail(values != NULL);
-
+
while (keys != NULL && values != NULL) {
g_hash_table_replace(cb->attributes, g_strdup(keys->data), g_strdup(values->data));
keys = g_list_next(keys);
values = g_list_next(values);
}
-
+
conv = purple_conv_chat_get_conversation(chat);
ops = purple_conversation_get_ui_ops(conv);
-
+
if (ops != NULL && ops->chat_update_user != NULL)
ops->chat_update_user(conv, cb->name);
}
============================================================
--- libpurple/conversation.h 4410bcb069d6132e5deeae97a2b99c61b191bdee
+++ libpurple/conversation.h 16fa562c38d57c0eee0450aa348885bdceb8070e
@@ -140,7 +140,7 @@ typedef enum
PURPLE_CBFLAGS_OP = 0x0004, /**< Channel Op or Moderator */
PURPLE_CBFLAGS_FOUNDER = 0x0008, /**< Channel Founder */
PURPLE_CBFLAGS_TYPING = 0x0010, /**< Currently typing */
- PURPLE_CBFLAGS_AWAY = 0x0020 /**< Currently away */
+ PURPLE_CBFLAGS_AWAY = 0x0020 /**< Currently away. @since 2.6.0 */
} PurpleConvChatBuddyFlags;
#include "account.h"
@@ -300,9 +300,10 @@ struct _PurpleConvChatBuddy
PurpleConvChatBuddyFlags flags; /**< A bitwise OR of flags for this participant,
* such as whether they are a channel operator.
*/
- GHashTable *attributes; /**< A hash table of attributes about the user, such as
- * real name, user at host, etc.
- */
+ GHashTable *attributes; /**< A hash table of attributes about the user,
+ * such as real name, user at host, etc.
+ * @since 2.6.0.
+ */
};
/**
@@ -1365,8 +1366,10 @@ const char *purple_conv_chat_cb_get_name
* @param key The key of the attribute.
*
* @return The value of the attribute key.
+ * @since 2.6.0
*/
-const char *purple_conv_chat_cb_get_attribute(PurpleConvChatBuddy *cb, const char *key);
+const char *purple_conv_chat_cb_get_attribute(PurpleConvChatBuddy *cb,
+ const char *key);
/**
* Get the keys of all atributes of a chat buddy
@@ -1374,9 +1377,10 @@ const char *purple_conv_chat_cb_get_attr
* @param cb The chat buddy.
*
* @return A list of the attributes of a chat buddy.
+ * @since 2.6.0
*/
GList *purple_conv_chat_cb_get_attribute_keys(PurpleConvChatBuddy *cb);
-
+
/**
* Set an attribute of a chat buddy
*
@@ -1384,8 +1388,11 @@ GList *purple_conv_chat_cb_get_attribute
* @param cb The chat buddy.
* @param key The key of the attribute.
* @param value The value of the attribute.
+ *
+ * @since 2.6.0
*/
-void purple_conv_chat_cb_set_attribute(PurpleConvChat *chat, PurpleConvChatBuddy *cb, const char *key, const char *value);
+void purple_conv_chat_cb_set_attribute(PurpleConvChat *chat,
+ PurpleConvChatBuddy *cb, const char *key, const char *value);
/**
* Set attributes of a chat buddy
@@ -1394,11 +1401,13 @@ void purple_conv_chat_cb_set_attribute(P
* @param cb The chat buddy.
* @param keys A GList of the keys.
* @param values A GList of the values.
+ *
+ * @since 2.6.0
*/
void
-purple_conv_chat_cb_set_attributes(PurpleConvChat *chat, PurpleConvChatBuddy *cb, GList *keys, GList *values);
+purple_conv_chat_cb_set_attributes(PurpleConvChat *chat,
+ PurpleConvChatBuddy *cb, GList *keys, GList *values);
-
/**
* Destroys a chat buddy
*
More information about the Commits
mailing list