merge of '624fed1d4f8efa1f1d5529ec8f418ccb89f912cf'

Tue, 22 Sep 2009 02:07:26 +0000

author
Elliott Sales de Andrade <qulogic@pidgin.im>
date
Tue, 22 Sep 2009 02:07:26 +0000
changeset 28575
2291811a254a
parent 28562
624fed1d4f8e (current diff)
parent 28574
615fe5cbebe7 (diff)
child 28576
6ce76c426ce8

merge of '624fed1d4f8efa1f1d5529ec8f418ccb89f912cf'
and '615fe5cbebe73af490cf47e5755da00e895283cf'

--- a/libpurple/dbus-server.c	Mon Sep 21 18:03:23 2009 +0000
+++ b/libpurple/dbus-server.c	Tue Sep 22 02:07:26 2009 +0000
@@ -126,8 +126,10 @@
 	gint id = GPOINTER_TO_INT(g_hash_table_lookup(map_node_id, node));
 	if ((id == 0) && (node != NULL))
 	{
-		purple_debug_warning("dbus",
-				"Need to register an object with the dbus subsystem. (If you are not a developer, please ignore this message.)\n");
+		if (purple_debug_is_verbose())
+			purple_debug_warning("dbus",
+				"Need to register an object with the dbus subsystem."
+				" (If you are not a developer, please ignore this message.)\n");
 		return 0;
 	}
 	return id;
@@ -795,7 +797,11 @@
 	dbus_message_iter_init_append(signal, &iter);
 
 	if (purple_dbus_message_append_purple_values(&iter, num_values, values, vargs))
-		purple_debug_warning("dbus", "The signal \"%s\" caused some dbus error. (If you are not a developer, please ignore this message.)\n", name);
+		if (purple_debug_is_verbose())
+			purple_debug_warning("dbus",
+				"The signal \"%s\" caused some dbus error."
+				" (If you are not a developer, please ignore this message.)\n",
+				name);
 
 	dbus_connection_send(purple_dbus_connection, signal, NULL);
 

mercurial