Mercurial > pidgin3 / changeset

--- a/libpurple/dbus-server.c	Thu Sep 13 13:07:36 2018 -0500
+++ b/libpurple/dbus-server.c	Fri Sep 21 02:11:56 2018 +0000
@@ -808,8 +808,7 @@
 void
 purple_dbus_init(void)
 {
-	if (g_thread_supported())
-		dbus_g_thread_init();
+	dbus_g_thread_init();
 
 	purple_dbus_init_ids();
 

--- a/libpurple/util.c	Thu Sep 13 13:07:36 2018 -0500
+++ b/libpurple/util.c	Fri Sep 21 02:11:56 2018 +0000
@@ -2386,7 +2386,7 @@
 					{
 						str2[j++] = ' ';
 						str2[j++] = '(';
-						g_memmove(str2 + j, href, hrlen);
+						memmove(str2 + j, href, hrlen);
 						j += hrlen;
 						str2[j++] = ')';
 						g_free(href);