Mercurial > pidgin.yaz
changeset 5582:e2f2d8857f9f
[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>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sat, 31 May 2003 04:55:24 +0000 |
| parents | 3a9b54f260e3 |
| children | e46efd264489 |
| files | src/gtkconv.c src/gtkimhtml.c src/multi.c |
| diffstat | 3 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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>");
--- 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. */
--- 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);