# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1054356924 0
# Node ID e2f2d8857f9f44489828728a3ac2f706180e1cf1
# Parent  3a9b54f260e349db296e63dc0213b7eb523665af
[gaim-migrate @ 5986]
(00:54:06) Robot101: fixes:
(00:54:21) Robot101: "copy link location" on URL context menu
(00:54:37) Robot101: leak of a GtkWindow and annoying dialog hinting of the signon meter window
(00:55:06) Robot101: and the appending of  even when you cancel the dialog in the convo window
(00:55:07) Robot101: that's the lot

committer: Tailor Script <tailor@pidgin.im>

diff -r 3a9b54f260e3 -r e2f2d8857f9f src/gtkconv.c
--- a/src/gtkconv.c	Sat May 31 04:35:54 2003 +0000
+++ b/src/gtkconv.c	Sat May 31 04:55:24 2003 +0000
@@ -1867,7 +1867,7 @@
 
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(font)))
 		show_font_dialog(conv, font);
-	else if (gtkconv->dialogs.fg_color != NULL)
+	else if (gtkconv->dialogs.font != NULL)
 		cancel_font(font, conv);
 	else
 		gaim_gtk_advance_past(gtkconv, "<FONT FACE>", "</FONT>");
diff -r 3a9b54f260e3 -r e2f2d8857f9f src/gtkimhtml.c
--- a/src/gtkimhtml.c	Sat May 31 04:35:54 2003 +0000
+++ b/src/gtkimhtml.c	Sat May 31 04:55:24 2003 +0000
@@ -294,11 +294,15 @@
 	g_free(data->url);
 	g_free(data);
 }
+
 static void url_copy(GtkWidget *w, gchar *url) {
 	GtkClipboard *clipboard;
 
 	clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
 	gtk_clipboard_set_text(clipboard, url, -1);
+
+	clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+	gtk_clipboard_set_text(clipboard, url, -1);
 }
 
 /* The callback for an event on a link tag. */
diff -r 3a9b54f260e3 -r e2f2d8857f9f src/multi.c
--- a/src/multi.c	Sat May 31 04:35:54 2003 +0000
+++ b/src/multi.c	Sat May 31 04:55:24 2003 +0000
@@ -219,7 +219,6 @@
 		meter_win->rows=0;
 
 		meter_win->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-		GAIM_DIALOG(meter_win->window);
 		gtk_window_set_resizable(GTK_WINDOW(meter_win->window), FALSE);
 		gtk_window_set_role(GTK_WINDOW(meter_win->window), "signon");
 		gtk_container_set_border_width(GTK_CONTAINER(meter_win->window), 5);