pidgin: 32b1c914: Rename the _with_invite functions to the...
qulogic at pidgin.im
qulogic at pidgin.im
Sat Sep 3 19:55:48 EDT 2011
----------------------------------------------------------------------
Revision: 32b1c91416402a0ca95a593eaa0378ff2d9a12f2
Parent: 21f078cdce656c60707d6518904262ee44ac648c
Author: qulogic at pidgin.im
Date: 09/03/11 19:13:11
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/32b1c91416402a0ca95a593eaa0378ff2d9a12f2
Changelog:
Rename the _with_invite functions to their counterparts.
Changes against parent 21f078cdce656c60707d6518904262ee44ac648c
patched ChangeLog.API
patched finch/gntblist.c
patched libpurple/account.c
patched libpurple/account.h
patched libpurple/blist.c
patched libpurple/protocols/bonjour/bonjour.c
patched libpurple/protocols/gg/gg.c
patched libpurple/protocols/irc/irc.c
patched libpurple/protocols/jabber/libxmpp.c
patched libpurple/protocols/jabber/roster.c
patched libpurple/protocols/jabber/roster.h
patched libpurple/protocols/msn/msn.c
patched libpurple/protocols/mxit/mxit.c
patched libpurple/protocols/myspace/myspace.c
patched libpurple/protocols/novell/novell.c
patched libpurple/protocols/null/nullprpl.c
patched libpurple/protocols/oscar/libaim.c
patched libpurple/protocols/oscar/libicq.c
patched libpurple/protocols/oscar/oscar.c
patched libpurple/protocols/sametime/sametime.c
patched libpurple/protocols/simple/simple.c
patched libpurple/protocols/yahoo/libyahoo.c
patched libpurple/protocols/yahoo/libyahoojp.c
patched libpurple/protocols/yahoo/libymsg.c
patched libpurple/protocols/yahoo/libymsg.h
patched libpurple/protocols/zephyr/zephyr.c
patched libpurple/prpl.h
patched pidgin/gtkblist.c
patched pidgin/gtkconv.c
-------------- next part --------------
============================================================
--- libpurple/prpl.h a57aa67f9d929d077f1adb697092ec1d78afe758
+++ libpurple/prpl.h d69f4eed50e49ae63c5f38e8ac2ea2b36d7638a9
@@ -316,6 +316,7 @@ struct _PurplePluginProtocolInfo
void (*set_idle)(PurpleConnection *, int idletime);
void (*change_passwd)(PurpleConnection *, const char *old_pass,
const char *new_pass);
+
/**
* Add a buddy to a group on the server.
*
@@ -324,11 +325,10 @@ struct _PurplePluginProtocolInfo
* authorization and the user is not already authorized to see the
* status of \a buddy, \a add_buddy should request authorization.
*
- * @deprecated Since 2.8.0, add_buddy_with_invite is preferred.
- * @see add_buddy_with_invite
+ * If authorization is required, then use the supplied invite message.
*/
- void (*add_buddy)(PurpleConnection *, PurpleBuddy *buddy, PurpleGroup *group);
- void (*add_buddies)(PurpleConnection *, GList *buddies, GList *groups);
+ void (*add_buddy)(PurpleConnection *pc, PurpleBuddy *buddy, PurpleGroup *group, const char *message);
+ void (*add_buddies)(PurpleConnection *pc, GList *buddies, GList *groups, const char *message);
void (*remove_buddy)(PurpleConnection *, PurpleBuddy *buddy, PurpleGroup *group);
void (*remove_buddies)(PurpleConnection *, GList *buddies, GList *groups);
void (*add_permit)(PurpleConnection *, const char *name);
@@ -615,21 +615,6 @@ struct _PurplePluginProtocolInfo
void (*get_public_alias)(PurpleConnection *gc,
PurpleGetPublicAliasSuccessCallback success_cb,
PurpleGetPublicAliasFailureCallback failure_cb);
-
- /**
- * Add a buddy to a group on the server.
- *
- * This PRPL function may be called in situations in which the buddy is
- * already in the specified group. If the protocol supports
- * authorization and the user is not already authorized to see the
- * status of \a buddy, \a add_buddy should request authorization.
- *
- * If authorization is required, then use the supplied invite message.
- *
- * @since 2.8.0
- */
- void (*add_buddy_with_invite)(PurpleConnection *pc, PurpleBuddy *buddy, PurpleGroup *group, const char *message);
- void (*add_buddies_with_invite)(PurpleConnection *pc, GList *buddies, GList *groups, const char *message);
};
#define PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl, member) \
============================================================
--- libpurple/protocols/irc/irc.c 6b53eb96b2fb5fc5c21dacedadd712a59db12581
+++ libpurple/protocols/irc/irc.c 82e95390fbeace288253b7f3a1f2d6bc18c02db6
@@ -607,7 +607,7 @@ static void irc_set_status(PurpleAccount
}
}
-static void irc_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
+static void irc_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group, const char *message)
{
struct irc_conn *irc = purple_connection_get_protocol_data(gc);
struct irc_buddy *ib;
@@ -989,9 +989,7 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* get_media_caps */
NULL, /* get_moods */
NULL, /* set_public_alias */
- NULL, /* get_public_alias */
- NULL, /* add_buddy_with_invite */
- NULL /* add_buddies_with_invite */
+ NULL /* get_public_alias */
};
static gboolean load_plugin (PurplePlugin *plugin) {
============================================================
--- libpurple/protocols/msn/msn.c 6667e21b5e290953cad0caa986c8eb834f6bcc56
+++ libpurple/protocols/msn/msn.c ac5ca7d400290eadc4666af813c9fc2819537e58
@@ -2951,7 +2951,7 @@ static PurplePluginProtocolInfo prpl_inf
msn_set_status, /* set_away */
msn_set_idle, /* set_idle */
NULL, /* change_passwd */
- NULL, /* add_buddy */
+ msn_add_buddy, /* add_buddy */
NULL, /* add_buddies */
msn_rem_buddy, /* remove_buddy */
NULL, /* remove_buddies */
@@ -3001,9 +3001,7 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* get_media_caps */
NULL, /* get_moods */
msn_set_public_alias, /* set_public_alias */
- msn_get_public_alias, /* get_public_alias */
- msn_add_buddy, /* add_buddy_with_invite */
- NULL /* add_buddies_with_invite */
+ msn_get_public_alias /* get_public_alias */
};
static PurplePluginInfo info =
============================================================
--- libpurple/protocols/oscar/oscar.c 4db34caa22a701bd1b93bf53129e08ffc6b496dc
+++ libpurple/protocols/oscar/oscar.c 3f2fab04242cfe6c7ac885dd82ca7fd74a3dc641
@@ -3806,7 +3806,7 @@ void oscar_rename_group(PurpleConnection
}
purple_account_remove_buddies(account, moved_buddies, groups);
- purple_account_add_buddies(account, moved_buddies);
+ purple_account_add_buddies(account, moved_buddies, NULL);
g_list_free(groups);
purple_debug_info("oscar",
"ssi: moved all buddies from group %s to %s\n", old_name, gname);
============================================================
--- libpurple/protocols/zephyr/zephyr.c f54d4ab8f8a124019257706c5e09e6c93cbea6a5
+++ libpurple/protocols/zephyr/zephyr.c e960de5abf5a5749cb889e960e97dfd633cea579
@@ -2925,9 +2925,7 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* get_media_caps */
NULL, /* get_moods */
NULL, /* set_public_alias */
- NULL, /* get_public_alias */
- NULL, /* add_buddy_with_invite */
- NULL /* add_buddies_with_invite */
+ NULL /* get_public_alias */
};
static PurplePluginInfo info = {
============================================================
--- libpurple/protocols/gg/gg.c 9554aa54fb3befe54509e00a5ad7a378ada1c920
+++ libpurple/protocols/gg/gg.c 059ec9afa93ef7363eaece26fe97e6ff17fbaaed
@@ -2467,7 +2467,7 @@ static void ggp_set_status(PurpleAccount
}
-static void ggp_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
+static void ggp_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group, const char *message)
{
PurpleAccount *account;
GGPInfo *info = purple_connection_get_protocol_data(gc);
@@ -2726,9 +2726,7 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* can_do_media */
NULL, /* get_moods */
NULL, /* set_public_alias */
- NULL, /* get_public_alias */
- NULL, /* add_buddy_with_invite */
- NULL /* add_buddies_with_invite */
+ NULL /* get_public_alias */
};
static PurplePluginInfo info = {
============================================================
--- libpurple/protocols/yahoo/libymsg.c b43a391005beac3c8d9ab34315a8aad39d72adc1
+++ libpurple/protocols/yahoo/libymsg.c 22edb2b89e792e1fa33a0c8daeaebbfb950dcbe9
@@ -4056,7 +4056,7 @@ static void yahoo_addbuddyfrommenu_cb(Pu
buddy = (PurpleBuddy *) node;
gc = purple_account_get_connection(purple_buddy_get_account(buddy));
- yahoo_add_buddy(gc, buddy, NULL);
+ yahoo_add_buddy(gc, buddy, NULL, NULL);
}
@@ -4945,7 +4945,7 @@ void yahoo_keepalive(PurpleConnection *g
}
-void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *g)
+void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *g, const char *message)
{
YahooData *yd = purple_connection_get_protocol_data(gc);
struct yahoo_packet *pkt;
============================================================
--- pidgin/gtkconv.c abddf155a5bf030f278d7b551441de38df514338
+++ pidgin/gtkconv.c 2825603f7d0827acfaf81a418d7298de759365b0
@@ -6690,7 +6690,7 @@ gray_stuff_out(PidginConversation *gtkco
if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
{
- gtk_widget_set_sensitive(win->menu.add, (prpl_info->add_buddy != NULL) || (prpl_info->add_buddy_with_invite != NULL));
+ gtk_widget_set_sensitive(win->menu.add, (prpl_info->add_buddy != NULL));
gtk_widget_set_sensitive(win->menu.remove, (prpl_info->remove_buddy != NULL));
gtk_widget_set_sensitive(win->menu.send_file,
(prpl_info->send_file != NULL && (!prpl_info->can_receive_file ||
============================================================
--- libpurple/blist.c 269ca437f879b25f4931396af7aa8254f346e4cf
+++ libpurple/blist.c 074585d7b643536d9581d8083a6ffe6a3c80b0ee
@@ -1313,7 +1313,7 @@ void purple_blist_rename_group(PurpleGro
purple_account_remove_buddies(account, buddies, groups);
g_list_free(groups);
- purple_account_add_buddies(account, buddies);
+ purple_account_add_buddies(account, buddies, NULL);
}
g_list_free(buddies);
============================================================
--- pidgin/gtkblist.c ec271b7fed7c7b688a67a87f24cf6413c41d7bc9
+++ pidgin/gtkblist.c 08202bd24716be3a2339f8fcb026f6ee1669845b
@@ -7040,7 +7040,7 @@ add_buddy_cb(GtkWidget *w, int resp, Pid
purple_blist_add_buddy(b, NULL, g, NULL);
}
- purple_account_add_buddy_with_invite(account, b, invite);
+ purple_account_add_buddy(account, b, invite);
/* Offer to merge people with the same alias. */
if (whoalias != NULL && g != NULL)
============================================================
--- libpurple/account.c 8720a4144d94561cc8671c623058b21f214bc3f5
+++ libpurple/account.c 59a6ed318506128f498663be77a1d48cf4a3e6f1
@@ -2518,7 +2518,7 @@ void
}
void
-purple_account_add_buddy(PurpleAccount *account, PurpleBuddy *buddy)
+purple_account_add_buddy(PurpleAccount *account, PurpleBuddy *buddy, const char *message)
{
PurplePluginProtocolInfo *prpl_info = NULL;
PurpleConnection *gc;
@@ -2535,42 +2535,15 @@ purple_account_add_buddy(PurpleAccount *
prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
if (prpl_info != NULL) {
- if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, add_buddy_with_invite))
- prpl_info->add_buddy_with_invite(gc, buddy, purple_buddy_get_group(buddy), NULL);
- else if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, add_buddy))
- prpl_info->add_buddy(gc, buddy, purple_buddy_get_group(buddy));
+ if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, add_buddy))
+ prpl_info->add_buddy(gc, buddy, purple_buddy_get_group(buddy), message);
}
}
void
-purple_account_add_buddy_with_invite(PurpleAccount *account, PurpleBuddy *buddy, const char *message)
+purple_account_add_buddies(PurpleAccount *account, GList *buddies, const char *message)
{
PurplePluginProtocolInfo *prpl_info = NULL;
- PurpleConnection *gc;
- PurplePlugin *prpl = NULL;
-
- g_return_if_fail(account != NULL);
- g_return_if_fail(buddy != NULL);
-
- gc = purple_account_get_connection(account);
- if (gc != NULL)
- prpl = purple_connection_get_prpl(gc);
-
- if (prpl != NULL)
- prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
-
- if (prpl_info != NULL) {
- if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, add_buddy_with_invite))
- prpl_info->add_buddy_with_invite(gc, buddy, purple_buddy_get_group(buddy), message);
- else if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, add_buddy))
- prpl_info->add_buddy(gc, buddy, purple_buddy_get_group(buddy));
- }
-}
-
-void
-purple_account_add_buddies(PurpleAccount *account, GList *buddies)
-{
- PurplePluginProtocolInfo *prpl_info = NULL;
PurpleConnection *gc = purple_account_get_connection(account);
PurplePlugin *prpl = NULL;
@@ -2589,24 +2562,13 @@ purple_account_add_buddies(PurpleAccount
groups = g_list_append(groups, purple_buddy_get_group(buddy));
}
- if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, add_buddies_with_invite))
- prpl_info->add_buddies_with_invite(gc, buddies, groups, NULL);
- else if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, add_buddies))
- prpl_info->add_buddies(gc, buddies, groups);
- else if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, add_buddy_with_invite)) {
- GList *curb = buddies, *curg = groups;
-
- while ((curb != NULL) && (curg != NULL)) {
- prpl_info->add_buddy_with_invite(gc, curb->data, curg->data, NULL);
- curb = curb->next;
- curg = curg->next;
- }
- }
+ if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, add_buddies))
+ prpl_info->add_buddies(gc, buddies, groups, message);
else if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, add_buddy)) {
GList *curb = buddies, *curg = groups;
while ((curb != NULL) && (curg != NULL)) {
- prpl_info->add_buddy(gc, curb->data, curg->data);
+ prpl_info->add_buddy(gc, curb->data, curg->data, message);
curb = curb->next;
curg = curg->next;
}
@@ -2617,55 +2579,6 @@ void
}
void
-purple_account_add_buddies_with_invite(PurpleAccount *account, GList *buddies, const char *message)
-{
- PurplePluginProtocolInfo *prpl_info = NULL;
- PurpleConnection *gc = purple_account_get_connection(account);
- PurplePlugin *prpl = NULL;
-
- if (gc != NULL)
- prpl = purple_connection_get_prpl(gc);
-
- if (prpl != NULL)
- prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
-
- if (prpl_info) {
- GList *cur, *groups = NULL;
-
- /* Make a list of what group each buddy is in */
- for (cur = buddies; cur != NULL; cur = cur->next) {
- PurpleBuddy *buddy = cur->data;
- groups = g_list_append(groups, purple_buddy_get_group(buddy));
- }
-
- if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, add_buddies_with_invite))
- prpl_info->add_buddies_with_invite(gc, buddies, groups, message);
- else if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, add_buddy_with_invite)) {
- GList *curb = buddies, *curg = groups;
-
- while ((curb != NULL) && (curg != NULL)) {
- prpl_info->add_buddy_with_invite(gc, curb->data, curg->data, message);
- curb = curb->next;
- curg = curg->next;
- }
- }
- else if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, add_buddies))
- prpl_info->add_buddies(gc, buddies, groups);
- else if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, add_buddy)) {
- GList *curb = buddies, *curg = groups;
-
- while ((curb != NULL) && (curg != NULL)) {
- prpl_info->add_buddy(gc, curb->data, curg->data);
- curb = curb->next;
- curg = curg->next;
- }
- }
-
- g_list_free(groups);
- }
-}
-
-void
purple_account_remove_buddy(PurpleAccount *account, PurpleBuddy *buddy,
PurpleGroup *group)
{
============================================================
--- libpurple/account.h 0408092f37ba3b8a88d9f0643914f719cef34492
+++ libpurple/account.h d89189563a5998f977b8462e57120c69ca9711da
@@ -958,40 +958,18 @@ void purple_account_destroy_log(PurpleAc
*
* @param account The account.
* @param buddy The buddy to add.
- *
- * @deprecated Use purple_account_add_buddy_with_invite and \c NULL message.
- */
-void purple_account_add_buddy(PurpleAccount *account, PurpleBuddy *buddy);
-/**
- * Adds a buddy to the server-side buddy list for the specified account.
- *
- * @param account The account.
- * @param buddy The buddy to add.
* @param message The invite message. This may be ignored by a prpl.
- *
- * @since 2.8.0
*/
-void purple_account_add_buddy_with_invite(PurpleAccount *account, PurpleBuddy *buddy, const char *message);
+void purple_account_add_buddy(PurpleAccount *account, PurpleBuddy *buddy, const char *message);
/**
* Adds a list of buddies to the server-side buddy list.
*
* @param account The account.
* @param buddies The list of PurpleBlistNodes representing the buddies to add.
- *
- * @deprecated Use purple_account_add_buddies_with_invite and \c NULL message.
- */
-void purple_account_add_buddies(PurpleAccount *account, GList *buddies);
-/**
- * Adds a list of buddies to the server-side buddy list.
- *
- * @param account The account.
- * @param buddies The list of PurpleBlistNodes representing the buddies to add.
* @param message The invite message. This may be ignored by a prpl.
- *
- * @since 2.8.0
*/
-void purple_account_add_buddies_with_invite(PurpleAccount *account, GList *buddies, const char *message);
+void purple_account_add_buddies(PurpleAccount *account, GList *buddies, const char *message);
/**
* Removes a buddy from the server-side buddy list.
============================================================
--- libpurple/protocols/yahoo/libymsg.h dc09f3a4609fdaa4e3bec26b3ba5f7caa8d44e8c
+++ libpurple/protocols/yahoo/libymsg.h 33426a009b36fcbe8e4554854737da6af7ad3b1c
@@ -371,7 +371,7 @@ void yahoo_set_idle(PurpleConnection *gc
unsigned int yahoo_send_typing(PurpleConnection *gc, const char *who, PurpleTypingState state);
void yahoo_set_status(PurpleAccount *account, PurpleStatus *status);
void yahoo_set_idle(PurpleConnection *gc, int idle);
-void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *g);
+void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *g, const char *message);
void yahoo_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group);
void yahoo_add_deny(PurpleConnection *gc, const char *who);
void yahoo_rem_deny(PurpleConnection *gc, const char *who);
============================================================
--- libpurple/protocols/jabber/roster.c abd09ae9dec3654a629197ef9ac431f243506642
+++ libpurple/protocols/jabber/roster.c 27e6fe38e3d3c9cf9bae52b5a3323b013dc14a29
@@ -358,7 +358,7 @@ void jabber_roster_add_buddy(PurpleConne
}
void jabber_roster_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy,
- PurpleGroup *group)
+ PurpleGroup *group, const char *message)
{
JabberStream *js = purple_connection_get_protocol_data(gc);
char *who;
============================================================
--- libpurple/protocols/jabber/roster.h 125bb57d2933e3af9378fe6bdbecbfe7107fa642
+++ libpurple/protocols/jabber/roster.h 28a71d745542596d65e7f5d2de8ae8f0db329d53
@@ -32,7 +32,7 @@ void jabber_roster_add_buddy(PurpleConne
JabberIqType type, const char *id, xmlnode *query);
void jabber_roster_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy,
- PurpleGroup *group);
+ PurpleGroup *group, const char *message);
void jabber_roster_alias_change(PurpleConnection *gc, const char *name,
const char *alias);
void jabber_roster_group_change(PurpleConnection *gc, const char *name,
============================================================
--- libpurple/protocols/novell/novell.c c5526f58c093ad8746c2d573c616530b3582f9dd
+++ libpurple/protocols/novell/novell.c b89f8046fb1222695054b93da085157a4d2841ee
@@ -2545,7 +2545,7 @@ static void
}
static void
-novell_add_buddy(PurpleConnection * gc, PurpleBuddy *buddy, PurpleGroup * group)
+novell_add_buddy(PurpleConnection * gc, PurpleBuddy *buddy, PurpleGroup * group, const char *message)
{
NMFolder *folder = NULL;
NMContact *contact;
@@ -3545,9 +3545,7 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* get_media_caps */
NULL, /* get_moods */
NULL, /* set_public_alias */
- NULL, /* get_public_alias */
- NULL, /* add_buddy_with_invite */
- NULL /* add_buddies_with_invite */
+ NULL /* get_public_alias */
};
static PurplePluginInfo info = {
============================================================
--- ChangeLog.API 5806fc6b00894bef87091812f47e637977a04a61
+++ ChangeLog.API 70bb1c7b70e673ce43783b2dbbba9693baf75e8c
@@ -64,6 +64,10 @@ version 3.0.0 (??/??/????):
* purple_dnsquery_a now takes a PurpleAccount as the first parameter
* purple_srv_resolve now takes a PurpleAccount as the first parameter
* purple_txt_resolve now takes a PurpleAccount as the first parameter
+ * purple_account_add_buddy now takes an invite message as the last
+ parameter
+ * purple_account_add_buddies now takes an invite message as the last
+ parameter
Removed:
* _GntFileType
@@ -99,6 +103,8 @@ version 3.0.0 (??/??/????):
* pidgin_set_custom_buddy_icon
* pidgin_setup_screenname_autocomplete
* PidginConversation.sg
+ * purple_account_add_buddies_with_invite
+ * purple_account_add_buddy_with_invite
* purple_buddy_icons_has_custom_icon
* purple_buddy_icons_find_custom_icon
* purple_buddy_icons_set_custom_icon
@@ -134,6 +140,8 @@ version 3.0.0 (??/??/????):
* purple_util_fetch_url_request_len_with_account. Use
purple_util_fetch_url_request_len, instead.
* PurpleConnectionUiOps.report_disconnect_reason
+ * PurplePluginProtocolInfo.add_buddy_with_invite
+ * PurplePluginProtocolInfo.add_buddies_with_invite
* serv_got_attention
* serv_send_attention
* struct _GtkIMHtmlFontDetail
============================================================
--- libpurple/protocols/sametime/sametime.c 4a7aa31588d374a7f628711172217746941a2106
+++ libpurple/protocols/sametime/sametime.c a8baff7c95c3ba2c6541def127776820b705370f
@@ -4513,7 +4513,8 @@ static void mw_prpl_add_buddy(PurpleConn
static void mw_prpl_add_buddy(PurpleConnection *gc,
PurpleBuddy *buddy,
- PurpleGroup *group) {
+ PurpleGroup *group,
+ const char *message) {
struct mwPurplePluginData *pd = purple_connection_get_protocol_data(gc);
struct mwServiceResolve *srvc;
@@ -4560,7 +4561,8 @@ static void mw_prpl_add_buddies(PurpleCo
static void mw_prpl_add_buddies(PurpleConnection *gc,
GList *buddies,
- GList *groups) {
+ GList *groups,
+ const char *message) {
struct mwPurplePluginData *pd;
GHashTable *group_sets;
============================================================
--- libpurple/protocols/simple/simple.c a9576a271cf36417576e4cb54632ecf583b741d0
+++ libpurple/protocols/simple/simple.c 8b8cca8e422771b9f48ba70ab7fc57fb572f04e6
@@ -193,7 +193,7 @@ static void connection_free_all(struct s
}
}
-static void simple_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
+static void simple_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group, const char *message)
{
struct simple_account_data *sip = purple_connection_get_protocol_data(gc);
struct simple_buddy *b;
@@ -223,7 +223,7 @@ static void simple_get_buddies(PurpleCon
buddies = purple_find_buddies(account, NULL);
while (buddies) {
PurpleBuddy *buddy = buddies->data;
- simple_add_buddy(gc, buddy, purple_buddy_get_group(buddy));
+ simple_add_buddy(gc, buddy, purple_buddy_get_group(buddy), NULL);
buddies = g_slist_delete_link(buddies, buddies);
}
@@ -2117,9 +2117,7 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* get_media_caps */
NULL, /* get_moods */
NULL, /* set_public_alias */
- NULL, /* get_public_alias */
- NULL, /* add_buddy_with_invite */
- NULL /* add_buddies_with_invite */
+ NULL /* get_public_alias */
};
============================================================
--- libpurple/protocols/bonjour/bonjour.c 467b49e676585227c96ce203e0a050b8fb6915db
+++ libpurple/protocols/bonjour/bonjour.c 14a27c5e9a35520bf83d9613a6fca0e68e13f1ae
@@ -256,7 +256,7 @@ static void
* if there is no add_buddy callback.
*/
static void
-bonjour_fake_add_buddy(PurpleConnection *pc, PurpleBuddy *buddy, PurpleGroup *group) {
+bonjour_fake_add_buddy(PurpleConnection *pc, PurpleBuddy *buddy, PurpleGroup *group, const char *message) {
purple_debug_error("bonjour", "Buddy '%s' manually added; removing. "
"Bonjour buddies must be discovered and not manually added.\n",
purple_buddy_get_name(buddy));
@@ -555,9 +555,7 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* get_media_caps */
NULL, /* get_moods */
NULL, /* set_public_alias */
- NULL, /* get_public_alias */
- NULL, /* add_buddy_with_invite */
- NULL /* add_buddies_with_invite */
+ NULL /* get_public_alias */
};
static PurplePluginInfo info =
============================================================
--- finch/gntblist.c c9928c8dc55e8ec16ca472213c779862dee33667
+++ finch/gntblist.c d46b9027ee0fcf8d20d25e4f35a3611689edcc4e
@@ -663,7 +663,7 @@ add_buddy_cb(void *data, PurpleRequestFi
purple_blist_add_buddy(buddy, NULL, grp, NULL);
}
- purple_account_add_buddy_with_invite(account, buddy, invite);
+ purple_account_add_buddy(account, buddy, invite);
}
static void
============================================================
--- libpurple/protocols/oscar/libaim.c d64c47ca2ca9f18c114b3dfe3a40b49b4057dc4b
+++ libpurple/protocols/oscar/libaim.c 60af7e783b69ac2615d58ff4ef11d5307363a248
@@ -50,7 +50,7 @@ static PurplePluginProtocolInfo prpl_inf
oscar_set_status, /* set_status */
oscar_set_idle, /* set_idle */
oscar_change_passwd, /* change_passwd */
- NULL, /* add_buddy */
+ oscar_add_buddy, /* add_buddy */
NULL, /* add_buddies */
oscar_remove_buddy, /* remove_buddy */
NULL, /* remove_buddies */
@@ -100,9 +100,7 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* get_media_caps */
NULL, /* get_moods */
NULL, /* set_public_alias */
- NULL, /* get_public_alias */
- oscar_add_buddy, /* add_buddy_with_invite */
- NULL /* add_buddies_with_invite */
+ NULL /* get_public_alias */
};
static PurplePluginInfo info =
============================================================
--- libpurple/protocols/oscar/libicq.c b4abfbb97f9246553ab7160c9b4e32f77695c312
+++ libpurple/protocols/oscar/libicq.c f236af256f39f0129d4500c153dfb9014bd03e6a
@@ -59,7 +59,7 @@ static PurplePluginProtocolInfo prpl_inf
oscar_set_status, /* set_status */
oscar_set_idle, /* set_idle */
oscar_change_passwd, /* change_passwd */
- NULL, /* add_buddy */
+ oscar_add_buddy, /* add_buddy */
NULL, /* add_buddies */
oscar_remove_buddy, /* remove_buddy */
NULL, /* remove_buddies */
@@ -110,9 +110,7 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* can_do_media */
oscar_get_purple_moods, /* get_moods */
NULL, /* set_public_alias */
- NULL, /* get_public_alias */
- oscar_add_buddy, /* add_buddy_with_invite */
- NULL /* add_buddies_with_invite */
+ NULL /* get_public_alias */
};
static PurplePluginInfo info =
============================================================
--- libpurple/protocols/jabber/libxmpp.c a8d36f925713b21b21fe5aca4b62c01aaf9c207c
+++ libpurple/protocols/jabber/libxmpp.c f12525287822786cc0ab9b107822d2d51a554055
@@ -129,9 +129,7 @@ static PurplePluginProtocolInfo prpl_inf
jabber_get_media_caps, /* get_media_caps */
jabber_get_moods, /* get_moods */
NULL, /* set_public_alias */
- NULL, /* get_public_alias */
- NULL, /* add_buddy_with_invite */
- NULL /* add_buddies_with_invite */
+ NULL /* get_public_alias */
};
static gboolean load_plugin(PurplePlugin *plugin)
============================================================
--- libpurple/protocols/myspace/myspace.c 8613a72d1608121a24049851be0e8a98bc4f35fe
+++ libpurple/protocols/myspace/myspace.c a0b33c361fe7da70f91c012acb4ad72f8342d588
@@ -2627,7 +2627,7 @@ static void
* Add a buddy to user's buddy list.
*/
static void
-msim_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
+msim_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group, const char *message)
{
MsimSession *session;
MsimMessage *msg;
@@ -3082,9 +3082,7 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* get_media_caps */
NULL, /* get_moods */
NULL, /* set_public_alias */
- NULL, /* get_public_alias */
- NULL, /* add_buddy_with_invite */
- NULL /* add_buddies_with_invite */
+ NULL /* get_public_alias */
};
/**
============================================================
--- libpurple/protocols/null/nullprpl.c 478cc82cb7c387d165edfb4b1c658645b55d2d8f
+++ libpurple/protocols/null/nullprpl.c c781b36cc42fab75b29b3359e70ce319732807be
@@ -548,7 +548,7 @@ static void nullprpl_add_buddy(PurpleCon
}
static void nullprpl_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy,
- PurpleGroup *group)
+ PurpleGroup *group, const char *message)
{
const char *username = gc->account->username;
PurpleConnection *buddy_gc = get_nullprpl_gc(buddy->name);
@@ -571,20 +571,20 @@ static void nullprpl_add_buddy(PurpleCon
username,
NULL, /* local account id (rarely used) */
NULL, /* alias */
- NULL); /* message */
+ message); /* message */
}
}
}
static void nullprpl_add_buddies(PurpleConnection *gc, GList *buddies,
- GList *groups) {
+ GList *groups, const char *message) {
GList *buddy = buddies;
GList *group = groups;
purple_debug_info("nullprpl", "adding multiple buddies\n");
while (buddy && group) {
- nullprpl_add_buddy(gc, (PurpleBuddy *)buddy->data, (PurpleGroup *)group->data);
+ nullprpl_add_buddy(gc, (PurpleBuddy *)buddy->data, (PurpleGroup *)group->data, message);
buddy = g_list_next(buddy);
group = g_list_next(group);
}
@@ -1131,9 +1131,7 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* get_media_caps */
NULL, /* get_moods */
NULL, /* set_public_alias */
- NULL, /* get_public_alias */
- NULL, /* add_buddy_with_invite */
- NULL /* add_buddies_with_invite */
+ NULL /* get_public_alias */
};
static void nullprpl_init(PurplePlugin *plugin)
============================================================
--- libpurple/protocols/yahoo/libyahoo.c a871e3427922dc201c58b80316d86bfe4e67f5c6
+++ libpurple/protocols/yahoo/libyahoo.c 875b38564e0465d1d3f278991eb20e9cc118127e
@@ -267,9 +267,7 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* get_media_caps */
NULL, /* get_moods */
NULL, /* set_public_alias */
- NULL, /* get_public_alias */
- NULL, /* add_buddy_with_invite */
- NULL /* add_buddies_with_invite */
+ NULL /* get_public_alias */
};
static PurplePluginInfo info =
============================================================
--- libpurple/protocols/yahoo/libyahoojp.c da89c3568e9054e458c7510b1cc67a6f5f46c190
+++ libpurple/protocols/yahoo/libyahoojp.c 3a6cf95dce97904c0262b7e9401fda5e4460913f
@@ -163,9 +163,7 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* get_media_caps */
NULL, /* get_moods */
NULL, /* set_public_alias */
- NULL, /* get_public_alias */
- NULL, /* add_buddy_with_invite */
- NULL /* add_buddies_with_invite */
+ NULL /* get_public_alias */
};
static PurplePluginInfo info =
============================================================
--- libpurple/protocols/mxit/mxit.c 9803d1bb8661fd2e2bb1bd15da3090f60e6483cf
+++ libpurple/protocols/mxit/mxit.c e5d5d8f94d5a00b322983290d9e1a8dfef69da74
@@ -696,7 +696,7 @@ static PurplePluginProtocolInfo proto_in
mxit_set_status, /* set_status */
NULL, /* set_idle */
NULL, /* change_passwd */
- NULL, /* add_buddy [roster.c] */
+ mxit_add_buddy, /* add_buddy [roster.c] */
NULL, /* add_buddies */
mxit_remove_buddy, /* remove_buddy [roster.c] */
NULL, /* remove_buddies */
@@ -746,9 +746,7 @@ static PurplePluginProtocolInfo proto_in
mxit_media_caps, /* get_media_caps */
mxit_get_moods, /* get_moods */
NULL, /* set_public_alias */
- NULL, /* get_public_alias */
- mxit_add_buddy, /* add_buddy_with_invite */
- NULL /* add_buddies_with_invite */
+ NULL /* get_public_alias */
};
More information about the Commits
mailing list