Fix some warnings and other stuff that was missed when porting Jabber to Birb

Tue, 23 Jan 2024 01:10:53 -0600

author
Gary Kramlich <grim@reaperworld.com>
date
Tue, 23 Jan 2024 01:10:53 -0600
changeset 42580
960d88cf0fe2
parent 42579
f1ce6abbf4d1
child 42581
73eda937c387

Fix some warnings and other stuff that was missed when porting Jabber to Birb

Testing Done:
Touched all of the files in `libpurple/protocols/jabber`, compiled and verified there were no warnings.

Reviewed at https://reviews.imfreedom.org/r/2932/

libpurple/protocols/jabber/jabber.c file | annotate | diff | comparison | revisions
libpurple/protocols/jabber/jabber.h file | annotate | diff | comparison | revisions
libpurple/protocols/jabber/tests/meson.build file | annotate | diff | comparison | revisions
--- a/libpurple/protocols/jabber/jabber.c	Tue Jan 23 01:06:07 2024 -0600
+++ b/libpurple/protocols/jabber/jabber.c	Tue Jan 23 01:10:53 2024 -0600
@@ -367,7 +367,7 @@
 static void
 jabber_push_bytes_cb(GObject *source, GAsyncResult *res, gpointer data)
 {
-	PurpleQueuedOutputStream *stream = PURPLE_QUEUED_OUTPUT_STREAM(source);
+	BirbQueuedOutputStream *stream = BIRB_QUEUED_OUTPUT_STREAM(source);
 	JabberStream *js = data;
 	gboolean result;
 	GError *error = NULL;
@@ -398,8 +398,8 @@
 
 	output = g_bytes_new(data, len);
 	birb_queued_output_stream_push_bytes_async(
-	        js->output, output, G_PRIORITY_DEFAULT, js->cancellable,
-	        jabber_push_bytes_cb, js);
+	        BIRB_QUEUED_OUTPUT_STREAM(js->output), output, G_PRIORITY_DEFAULT,
+	        js->cancellable, jabber_push_bytes_cb, js);
 	g_bytes_unref(output);
 
 	return success;
--- a/libpurple/protocols/jabber/jabber.h	Tue Jan 23 01:06:07 2024 -0600
+++ b/libpurple/protocols/jabber/jabber.h	Tue Jan 23 01:10:53 2024 -0600
@@ -56,7 +56,6 @@
 #include <gmodule.h>
 #include <gio/gio.h>
 #include <libsoup/soup.h>
-#include <birb.h>
 
 #include <purple.h>
 
@@ -179,7 +178,7 @@
 	GSocketClient *client;
 	GIOStream *stream;
 	GInputStream *input;
-	BirbQueuedOutputStream *output;
+	GOutputStream *output;
 
 	char *initial_avatar_hash;
 	char *avatar_hash;
--- a/libpurple/protocols/jabber/tests/meson.build	Tue Jan 23 01:06:07 2024 -0600
+++ b/libpurple/protocols/jabber/tests/meson.build	Tue Jan 23 01:10:53 2024 -0600
@@ -2,7 +2,7 @@
 	e = executable(
 	    f'test_jabber_@prog@', f'test_jabber_@prog@.c',
 	    link_with : [jabber_prpl],
-	    dependencies : [birb, libxml, libpurple_dep, libsoup, glib])
+	    dependencies : [libxml, libpurple_dep, libsoup, glib])
 
 	jabberenv = environment()
 	jabberenv.set('XDG_CONFIG_DIR', meson.current_build_dir() / 'config')

mercurial