im.pidgin.pidgin: 222111bd2f2e1d170fa1c1d81e8d70ffc4cdeccf

datallah at pidgin.im datallah at pidgin.im
Fri Nov 16 13:50:37 EST 2007


-----------------------------------------------------------------
Revision: 222111bd2f2e1d170fa1c1d81e8d70ffc4cdeccf
Ancestor: f58f79fb0a07e4abd4e55aced8c29e3fcbeb4c10
Author: datallah at pidgin.im
Date: 2007-11-16T18:43:50
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkimhtml.c

ChangeLog: 

There appears to be a new GTK+ bug that causes the clipboard_clear callback to be triggered *after* the clipboard_copy callback on the second copy attempt.  This makes stuff still work correctly when this happens (and, most importantly, not crash).  I'll report this upstream.

-------------- next part --------------
============================================================
--- pidgin/gtkimhtml.c	aabd26e9dc6811887d074cd8782f691641149eee
+++ pidgin/gtkimhtml.c	3097812f34ecc54b39e72c5ce539bb6966f33be5
@@ -899,6 +899,9 @@ static void gtk_imhtml_clipboard_get(Gtk
 
 	if (primary) {
 		GtkTextMark *sel = NULL, *ins = NULL;
+
+		g_return_if_fail(imhtml != NULL);
+
 		ins = gtk_text_buffer_get_insert(imhtml->text_buffer);
 		sel = gtk_text_buffer_get_selection_bound(imhtml->text_buffer);
 		gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &start, sel);
@@ -957,7 +960,9 @@ static void gtk_imhtml_clipboard_clear (
 static void gtk_imhtml_clipboard_clear (GtkClipboard *clipboard, GtkSelectionData *sel_data,
 				 guint info, gpointer user_data_or_owner)
 {
+#ifndef _WIN32
 	clipboard_selection = NULL;
+#endif
 }
 
 static void copy_clipboard_cb(GtkIMHtml *imhtml, gpointer unused)


More information about the Commits mailing list