Merged in default (pull request #576)

Tue, 01 Oct 2019 01:38:40 +0000

author
Gary Kramlich <grim@reaperworld.com>
date
Tue, 01 Oct 2019 01:38:40 +0000
changeset 39889
94cb5cc3862a
parent 39887
9c8f874c74a0 (current diff)
parent 39888
3c7c35f73fc1 (diff)
child 39890
39d9e58389ee
child 39897
16b440d4ab36

Merged in default (pull request #576)

Add GPlugin, GPluginGtk, Gnt, and Talkatu to the g_log_handler

Approved-by: Elliott Sales de Andrade

--- a/pidgin/pidgindebug.c	Sun Sep 29 02:58:05 2019 -0500
+++ b/pidgin/pidgindebug.c	Tue Oct 01 01:38:40 2019 +0000
@@ -819,13 +819,17 @@
 	/* Register the glib/gtk log handlers. */
 	REGISTER_G_LOG_HANDLER(NULL);
 	REGISTER_G_LOG_HANDLER("Gdk");
-	REGISTER_G_LOG_HANDLER("Gtk");
 	REGISTER_G_LOG_HANDLER("GdkPixbuf");
 	REGISTER_G_LOG_HANDLER("GLib");
+	REGISTER_G_LOG_HANDLER("GLib-GObject");
 	REGISTER_G_LOG_HANDLER("GModule");
-	REGISTER_G_LOG_HANDLER("GLib-GObject");
+	REGISTER_G_LOG_HANDLER("Gnt"); /* just in case we find a gnt plugin */
+	REGISTER_G_LOG_HANDLER("GPlugin");
+	REGISTER_G_LOG_HANDLER("GPluginGtk");
 	REGISTER_G_LOG_HANDLER("GThread");
+	REGISTER_G_LOG_HANDLER("Gtk");
 	REGISTER_G_LOG_HANDLER("Json");
+	REGISTER_G_LOG_HANDLER("Talkatu");
 #ifdef USE_GSTREAMER
 	REGISTER_G_LOG_HANDLER("GStreamer");
 #endif

mercurial