Pass the PurpleProtocol objects to all methods of the class
Previously login, close, and status_types weren't passed the PurpleProtocol
object, this fixes that so that these methods fit the normal pattern for
GObjects and it might handy in the future for other protocols.
Testing Done:
Compiled
Reviewed at https://reviews.imfreedom.org/r/1883/
--- a/libpurple/protocols/bonjour/bonjour.c Sun Oct 02 01:22:26 2022 -0500
+++ b/libpurple/protocols/bonjour/bonjour.c Mon Oct 03 21:54:51 2022 -0500
@@ -95,8 +95,7 @@
-bonjour_login(PurpleAccount *account)+bonjour_login(G_GNUC_UNUSED PurpleProtocol *protocol, PurpleAccount *account) { PurpleConnection *gc = purple_account_get_connection(account);
@@ -162,7 +161,8 @@
-bonjour_close(PurpleConnection *connection)+bonjour_close(G_GNUC_UNUSED PurpleProtocol *protocol, + PurpleConnection *connection) PurpleGroup *bonjour_group;
BonjourData *bd = purple_connection_get_protocol_data(connection);
@@ -325,7 +325,8 @@
-bonjour_status_types(PurpleAccount *account)+bonjour_status_types(G_GNUC_UNUSED PurpleProtocol *protocol, + PurpleAccount *account) GList *status_types = NULL;
--- a/libpurple/protocols/demo/purpledemoprotocol.c Sun Oct 02 01:22:26 2022 -0500
+++ b/libpurple/protocols/demo/purpledemoprotocol.c Mon Oct 03 21:54:51 2022 -0500
@@ -36,7 +36,9 @@
* PurpleProtocol Implementation
*****************************************************************************/
-purple_demo_protocol_login(PurpleAccount *account) {+purple_demo_protocol_login(G_GNUC_UNUSED PurpleProtocol *protocol, + PurpleAccount *account) PurpleConnection *connection = NULL;
connection = purple_account_get_connection(account);
@@ -46,7 +48,9 @@
-purple_demo_protocol_status_types(PurpleAccount *account) {+purple_demo_protocol_status_types(G_GNUC_UNUSED PurpleProtocol *protocol, + PurpleAccount *account) PurpleStatusType *type = NULL;
GList *status_types = NULL;
--- a/libpurple/protocols/facebook/facebook.c Sun Oct 02 01:22:26 2022 -0500
+++ b/libpurple/protocols/facebook/facebook.c Mon Oct 03 21:54:51 2022 -0500
@@ -1008,8 +1008,7 @@
-fb_login(PurpleAccount *acct)+fb_login(G_GNUC_UNUSED PurpleProtocol *protocol, PurpleAccount *acct) { @@ -1113,8 +1112,7 @@
-fb_close(PurpleConnection *gc)+fb_close(G_GNUC_UNUSED PurpleProtocol *protocol, PurpleConnection *gc) { @@ -1130,8 +1128,7 @@
-fb_status_types(PurpleAccount *acct)+fb_status_types(G_GNUC_UNUSED PurpleProtocol *protocol, PurpleAccount *acct) { --- a/libpurple/protocols/gg/gg.c Sun Oct 02 01:22:26 2022 -0500
+++ b/libpurple/protocols/gg/gg.c Mon Oct 03 21:54:51 2022 -0500
@@ -781,8 +781,8 @@
-static void ggp_login(PurpleAccount *account)+ggp_login(G_GNUC_UNUSED PurpleProtocol *protocol, PurpleAccount *account) { PurpleConnection *gc = purple_account_get_connection(account);
struct gg_login_params *glp;
@@ -905,8 +905,8 @@
-static void ggp_close(PurpleConnection *gc)+ggp_close(G_GNUC_UNUSED PurpleProtocol *protocol, PurpleConnection *gc) { --- a/libpurple/protocols/gg/status.c Sun Oct 02 01:22:26 2022 -0500
+++ b/libpurple/protocols/gg/status.c Mon Oct 03 21:54:51 2022 -0500
@@ -81,7 +81,9 @@
return ggp_utf8_strndup(msg, GG_STATUS_DESCR_MAXSIZE);
-GList * ggp_status_types(PurpleAccount *account)+ggp_status_types(G_GNUC_UNUSED PurpleProtocol *protocol, + PurpleAccount *account) --- a/libpurple/protocols/gg/status.h Sun Oct 02 01:22:26 2022 -0500
+++ b/libpurple/protocols/gg/status.h Mon Oct 03 21:54:51 2022 -0500
@@ -38,7 +38,7 @@
void ggp_status_setup(PurpleConnection *gc);
void ggp_status_cleanup(PurpleConnection *gc);
-GList * ggp_status_types(PurpleAccount *account);+GList *ggp_status_types(G_GNUC_UNUSED PurpleProtocol *protocol, PurpleAccount *account); int ggp_status_from_purplestatus(PurpleStatus *status, gchar **message);
const gchar * ggp_status_to_purplestatus(int status);
const gchar * ggp_status_get_name(const gchar *purple_status);
--- a/libpurple/protocols/irc/irc.c Sun Oct 02 01:22:26 2022 -0500
+++ b/libpurple/protocols/irc/irc.c Mon Oct 03 21:54:51 2022 -0500
@@ -40,11 +40,11 @@
static void irc_ison_buddy_init(char *name, struct irc_buddy *ib, GList **list);
-static GList *irc_status_types(PurpleAccount *account);+static GList *irc_status_types(PurpleProtocol *protocol, PurpleAccount *account); /* static GList *irc_chat_info(PurpleConnection *gc); */
-static void irc_login(PurpleAccount *account);+static void irc_login(PurpleProtocol *protocol, PurpleAccount *account); static void irc_login_cb(GObject *source, GAsyncResult *res, gpointer user_data);
-static void irc_close(PurpleConnection *gc);+static void irc_close(PurpleProtocol *protocol, PurpleConnection *gc); static int irc_im_send(PurpleProtocolIM *im, PurpleConnection *gc, PurpleMessage *msg);
static int irc_chat_send(PurpleProtocolChat *protocol_chat, PurpleConnection *gc, int id, PurpleMessage *msg);
static void irc_chat_join(PurpleProtocolChat *protocol_chat, PurpleConnection *gc, GHashTable *data);
@@ -424,7 +424,9 @@
return g_list_append(NULL, split);
-static GList *irc_status_types(PurpleAccount *account)+irc_status_types(G_GNUC_UNUSED PurpleProtocol *protocol, + PurpleAccount *account) @@ -522,8 +524,8 @@
-static void irc_login(PurpleAccount *account)+irc_login(G_GNUC_UNUSED PurpleProtocol *protocol, PurpleAccount *account) { @@ -672,8 +674,8 @@
-static void irc_close(PurpleConnection *gc)+irc_close(G_GNUC_UNUSED PurpleProtocol *protocol, PurpleConnection *gc) { struct irc_conn *irc = purple_connection_get_protocol_data(gc);
--- a/libpurple/protocols/jabber/jabber.c Sun Oct 02 01:22:26 2022 -0500
+++ b/libpurple/protocols/jabber/jabber.c Mon Oct 03 21:54:51 2022 -0500
@@ -998,8 +998,7 @@
-jabber_login(PurpleAccount *account)+jabber_login(G_GNUC_UNUSED PurpleProtocol *protocol, PurpleAccount *account) { PurpleConnection *gc = purple_account_get_connection(account);
@@ -1496,12 +1495,15 @@
if (purple_connection_get_state(gc) != PURPLE_CONNECTION_CONNECTED) {
- if (purple_connection_get_state(gc) != PURPLE_CONNECTION_CONNECTING)+ if (purple_connection_get_state(gc) != PURPLE_CONNECTION_CONNECTING) { + jabber_login(PURPLE_PROTOCOL(protocol_server), account); js = purple_connection_get_protocol_data(gc);
js->unregistration = TRUE;
js->unregistration_cb = cb;
js->unregistration_user_data = user_data;
@@ -1524,8 +1526,8 @@
* termination before destroying everything. That seems like it would require
* changing the semantics of protocol's close(), so it's a good idea for 3.0.0.
-void jabber_close(PurpleConnection *gc)+jabber_close(G_GNUC_UNUSED PurpleProtocol *protocol, PurpleConnection *gc) { JabberStream *js = purple_connection_get_protocol_data(gc);
/* Close all of the open Jingle sessions on this stream */
@@ -2222,7 +2224,9 @@
-GList *jabber_status_types(PurpleAccount *account)+jabber_status_types(G_GNUC_UNUSED PurpleProtocol *protocol, + PurpleAccount *account) --- a/libpurple/protocols/jabber/jabber.h Sun Oct 02 01:22:26 2022 -0500
+++ b/libpurple/protocols/jabber/jabber.h Mon Oct 03 21:54:51 2022 -0500
@@ -369,9 +369,9 @@
const char* jabber_list_emblem(PurpleProtocolClient *client, PurpleBuddy *b);
char *jabber_status_text(PurpleProtocolClient *client, PurpleBuddy *b);
void jabber_tooltip_text(PurpleProtocolClient *client, PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full);
-GList *jabber_status_types(PurpleAccount *account);-void jabber_login(PurpleAccount *account);-void jabber_close(PurpleConnection *gc);+GList *jabber_status_types(PurpleProtocol *protocol, PurpleAccount *account); +void jabber_login(PurpleProtocol *protocol, PurpleAccount *account); +void jabber_close(PurpleProtocol *protocol, PurpleConnection *gc); void jabber_idle_set(PurpleProtocolServer *protocol_server, PurpleConnection *gc, int idle);
void jabber_blocklist_parse_push(JabberStream *js, const char *from,
JabberIqType type, const char *id,
--- a/libpurple/protocols/novell/novell.c Sun Oct 02 01:22:26 2022 -0500
+++ b/libpurple/protocols/novell/novell.c Mon Oct 03 21:54:51 2022 -0500
@@ -2185,8 +2185,7 @@
******************************************************************************/
-novell_login(PurpleAccount * account)+novell_login(G_GNUC_UNUSED PurpleProtocol *protocol, PurpleAccount * account) { @@ -2241,8 +2240,7 @@
-novell_close(PurpleConnection * gc)+novell_close(G_GNUC_UNUSED PurpleProtocol *protocol, PurpleConnection * gc) { @@ -3009,7 +3007,8 @@
-novell_status_types(PurpleAccount *account)+novell_status_types(G_GNUC_UNUSED PurpleProtocol *protocol, + PurpleAccount *account) GList *status_types = NULL;
--- a/libpurple/protocols/sametime/sametime.c Sun Oct 02 01:22:26 2022 -0500
+++ b/libpurple/protocols/sametime/sametime.c Mon Oct 03 21:54:51 2022 -0500
@@ -3222,7 +3222,9 @@
-static GList *mw_protocol_status_types(PurpleAccount *acct)+mw_protocol_status_types(G_GNUC_UNUSED PurpleProtocol *protocol, @@ -3520,10 +3522,10 @@
-static void mw_protocol_login(PurpleAccount *acct);-static void mw_protocol_login(PurpleAccount *account) {+mw_protocol_login(G_GNUC_UNUSED PurpleProtocol *protocol, + PurpleAccount *account) struct mwPurpleProtocolData *pd;
@@ -3611,7 +3613,10 @@
-static void mw_protocol_close(PurpleConnection *gc) {+mw_protocol_close(G_GNUC_UNUSED PurpleProtocol *protocol, struct mwPurpleProtocolData *pd;
g_return_if_fail(gc != NULL);
--- a/libpurple/protocols/silc/silc.c Sun Oct 02 01:22:26 2022 -0500
+++ b/libpurple/protocols/silc/silc.c Mon Oct 03 21:54:51 2022 -0500
@@ -65,7 +65,8 @@
-silcpurple_away_states(PurpleAccount *account)+silcpurple_away_states(G_GNUC_UNUSED PurpleProtocol *protocol, + PurpleAccount *account) @@ -575,7 +576,8 @@
-silcpurple_login(PurpleAccount *account)+silcpurple_login(G_GNUC_UNUSED PurpleProtocol *protocol, + PurpleAccount *account) @@ -712,7 +714,7 @@
-silcpurple_close(PurpleConnection *gc)+silcpurple_close(G_GNUC_UNUSED PurpleProtocol *protocol, PurpleConnection *gc) SilcPurple sg = purple_connection_get_protocol_data(gc);
--- a/libpurple/protocols/zephyr/zephyr.c Sun Oct 02 01:22:26 2022 -0500
+++ b/libpurple/protocols/zephyr/zephyr.c Mon Oct 03 21:54:51 2022 -0500
@@ -672,8 +672,8 @@
-static void zephyr_login(PurpleAccount * account)+zephyr_login(G_GNUC_UNUSED PurpleProtocol *protocol, PurpleAccount * account) { @@ -850,8 +850,8 @@
-static void zephyr_close(PurpleConnection * gc)+zephyr_close(G_GNUC_UNUSED PurpleProtocol *protocol, PurpleConnection * gc) { zephyr_account *zephyr = purple_connection_get_protocol_data(gc);
g_list_free_full(zephyr->pending_zloc_names, g_free);
@@ -1060,7 +1060,9 @@
-static GList *zephyr_status_types(PurpleAccount *account)+zephyr_status_types(G_GNUC_UNUSED PurpleProtocol *protocol, + PurpleAccount *account) --- a/libpurple/purpleprotocol.c Sun Oct 02 01:22:26 2022 -0500
+++ b/libpurple/purpleprotocol.c Mon Oct 03 21:54:51 2022 -0500
@@ -531,7 +531,7 @@
klass = PURPLE_PROTOCOL_GET_CLASS(protocol);
if(klass != NULL && klass->login != NULL) {
+ klass->login(protocol, account); @@ -544,7 +544,7 @@
klass = PURPLE_PROTOCOL_GET_CLASS(protocol);
if(klass != NULL && klass->close != NULL) {
+ klass->close(protocol, gc); @@ -559,7 +559,7 @@
klass = PURPLE_PROTOCOL_GET_CLASS(protocol);
if(klass != NULL && klass->status_types != NULL) {
- return klass->status_types(account);+ return klass->status_types(protocol, account); --- a/libpurple/purpleprotocol.h Sun Oct 02 01:22:26 2022 -0500
+++ b/libpurple/purpleprotocol.h Mon Oct 03 21:54:51 2022 -0500
@@ -141,11 +141,11 @@
PurpleBuddyIconSpec *(*get_buddy_icon_spec)(PurpleProtocol *protocol);
PurpleWhiteboardOps *(*get_whiteboard_ops)(PurpleProtocol *protocol);
- void (*login)(PurpleAccount *account);+ void (*login)(PurpleProtocol *protocol, PurpleAccount *account); - void (*close)(PurpleConnection *connection);+ void (*close)(PurpleProtocol *protocol, PurpleConnection *connection); - GList *(*status_types)(PurpleAccount *account);+ GList *(*status_types)(PurpleProtocol *protocol, PurpleAccount *account);
