[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.206,1.207

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv2759/src

Modified Files:
	gtkimhtml.c 
Log Message:
This gets rid of the gtk critical warning regarding clipboards and fixes the
broken highlighting (when highlighting text with no smileys... I'm not sure
how to get that to work when there are smileys... but I'll work on it.)


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -d -p -r1.206 -r1.207
--- gtkimhtml.c	27 Oct 2003 06:54:50 -0000	1.206
+++ gtkimhtml.c	27 Oct 2003 19:47:57 -0000	1.207
@@ -376,8 +376,11 @@ static void copy_clipboard_cb(GtkIMHtml 
 	text = gtk_text_buffer_get_text(imhtml->text_buffer, &last, &end, FALSE);
 	str = g_string_append(str, text);
 	g_free(text);
-
-	gtk_clipboard_set_text(clipboard, str->str, str->len);
+	
+	if (!gtk_text_iter_equal(&start, &last);
+	gtk_clipboard_set_text(clipboard ? clipboard :  
+			       gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_CLIPBOARD), 
+			       str->str, str->len);
 	g_string_free(str, TRUE);
 }
 
@@ -488,8 +491,7 @@ static void gtk_imhtml_init (GtkIMHtml *
 	g_signal_connect(G_OBJECT(imhtml), "motion-notify-event", G_CALLBACK(gtk_motion_event_notify), NULL);
 	g_signal_connect(G_OBJECT(imhtml), "leave-notify-event", G_CALLBACK(gtk_leave_event_notify), NULL);
 	g_signal_connect(G_OBJECT(imhtml), "key_press_event", G_CALLBACK(gtk_key_pressed_cb), NULL);
-	g_signal_connect(G_OBJECT(imhtml), "copy-clipboard", G_CALLBACK(copy_clipboard_cb),  
-			 gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_CLIPBOARD));
+	g_signal_connect(G_OBJECT(imhtml), "copy-clipboard", G_CALLBACK(copy_clipboard_cb), NULL);
 	g_signal_connect(G_OBJECT(imhtml), "button-release-event", G_CALLBACK(button_release_cb), imhtml);
 	gtk_widget_add_events(GTK_WIDGET(imhtml), GDK_LEAVE_NOTIFY_MASK);