Mercurial > pidgin

comparison src/buddy_chat.c @ 4162:d3c8d2b40494

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 4391] gtk_signal_connect() to g_signal_connect() Everything seems fine, and nothing should be broken. However, please let me know if anything strange happens. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Tue, 31 Dec 2002 19:32:38 +0000
parents 7edd02612086
children 511c2b63caa4
comparison
equal deleted inserted replaced
4161:c79961f48063 4162:d3c8d2b40494
184 gtk_entry_set_text(GTK_ENTRY(entry), pce->def); 184 gtk_entry_set_text(GTK_ENTRY(entry), pce->def);
185 if (focus) { 185 if (focus) {
186 gtk_widget_grab_focus(entry); 186 gtk_widget_grab_focus(entry);
187 focus = FALSE; 187 focus = FALSE;
188 } 188 }
189 gtk_signal_connect(GTK_OBJECT(entry), "activate", 189 g_signal_connect(GTK_OBJECT(entry), "activate",
190 GTK_SIGNAL_FUNC(do_join_chat), NULL); 190 G_CALLBACK(do_join_chat), NULL);
191 gtk_widget_show(entry); 191 gtk_widget_show(entry);
192 } 192 }
193 193
194 g_free(pce); 194 g_free(pce);
195 list = list->next; 195 list = list->next;
228 if (!joinchatgc) 228 if (!joinchatgc)
229 joinchatgc = g; 229 joinchatgc = g;
230 g_snprintf(buf, sizeof buf, "%s (%s)", g->username, g->prpl->name); 230 g_snprintf(buf, sizeof buf, "%s (%s)", g->username, g->prpl->name);
231 opt = gtk_menu_item_new_with_label(buf); 231 opt = gtk_menu_item_new_with_label(buf);
232 gtk_object_set_user_data(GTK_OBJECT(opt), g); 232 gtk_object_set_user_data(GTK_OBJECT(opt), g);
233 gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(joinchat_choose), g); 233 g_signal_connect(GTK_OBJECT(opt), "activate", G_CALLBACK(joinchat_choose), g);
234 gtk_menu_append(GTK_MENU(menu), opt); 234 gtk_menu_append(GTK_MENU(menu), opt);
235 gtk_widget_show(opt); 235 gtk_widget_show(opt);
236 } 236 }
237 237
238 gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu); 238 gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
268 if (!joinchat) { 268 if (!joinchat) {
269 GAIM_DIALOG(joinchat); 269 GAIM_DIALOG(joinchat);
270 gtk_window_set_role(GTK_WINDOW(joinchat), "joinchat"); 270 gtk_window_set_role(GTK_WINDOW(joinchat), "joinchat");
271 gtk_window_set_policy(GTK_WINDOW(joinchat), FALSE, TRUE, TRUE); 271 gtk_window_set_policy(GTK_WINDOW(joinchat), FALSE, TRUE, TRUE);
272 gtk_widget_realize(joinchat); 272 gtk_widget_realize(joinchat);
273 gtk_signal_connect(GTK_OBJECT(joinchat), "delete_event", 273 g_signal_connect(GTK_OBJECT(joinchat), "delete_event",
274 GTK_SIGNAL_FUNC(destroy_join_chat), joinchat); 274 G_CALLBACK(destroy_join_chat), joinchat);
275 gtk_window_set_title(GTK_WINDOW(joinchat), _("Join Chat")); 275 gtk_window_set_title(GTK_WINDOW(joinchat), _("Join Chat"));
276 276
277 mainbox = gtk_vbox_new(FALSE, 5); 277 mainbox = gtk_vbox_new(FALSE, 5);
278 gtk_container_set_border_width(GTK_CONTAINER(mainbox), 5); 278 gtk_container_set_border_width(GTK_CONTAINER(mainbox), 5);
279 gtk_container_add(GTK_CONTAINER(joinchat), mainbox); 279 gtk_container_add(GTK_CONTAINER(joinchat), mainbox);
310 bbox = gtk_hbox_new(FALSE, 5); 310 bbox = gtk_hbox_new(FALSE, 5);
311 gtk_box_pack_start(GTK_BOX(mainbox), bbox, FALSE, FALSE, 0); 311 gtk_box_pack_start(GTK_BOX(mainbox), bbox, FALSE, FALSE, 0);
312 312
313 join = picture_button(joinchat, _("Join"), join_xpm); 313 join = picture_button(joinchat, _("Join"), join_xpm);
314 gtk_box_pack_end(GTK_BOX(bbox), join, FALSE, FALSE, 0); 314 gtk_box_pack_end(GTK_BOX(bbox), join, FALSE, FALSE, 0);
315 gtk_signal_connect(GTK_OBJECT(join), "clicked", GTK_SIGNAL_FUNC(do_join_chat), NULL); 315 g_signal_connect(GTK_OBJECT(join), "clicked", G_CALLBACK(do_join_chat), NULL);
316 316
317 cancel = picture_button(joinchat, _("Cancel"), cancel_xpm); 317 cancel = picture_button(joinchat, _("Cancel"), cancel_xpm);
318 gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 0); 318 gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 0);
319 gtk_signal_connect(GTK_OBJECT(cancel), "clicked", 319 g_signal_connect(GTK_OBJECT(cancel), "clicked",
320 GTK_SIGNAL_FUNC(destroy_join_chat), joinchat); 320 G_CALLBACK(destroy_join_chat), joinchat);
321 } 321 }
322 gtk_widget_show_all(joinchat); 322 gtk_widget_show_all(joinchat);
323 } 323 }
324 324
325 325
440 440
441 gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 0); 441 gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 0);
442 gtk_box_pack_end(GTK_BOX(bbox), invite_btn, FALSE, FALSE, 0); 442 gtk_box_pack_end(GTK_BOX(bbox), invite_btn, FALSE, FALSE, 0);
443 443
444 /* Handle closes right */ 444 /* Handle closes right */
445 gtk_signal_connect(GTK_OBJECT(invite), "delete_event", 445 g_signal_connect(GTK_OBJECT(invite), "delete_event",
446 GTK_SIGNAL_FUNC(destroy_invite), invite); 446 G_CALLBACK(destroy_invite), invite);
447 447
448 gtk_signal_connect(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(destroy_invite), b); 448 g_signal_connect(GTK_OBJECT(cancel), "clicked", G_CALLBACK(destroy_invite), b);
449 gtk_signal_connect(GTK_OBJECT(invite_btn), "clicked", GTK_SIGNAL_FUNC(do_invite), b); 449 g_signal_connect(GTK_OBJECT(invite_btn), "clicked", G_CALLBACK(do_invite), b);
450 gtk_signal_connect(GTK_OBJECT(GTK_ENTRY(GTK_COMBO(inviteentry)->entry)), "activate", 450 g_signal_connect(GTK_OBJECT(GTK_ENTRY(GTK_COMBO(inviteentry)->entry)), "activate",
451 GTK_SIGNAL_FUNC(do_invite), b); 451 G_CALLBACK(do_invite), b);
452 452
453 /* Finish up */ 453 /* Finish up */
454 gtk_widget_set_usize(GTK_WIDGET(invite), 550, 115); 454 gtk_widget_set_usize(GTK_WIDGET(invite), 550, 115);
455 gtk_widget_show(invite_btn); 455 gtk_widget_show(invite_btn);
456 gtk_widget_show(cancel); 456 gtk_widget_show(cancel);
865 gtk_widget_destroy(menu); 865 gtk_widget_destroy(menu);
866 866
867 menu = gtk_menu_new(); 867 menu = gtk_menu_new();
868 868
869 button = gtk_menu_item_new_with_label(_("IM")); 869 button = gtk_menu_item_new_with_label(_("IM"));
870 gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(chat_press_im), b); 870 g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(chat_press_im), b);
871 gtk_object_set_user_data(GTK_OBJECT(button), who); 871 gtk_object_set_user_data(GTK_OBJECT(button), who);
872 gtk_menu_append(GTK_MENU(menu), button); 872 gtk_menu_append(GTK_MENU(menu), button);
873 gtk_widget_show(button); 873 gtk_widget_show(button);
874 874
875 if (ignored(b, gtk_object_get_user_data(obj))) 875 if (ignored(b, gtk_object_get_user_data(obj)))
876 button = gtk_menu_item_new_with_label(_("Un-Ignore")); 876 button = gtk_menu_item_new_with_label(_("Un-Ignore"));
877 else 877 else
878 button = gtk_menu_item_new_with_label(_("Ignore")); 878 button = gtk_menu_item_new_with_label(_("Ignore"));
879 879
880 gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(chat_press_ign), b); 880 g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(chat_press_ign), b);
881 gtk_object_set_user_data(GTK_OBJECT(button), who); 881 gtk_object_set_user_data(GTK_OBJECT(button), who);
882 gtk_menu_append(GTK_MENU(menu), button); 882 gtk_menu_append(GTK_MENU(menu), button);
883 gtk_widget_show(button); 883 gtk_widget_show(button);
884 884
885 if (b->gc && b->gc->prpl->get_info) { 885 if (b->gc && b->gc->prpl->get_info) {
886 button = gtk_menu_item_new_with_label(_("Info")); 886 button = gtk_menu_item_new_with_label(_("Info"));
887 gtk_signal_connect(GTK_OBJECT(button), "activate", 887 g_signal_connect(GTK_OBJECT(button), "activate",
888 GTK_SIGNAL_FUNC(chat_press_info), b); 888 G_CALLBACK(chat_press_info), b);
889 gtk_object_set_user_data(GTK_OBJECT(button), who); 889 gtk_object_set_user_data(GTK_OBJECT(button), who);
890 gtk_menu_append(GTK_MENU(menu), button); 890 gtk_menu_append(GTK_MENU(menu), button);
891 gtk_widget_show(button); 891 gtk_widget_show(button);
892 } 892 }
893 893
894 if (b->gc && b->gc->prpl->get_cb_away) { 894 if (b->gc && b->gc->prpl->get_cb_away) {
895 button = gtk_menu_item_new_with_label(_("Get Away Msg")); 895 button = gtk_menu_item_new_with_label(_("Get Away Msg"));
896 gtk_signal_connect(GTK_OBJECT(button), "activate", 896 g_signal_connect(GTK_OBJECT(button), "activate",
897 GTK_SIGNAL_FUNC(chat_press_away), b); 897 G_CALLBACK(chat_press_away), b);
898 gtk_object_set_user_data(GTK_OBJECT(button), who); 898 gtk_object_set_user_data(GTK_OBJECT(button), who);
899 gtk_menu_append(GTK_MENU(menu), button); 899 gtk_menu_append(GTK_MENU(menu), button);
900 gtk_widget_show(button); 900 gtk_widget_show(button);
901 } 901 }
902 902
904 if (b->gc) { 904 if (b->gc) {
905 if (find_buddy(b->gc, who)) 905 if (find_buddy(b->gc, who))
906 button = gtk_menu_item_new_with_label(_("Remove")); 906 button = gtk_menu_item_new_with_label(_("Remove"));
907 else 907 else
908 button = gtk_menu_item_new_with_label(_("Add")); 908 button = gtk_menu_item_new_with_label(_("Add"));
909 gtk_signal_connect(GTK_OBJECT(button), "activate", 909 g_signal_connect(GTK_OBJECT(button), "activate",
910 GTK_SIGNAL_FUNC(chat_press_add), b); 910 G_CALLBACK(chat_press_add), b);
911 gtk_object_set_user_data(GTK_OBJECT(button), 911 gtk_object_set_user_data(GTK_OBJECT(button),
912 who); 912 who);
913 gtk_menu_append(GTK_MENU(menu), button); 913 gtk_menu_append(GTK_MENU(menu), button);
914 gtk_widget_show(button); 914 gtk_widget_show(button);
915 } 915 }
1206 gtk_window_set_role(GTK_WINDOW(win), "buddy_chat"); 1206 gtk_window_set_role(GTK_WINDOW(win), "buddy_chat");
1207 gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, FALSE); 1207 gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, FALSE);
1208 gtk_container_border_width(GTK_CONTAINER(win), 0); 1208 gtk_container_border_width(GTK_CONTAINER(win), 0);
1209 gtk_widget_realize(win); 1209 gtk_widget_realize(win);
1210 gtk_window_set_title(GTK_WINDOW(win), _("Gaim - Group Chats")); 1210 gtk_window_set_title(GTK_WINDOW(win), _("Gaim - Group Chats"));
1211 gtk_signal_connect(GTK_OBJECT(win), "delete_event", 1211 g_signal_connect(GTK_OBJECT(win), "delete_event",
1212 GTK_SIGNAL_FUNC(delete_all_convo), NULL); 1212 G_CALLBACK(delete_all_convo), NULL);
1213 1213
1214 chat_notebook = gtk_notebook_new(); 1214 chat_notebook = gtk_notebook_new();
1215 if ((convo_options & OPT_CONVO_COMBINE) && (im_options & OPT_IM_ONE_WINDOW)) 1215 if ((convo_options & OPT_CONVO_COMBINE) && (im_options & OPT_IM_ONE_WINDOW))
1216 convo_notebook = chat_notebook; 1216 convo_notebook = chat_notebook;
1217 if (chat_options & OPT_CHAT_SIDE_TAB) { 1217 if (chat_options & OPT_CHAT_SIDE_TAB) {
1237 gtk_widget_show(testidea); 1237 gtk_widget_show(testidea);
1238 1238
1239 gtk_notebook_set_scrollable(GTK_NOTEBOOK(chat_notebook), TRUE); 1239 gtk_notebook_set_scrollable(GTK_NOTEBOOK(chat_notebook), TRUE);
1240 gtk_notebook_popup_enable(GTK_NOTEBOOK(chat_notebook)); 1240 gtk_notebook_popup_enable(GTK_NOTEBOOK(chat_notebook));
1241 gtk_container_add(GTK_CONTAINER(win), testidea); 1241 gtk_container_add(GTK_CONTAINER(win), testidea);
1242 gtk_signal_connect(GTK_OBJECT(chat_notebook), "switch-page", 1242 g_signal_connect(GTK_OBJECT(chat_notebook), "switch-page",
1243 GTK_SIGNAL_FUNC(convo_switch), NULL); 1243 G_CALLBACK(convo_switch), NULL);
1244 gtk_widget_show(chat_notebook); 1244 gtk_widget_show(chat_notebook);
1245 } else 1245 } else
1246 win = b->window = all_chats; 1246 win = b->window = all_chats;
1247 1247
1248 cont = gtk_vbox_new(FALSE, 5); 1248 cont = gtk_vbox_new(FALSE, 5);
1253 gtk_widget_set_size_request(GTK_WIDGET(b->close), 16, 16); 1253 gtk_widget_set_size_request(GTK_WIDGET(b->close), 16, 16);
1254 gtk_container_add(GTK_CONTAINER(b->close), gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU)); 1254 gtk_container_add(GTK_CONTAINER(b->close), gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU));
1255 gtk_button_set_relief(GTK_BUTTON(b->close), GTK_RELIEF_NONE); 1255 gtk_button_set_relief(GTK_BUTTON(b->close), GTK_RELIEF_NONE);
1256 b->tab_label = gtk_label_new(b->name); 1256 b->tab_label = gtk_label_new(b->name);
1257 1257
1258 gtk_signal_connect(GTK_OBJECT(b->close), "clicked", GTK_SIGNAL_FUNC(close_callback), b); 1258 g_signal_connect(GTK_OBJECT(b->close), "clicked", G_CALLBACK(close_callback), b);
1259 1259
1260 gtk_box_pack_start(GTK_BOX(tabby), b->tab_label, FALSE, FALSE, 0); 1260 gtk_box_pack_start(GTK_BOX(tabby), b->tab_label, FALSE, FALSE, 0);
1261 gtk_box_pack_start(GTK_BOX(tabby), b->close, FALSE, FALSE, 0); 1261 gtk_box_pack_start(GTK_BOX(tabby), b->close, FALSE, FALSE, 0);
1262 gtk_widget_show_all(tabby); 1262 gtk_widget_show_all(tabby);
1263 gtk_notebook_append_page(GTK_NOTEBOOK(chat_notebook), cont, tabby); 1263 gtk_notebook_append_page(GTK_NOTEBOOK(chat_notebook), cont, tabby);
1270 gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, TRUE); 1270 gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, TRUE);
1271 gtk_container_border_width(GTK_CONTAINER(win), 10); 1271 gtk_container_border_width(GTK_CONTAINER(win), 10);
1272 gtk_widget_realize(win); 1272 gtk_widget_realize(win);
1273 g_snprintf(buf, sizeof(buf), "Gaim - %s (chat)", b->name); 1273 g_snprintf(buf, sizeof(buf), "Gaim - %s (chat)", b->name);
1274 gtk_window_set_title(GTK_WINDOW(win), buf); 1274 gtk_window_set_title(GTK_WINDOW(win), buf);
1275 gtk_signal_connect(GTK_OBJECT(win), "destroy", GTK_SIGNAL_FUNC(close_callback), b); 1275 g_signal_connect(GTK_OBJECT(win), "destroy", G_CALLBACK(close_callback), b);
1276 1276
1277 cont = gtk_vbox_new(FALSE, 5); 1277 cont = gtk_vbox_new(FALSE, 5);
1278 gtk_container_add(GTK_CONTAINER(win), cont); 1278 gtk_container_add(GTK_CONTAINER(win), cont);
1279 gtk_widget_show(cont); 1279 gtk_widget_show(cont);
1280 } 1280 }
1340 list = gtk_tree_view_new_with_model(GTK_TREE_MODEL(ls)); 1340 list = gtk_tree_view_new_with_model(GTK_TREE_MODEL(ls));
1341 1341
1342 rend = gtk_cell_renderer_text_new(); 1342 rend = gtk_cell_renderer_text_new();
1343 col = gtk_tree_view_column_new_with_attributes(NULL, rend, "text", 0, NULL); 1343 col = gtk_tree_view_column_new_with_attributes(NULL, rend, "text", 0, NULL);
1344 gtk_tree_view_column_set_clickable(GTK_TREE_VIEW_COLUMN(col), TRUE); 1344 gtk_tree_view_column_set_clickable(GTK_TREE_VIEW_COLUMN(col), TRUE);
1345 gtk_signal_connect(GTK_OBJECT(list), "button_press_event", 1345 g_signal_connect(GTK_OBJECT(list), "button_press_event",
1346 GTK_SIGNAL_FUNC(right_click_chat), b); 1346 G_CALLBACK(right_click_chat), b);
1347 gtk_tree_view_append_column(GTK_TREE_VIEW(list), col); 1347 gtk_tree_view_append_column(GTK_TREE_VIEW(list), col);
1348 1348
1349 col = gtk_tree_view_column_new_with_attributes(NULL, rend, "text", 1, NULL); 1349 col = gtk_tree_view_column_new_with_attributes(NULL, rend, "text", 1, NULL);
1350 gtk_tree_view_column_set_clickable(GTK_TREE_VIEW_COLUMN(col), TRUE); 1350 gtk_tree_view_column_set_clickable(GTK_TREE_VIEW_COLUMN(col), TRUE);
1351 gtk_signal_connect(GTK_OBJECT(list), "button_press_event", 1351 g_signal_connect(GTK_OBJECT(list), "button_press_event",
1352 GTK_SIGNAL_FUNC(right_click_chat), b); 1352 G_CALLBACK(right_click_chat), b);
1353 gtk_tree_view_append_column(GTK_TREE_VIEW(list), col); 1353 gtk_tree_view_append_column(GTK_TREE_VIEW(list), col);
1354 1354
1355 gtk_widget_set_usize(list, 150, -1); 1355 gtk_widget_set_usize(list, 150, -1);
1356 1356
1357 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(list), FALSE); 1357 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(list), FALSE);
1365 gtk_widget_show(bbox2); 1365 gtk_widget_show(bbox2);
1366 1366
1367 button = gaim_pixbuf_button_from_stock(NULL, "gtk-redo", GAIM_BUTTON_VERTICAL); 1367 button = gaim_pixbuf_button_from_stock(NULL, "gtk-redo", GAIM_BUTTON_VERTICAL);
1368 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); 1368 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1369 gtk_box_pack_start(GTK_BOX(bbox2), button, FALSE, FALSE, 0); 1369 gtk_box_pack_start(GTK_BOX(bbox2), button, FALSE, FALSE, 0);
1370 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(im_callback), b); 1370 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(im_callback), b);
1371 gtk_widget_show(button); 1371 gtk_widget_show(button);
1372 1372
1373 button = gaim_pixbuf_button_from_stock(NULL, "gtk-dialog-error", GAIM_BUTTON_VERTICAL); 1373 button = gaim_pixbuf_button_from_stock(NULL, "gtk-dialog-error", GAIM_BUTTON_VERTICAL);
1374 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); 1374 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1375 gtk_box_pack_start(GTK_BOX(bbox2), button, FALSE, FALSE, 0); 1375 gtk_box_pack_start(GTK_BOX(bbox2), button, FALSE, FALSE, 0);
1376 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(ignore_callback), b); 1376 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(ignore_callback), b);
1377 gtk_widget_show(button); 1377 gtk_widget_show(button);
1378 1378
1379 button = gaim_pixbuf_button_from_stock(NULL, "gtk-find", GAIM_BUTTON_VERTICAL); 1379 button = gaim_pixbuf_button_from_stock(NULL, "gtk-find", GAIM_BUTTON_VERTICAL);
1380 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); 1380 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1381 gtk_box_pack_start(GTK_BOX(bbox2), button, FALSE, FALSE, 0); 1381 gtk_box_pack_start(GTK_BOX(bbox2), button, FALSE, FALSE, 0);
1382 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(info_callback), b); 1382 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(info_callback), b);
1383 gtk_widget_show(button); 1383 gtk_widget_show(button);
1384 b->info = button; 1384 b->info = button;
1385 1385
1386 vbox = gtk_vbox_new(FALSE, 5); 1386 vbox = gtk_vbox_new(FALSE, 5);
1387 gtk_paned_pack2(GTK_PANED(vpaned), vbox, TRUE, FALSE); 1387 gtk_paned_pack2(GTK_PANED(vpaned), vbox, TRUE, FALSE);
1425 1425
1426 /* 1426 /*
1427 close = picture_button2(win, _("Close"), cancel_xpm, dispstyle); 1427 close = picture_button2(win, _("Close"), cancel_xpm, dispstyle);
1428 b->close = close; 1428 b->close = close;
1429 gtk_object_set_user_data(GTK_OBJECT(close), b); 1429 gtk_object_set_user_data(GTK_OBJECT(close), b);
1430 gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(close_callback), b); 1430 g_signal_connect(GTK_OBJECT(close), "clicked", G_CALLBACK(close_callback), b);
1431 gtk_box_pack_end(GTK_BOX(bbox), close, dispstyle, dispstyle, 0); 1431 gtk_box_pack_end(GTK_BOX(bbox), close, dispstyle, dispstyle, 0);
1432 */ 1432 */
1433 1433
1434 /* Send */ 1434 /* Send */
1435 button = gaim_pixbuf_button_from_stock( 1435 button = gaim_pixbuf_button_from_stock(
1436 (dispstyle == 0 ? NULL : _("Send")), 1436 (dispstyle == 0 ? NULL : _("Send")),
1437 (dispstyle == 1 ? NULL : "gtk-convert"), 1437 (dispstyle == 1 ? NULL : "gtk-convert"),
1438 GAIM_BUTTON_VERTICAL); 1438 GAIM_BUTTON_VERTICAL);
1439 1439
1440 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); 1440 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1441 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(send_callback), b); 1441 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(send_callback), b);
1442 gtk_widget_show(button); 1442 gtk_widget_show(button);
1443 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); 1443 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
1444 b->send = button; 1444 b->send = button;
1445 1445
1446 /* Sep */ 1446 /* Sep */
1451 button = gaim_pixbuf_button_from_stock( 1451 button = gaim_pixbuf_button_from_stock(
1452 (dispstyle == 0 ? NULL : _("Invite")), 1452 (dispstyle == 0 ? NULL : _("Invite")),
1453 (dispstyle == 1 ? NULL : "gtk-jump-to"), 1453 (dispstyle == 1 ? NULL : "gtk-jump-to"),
1454 GAIM_BUTTON_VERTICAL); 1454 GAIM_BUTTON_VERTICAL);
1455 1455
1456 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(invite_callback), b); 1456 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(invite_callback), b);
1457 gtk_widget_show(button); 1457 gtk_widget_show(button);
1458 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); 1458 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
1459 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); 1459 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
1460 b->invite = button; 1460 b->invite = button;
1461 1461
1546 c->send = change_text(c->window, _("Send"), c->send, "gtk-convert", opt); 1546 c->send = change_text(c->window, _("Send"), c->send, "gtk-convert", opt);
1547 c->invite = change_text(c->window, _("Invite"), c->invite, "gtk-jump-to", opt); 1547 c->invite = change_text(c->window, _("Invite"), c->invite, "gtk-jump-to", opt);
1548 gtk_box_pack_end(GTK_BOX(parent), c->send, FALSE, FALSE, 0); 1548 gtk_box_pack_end(GTK_BOX(parent), c->send, FALSE, FALSE, 0);
1549 gtk_box_pack_end(GTK_BOX(parent), c->invite, FALSE, FALSE, 0); 1549 gtk_box_pack_end(GTK_BOX(parent), c->invite, FALSE, FALSE, 0);
1550 1550
1551 gtk_signal_connect(GTK_OBJECT(c->send), "clicked", 1551 g_signal_connect(GTK_OBJECT(c->send), "clicked",
1552 GTK_SIGNAL_FUNC(send_callback), c); 1552 G_CALLBACK(send_callback), c);
1553 gtk_signal_connect(GTK_OBJECT(c->invite), "clicked", 1553 g_signal_connect(GTK_OBJECT(c->invite), "clicked",
1554 GTK_SIGNAL_FUNC(invite_callback), c); 1554 G_CALLBACK(invite_callback), c);
1555 1555
1556 gtk_button_set_relief(GTK_BUTTON(c->send), GTK_RELIEF_NONE); 1556 gtk_button_set_relief(GTK_BUTTON(c->send), GTK_RELIEF_NONE);
1557 gtk_button_set_relief(GTK_BUTTON(c->invite), GTK_RELIEF_NONE); 1557 gtk_button_set_relief(GTK_BUTTON(c->invite), GTK_RELIEF_NONE);
1558 1558
1559 update_buttons_by_protocol(c); 1559 update_buttons_by_protocol(c);
1617 gtk_box_reorder_child(GTK_BOX(parent), c->info, 4); 1617 gtk_box_reorder_child(GTK_BOX(parent), c->info, 4);
1618 1618
1619 1619
1620 update_buttons_by_protocol(c); 1620 update_buttons_by_protocol(c);
1621 1621
1622 gtk_signal_connect(GTK_OBJECT(c->send), "clicked", GTK_SIGNAL_FUNC(send_callback), c); 1622 g_signal_connect(GTK_OBJECT(c->send), "clicked", G_CALLBACK(send_callback), c);
1623 gtk_signal_connect(GTK_OBJECT(c->info), "clicked", GTK_SIGNAL_FUNC(info_callback), c); 1623 g_signal_connect(GTK_OBJECT(c->info), "clicked", G_CALLBACK(info_callback), c);
1624 gtk_signal_connect(GTK_OBJECT(c->warn), "clicked", GTK_SIGNAL_FUNC(warn_callback), c); 1624 g_signal_connect(GTK_OBJECT(c->warn), "clicked", G_CALLBACK(warn_callback), c);
1625 gtk_signal_connect(GTK_OBJECT(c->block), "clicked", GTK_SIGNAL_FUNC(block_callback), c); 1625 g_signal_connect(GTK_OBJECT(c->block), "clicked", G_CALLBACK(block_callback), c);
1626 bcs = bcs->next; 1626 bcs = bcs->next;
1627 } 1627 }
1628 } 1628 }
1629 1629
1630 void chat_tabize() 1630 void chat_tabize()
1648 show_new_buddy_chat(c); 1648 show_new_buddy_chat(c);
1649 gtk_widget_destroy(c->text); 1649 gtk_widget_destroy(c->text);
1650 gtk_widget_reparent(imhtml, c->sw); 1650 gtk_widget_reparent(imhtml, c->sw);
1651 c->text = imhtml; 1651 c->text = imhtml;
1652 gtk_signal_disconnect_by_func(GTK_OBJECT(win), 1652 gtk_signal_disconnect_by_func(GTK_OBJECT(win),
1653 GTK_SIGNAL_FUNC(close_callback), c); 1653 G_CALLBACK(close_callback), c);
1654 gtk_widget_destroy(win); 1654 gtk_widget_destroy(win);
1655 1655
1656 if (c->topic) 1656 if (c->topic)
1657 gtk_entry_set_text(GTK_ENTRY(c->topic_text), c->topic); 1657 gtk_entry_set_text(GTK_ENTRY(c->topic_text), c->topic);
1658 1658