Mercurial > pidgin.yaz
changeset 19873:91c35a2c2705
Stringing log windows
| author | Gabriel Schulhof <nix@go-nix.ca> |
|---|---|
| date | Fri, 17 Aug 2007 22:30:52 +0000 |
| parents | dd5e6f06be8f |
| children | 9474223e534b |
| files | pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtklog.c |
| diffstat | 4 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Fri Aug 17 21:01:20 2007 +0000 +++ b/pidgin/gtkblist.c Fri Aug 17 22:30:52 2007 +0000 @@ -501,7 +501,7 @@ name = prpl_info->get_chat_name(c->components); } } else if (PURPLE_BLIST_NODE_IS_CONTACT(node)) { - pidgin_log_show_contact((PurpleContact *)node); + pidgin_log_show_contact(GTK_WINDOW(gtkblist->window), (PurpleContact *)node); pidgin_clear_cursor(gtkblist->window); return; } else { @@ -513,7 +513,7 @@ } if (name && account) { - pidgin_log_show(type, name, account); + pidgin_log_show(GTK_WINDOW(gtkblist->window), type, name, account); g_free(name); pidgin_clear_cursor(gtkblist->window);
--- a/pidgin/gtkconv.c Fri Aug 17 21:01:20 2007 +0000 +++ b/pidgin/gtkconv.c Fri Aug 17 22:30:52 2007 +0000 @@ -1051,7 +1051,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); @@ -1060,7 +1060,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);
--- a/pidgin/gtkdialogs.c Fri Aug 17 21:01:20 2007 +0000 +++ b/pidgin/gtkdialogs.c Fri Aug 17 22:30:52 2007 +0000 @@ -916,7 +916,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(gtkblist->window), (PurpleContact *)node->parent); g_slist_free(buddies); pidgin_clear_cursor(gtkblist->window); g_free(username); @@ -925,7 +925,7 @@ } g_slist_free(buddies); - pidgin_log_show(PURPLE_LOG_IM, username, account); + pidgin_log_show(GTK_WINDOW(gtkblist->window), PURPLE_LOG_IM, username, account); pidgin_clear_cursor(gtkblist->window); }
--- a/pidgin/gtklog.c Fri Aug 17 21:01:20 2007 +0000 +++ b/pidgin/gtklog.c Fri Aug 17 22:30:52 2007 +0000 @@ -522,7 +522,7 @@ } } -static PidginLogViewer *display_log_viewer(struct log_viewer_hash_t *ht, GList *logs, +static PidginLogViewer *display_log_viewer(GtkWindow *parent, struct log_viewer_hash_t *ht, GList *logs, const char *title, GtkWidget *icon, int log_size) { PidginLogViewer *lv; @@ -568,7 +568,7 @@ g_hash_table_insert(log_viewers, ht, lv); /* Window ***********/ - lv->window = gtk_dialog_new_with_buttons(title, NULL, 0, + lv->window = gtk_dialog_new_with_buttons(title, parent, 0, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); #ifdef _WIN32 /* Steal the "HELP" response and use it to trigger browsing to the logs folder */ @@ -722,7 +722,7 @@ g_free(title); } -void pidgin_log_show_contact(PurpleContact *contact) { +void pidgin_log_show_contact(GtkWindow *parent, PurpleContact *contact) { struct log_viewer_hash_t *ht = g_new0(struct log_viewer_hash_t, 1); PurpleBlistNode *child; PidginLogViewer *lv = NULL;