Mercurial > pidgin3 / changeset

--- a/libpurple/protocols/jabber/adhoccommands.c	Tue Mar 22 07:46:43 2022 -0500
+++ b/libpurple/protocols/jabber/adhoccommands.c	Fri Mar 25 02:33:23 2022 -0500
@@ -30,6 +30,17 @@
 #include "xdata.h"
 #include "iq.h"
 
+void
+jabber_adhoc_commands_free(JabberAdHocCommands *cmd)
+{
+	g_return_if_fail(cmd != NULL);
+
+	g_free(cmd->jid);
+	g_free(cmd->node);
+	g_free(cmd->name);
+	g_free(cmd);
+}
+
 static void do_adhoc_ignoreme(JabberStream *js, ...) {
 	/* we don't have to do anything */
 }

--- a/libpurple/protocols/jabber/adhoccommands.h	Tue Mar 22 07:46:43 2022 -0500
+++ b/libpurple/protocols/jabber/adhoccommands.h	Fri Mar 25 02:33:23 2022 -0500
@@ -28,6 +28,14 @@
 
 /* Implementation of XEP-0050 */
 
+typedef struct {
+	char *jid;
+	char *node;
+	char *name;
+} JabberAdHocCommands;
+
+void jabber_adhoc_commands_free(JabberAdHocCommands *cmd);
+
 void jabber_adhoc_disco_result_cb(JabberStream *js, const char *from,
                                   JabberIqType type, const char *id,
                                   PurpleXmlNode *packet, gpointer data);

--- a/libpurple/protocols/jabber/buddy.c	Tue Mar 22 07:46:43 2022 -0500
+++ b/libpurple/protocols/jabber/buddy.c	Fri Mar 25 02:33:23 2022 -0500
@@ -53,17 +53,6 @@
 	gchar *last_message;
 } JabberBuddyInfo;
 
-void
-jabber_adhoc_commands_free(JabberAdHocCommands *cmd)
-{
-	g_return_if_fail(cmd != NULL);
-
-	g_free(cmd->jid);
-	g_free(cmd->node);
-	g_free(cmd->name);
-	g_free(cmd);
-}
-
 static void
 jabber_buddy_resource_free(JabberBuddyResource *jbr)
 {

--- a/libpurple/protocols/jabber/buddy.h	Tue Mar 22 07:46:43 2022 -0500
+++ b/libpurple/protocols/jabber/buddy.h	Fri Mar 25 02:33:23 2022 -0500
@@ -59,12 +59,6 @@
 };
 
 typedef struct {
-	char *jid;
-	char *node;
-	char *name;
-} JabberAdHocCommands;
-
-typedef struct {
 	JabberBuddy *jb;
 	char *name;
 	int priority;
@@ -93,8 +87,6 @@
 	gboolean commands_fetched;
 } JabberBuddyResource;
 
-void jabber_adhoc_commands_free(JabberAdHocCommands *cmd);
-
 void jabber_buddy_free(JabberBuddy *jb);
 JabberBuddy *jabber_buddy_find(JabberStream *js, const char *name,
 		gboolean create);