comparison 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
comparison
equal deleted inserted replaced
19874:0ed8a2a86a1b 19875:9474223e534b
1050 for (cur = buddies; cur != NULL; cur = cur->next) 1050 for (cur = buddies; cur != NULL; cur = cur->next)
1051 { 1051 {
1052 PurpleBlistNode *node = cur->data; 1052 PurpleBlistNode *node = cur->data;
1053 if ((node != NULL) && ((node->prev != NULL) || (node->next != NULL))) 1053 if ((node != NULL) && ((node->prev != NULL) || (node->next != NULL)))
1054 { 1054 {
1055 pidgin_log_show_contact((PurpleContact *)node->parent); 1055 pidgin_log_show_contact(GTK_WINDOW(win->window), (PurpleContact *)node->parent);
1056 g_slist_free(buddies); 1056 g_slist_free(buddies);
1057 gdk_window_set_cursor(gtkblist->window->window, NULL); 1057 gdk_window_set_cursor(gtkblist->window->window, NULL);
1058 gdk_window_set_cursor(win->window->window, NULL); 1058 gdk_window_set_cursor(win->window->window, NULL);
1059 return; 1059 return;
1060 } 1060 }
1061 } 1061 }
1062 g_slist_free(buddies); 1062 g_slist_free(buddies);
1063 1063
1064 pidgin_log_show(type, name, account); 1064 pidgin_log_show(GTK_WINDOW(win->window), type, name, account);
1065 1065
1066 gdk_window_set_cursor(gtkblist->window->window, NULL); 1066 gdk_window_set_cursor(gtkblist->window->window, NULL);
1067 gdk_window_set_cursor(win->window->window, NULL); 1067 gdk_window_set_cursor(win->window->window, NULL);
1068 } 1068 }
1069 1069