/pidgin/main: 3d89ddaa0cb4: Merged in CMaiku/pidgin (pull reques...

[Gary Kramlich]

Changeset: 3d89ddaa0cb47e489f2634f0373cde48a68907ef
Author:	 Gary Kramlich <grim at reaperworld.com>
Date:	 2016-01-23 13:02 -0600
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/3d89ddaa0cb4

Description:

Merged in CMaiku/pidgin (pull request #14)

Fix warnings

diffstat:

 libpurple/log.c        |  3 ++-
 pidgin/pidgintooltip.c |  6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (36 lines):

diff --git a/libpurple/log.c b/libpurple/log.c
--- a/libpurple/log.c
+++ b/libpurple/log.c
@@ -1334,7 +1334,8 @@ static gsize html_logger_write(PurpleLog
 	if(!data->file)
 		return 0;
 
-	escaped_from = g_markup_escape_text(from, -1);
+	escaped_from = g_markup_escape_text(from != NULL ? from : "<NULL>",
+			-1);
 
 	image_corrected_msg = convert_image_tags(log, message);
 	purple_markup_html_to_xhtml(image_corrected_msg, &msg_fixed, NULL);
diff --git a/pidgin/pidgintooltip.c b/pidgin/pidgintooltip.c
--- a/pidgin/pidgintooltip.c
+++ b/pidgin/pidgintooltip.c
@@ -126,7 +126,6 @@ setup_tooltip_window(void)
 static void
 setup_tooltip_window_position(gpointer data, int w, int h)
 {
-	int sig;
 	int scr_w, scr_h, x, y, dy;
 	int preserved_x, preserved_y;
 	int mon_num;
@@ -193,8 +192,9 @@ setup_tooltip_window_position(gpointer d
 			G_CALLBACK(pidgin_tooltip_draw_cb), data);
 
 	/* Hide the tooltip when the widget is destroyed */
-	sig = g_signal_connect(G_OBJECT(pidgin_tooltip.widget), "destroy", G_CALLBACK(pidgin_tooltip_destroy), NULL);
-	g_signal_connect_swapped(G_OBJECT(tipwindow), "destroy", G_CALLBACK(g_source_remove), GINT_TO_POINTER(sig));
+	g_signal_connect_object(G_OBJECT(pidgin_tooltip.widget),
+			"destroy", G_CALLBACK(pidgin_tooltip_destroy),
+			G_OBJECT(tipwindow), 0);
 }
 
 void pidgin_tooltip_show(GtkWidget *widget, gpointer userdata,