Mercurial > pidgin.yaz
diff pidgin/gtkconv.c @ 19875:9474223e534b
merge of '0bd9e1e53c324f8db97d248ad3b09eb140a0e416'
and '4dcd947aa4be945cab47d97141752805c1958654'
| author | Gabriel Schulhof <nix@go-nix.ca> |
|---|---|
| date | Fri, 17 Aug 2007 22:31:32 +0000 |
| parents | 0ed8a2a86a1b 91c35a2c2705 |
| children | 8cef5a905bc5 |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Fri Aug 17 22:10:43 2007 +0000 +++ b/pidgin/gtkconv.c Fri Aug 17 22:31:32 2007 +0000 @@ -1052,7 +1052,7 @@ PurpleBlistNode *node = cur->data; if ((node != NULL) && ((node->prev != NULL) || (node->next != NULL))) { - pidgin_log_show_contact((PurpleContact *)node->parent); + pidgin_log_show_contact(GTK_WINDOW(win->window), (PurpleContact *)node->parent); g_slist_free(buddies); gdk_window_set_cursor(gtkblist->window->window, NULL); gdk_window_set_cursor(win->window->window, NULL); @@ -1061,7 +1061,7 @@ } g_slist_free(buddies); - pidgin_log_show(type, name, account); + pidgin_log_show(GTK_WINDOW(win->window), type, name, account); gdk_window_set_cursor(gtkblist->window->window, NULL); gdk_window_set_cursor(win->window->window, NULL);