comparison src/dialogs.c @ 4162:d3c8d2b40494

[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 b45a29ad4e14
children 858822a27529
comparison
equal deleted inserted replaced
4161:c79961f48063 4162:d3c8d2b40494
751 } 751 }
752 g_snprintf(buf, sizeof(buf), "%s (%s)", c->username, c->prpl->name); 752 g_snprintf(buf, sizeof(buf), "%s (%s)", c->username, c->prpl->name);
753 opt = gtk_menu_item_new_with_label(buf); 753 opt = gtk_menu_item_new_with_label(buf);
754 gtk_object_set_user_data(GTK_OBJECT(opt), info); 754 gtk_object_set_user_data(GTK_OBJECT(opt), info);
755 755
756 gtk_signal_connect(GTK_OBJECT(opt), "activate", 756 g_signal_connect(GTK_OBJECT(opt), "activate",
757 GTK_SIGNAL_FUNC(show_info_select_account), c); 757 G_CALLBACK(show_info_select_account), c);
758 758
759 gtk_menu_append(GTK_MENU(menu), opt); 759 gtk_menu_append(GTK_MENU(menu), opt);
760 g = g->next; 760 g = g->next;
761 } 761 }
762 762
845 } 845 }
846 g_snprintf(buf, sizeof(buf), "%s (%s)", c->username, c->prpl->name); 846 g_snprintf(buf, sizeof(buf), "%s (%s)", c->username, c->prpl->name);
847 opt = gtk_menu_item_new_with_label(buf); 847 opt = gtk_menu_item_new_with_label(buf);
848 gtk_object_set_user_data(GTK_OBJECT(opt), info); 848 gtk_object_set_user_data(GTK_OBJECT(opt), info);
849 849
850 gtk_signal_connect(GTK_OBJECT(opt), "activate", 850 g_signal_connect(GTK_OBJECT(opt), "activate",
851 GTK_SIGNAL_FUNC(show_info_select_account), c); 851 G_CALLBACK(show_info_select_account), c);
852 852
853 gtk_menu_append(GTK_MENU(menu), opt); 853 gtk_menu_append(GTK_MENU(menu), opt);
854 g = g->next; 854 g = g->next;
855 } 855 }
856 856
1018 c = (struct gaim_connection *)g->data; 1018 c = (struct gaim_connection *)g->data;
1019 g_snprintf(buf, sizeof(buf), "%s (%s)", 1019 g_snprintf(buf, sizeof(buf), "%s (%s)",
1020 c->username, c->prpl->name); 1020 c->username, c->prpl->name);
1021 opt = gtk_menu_item_new_with_label(buf); 1021 opt = gtk_menu_item_new_with_label(buf);
1022 gtk_object_set_user_data(GTK_OBJECT(opt), b); 1022 gtk_object_set_user_data(GTK_OBJECT(opt), b);
1023 gtk_signal_connect(GTK_OBJECT(opt), "activate", 1023 g_signal_connect(GTK_OBJECT(opt), "activate",
1024 GTK_SIGNAL_FUNC(addbuddy_select_account), 1024 G_CALLBACK(addbuddy_select_account),
1025 c); 1025 c);
1026 gtk_widget_show(opt); 1026 gtk_widget_show(opt);
1027 gtk_menu_append(GTK_MENU(menu), opt); 1027 gtk_menu_append(GTK_MENU(menu), opt);
1028 1028
1029 /* Now check to see if it's our current menu */ 1029 /* Now check to see if it's our current menu */
1066 gtk_window_set_role(GTK_WINDOW(a->window), "add_buddy"); 1066 gtk_window_set_role(GTK_WINDOW(a->window), "add_buddy");
1067 gtk_window_set_policy(GTK_WINDOW(a->window), FALSE, FALSE, TRUE); 1067 gtk_window_set_policy(GTK_WINDOW(a->window), FALSE, FALSE, TRUE);
1068 gtk_window_set_title(GTK_WINDOW(a->window), _("Gaim - Add Buddy")); 1068 gtk_window_set_title(GTK_WINDOW(a->window), _("Gaim - Add Buddy"));
1069 1069
1070 gtk_widget_realize(a->window); 1070 gtk_widget_realize(a->window);
1071 gtk_signal_connect(GTK_OBJECT(a->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), a->window); 1071 g_signal_connect(GTK_OBJECT(a->window), "destroy", G_CALLBACK(destroy_dialog), a->window);
1072 gtk_signal_connect(GTK_OBJECT(a->window), "destroy", GTK_SIGNAL_FUNC(free_dialog), a); 1072 g_signal_connect(GTK_OBJECT(a->window), "destroy", G_CALLBACK(free_dialog), a);
1073 dialogwindows = g_list_prepend(dialogwindows, a->window); 1073 dialogwindows = g_list_prepend(dialogwindows, a->window);
1074 1074
1075 mainbox = gtk_vbox_new(FALSE, 5); 1075 mainbox = gtk_vbox_new(FALSE, 5);
1076 gtk_container_set_border_width(GTK_CONTAINER(mainbox), 5); 1076 gtk_container_set_border_width(GTK_CONTAINER(mainbox), 5);
1077 gtk_container_add(GTK_CONTAINER(a->window), mainbox); 1077 gtk_container_add(GTK_CONTAINER(a->window), mainbox);
1092 a->entry = gtk_entry_new(); 1092 a->entry = gtk_entry_new();
1093 gtk_table_attach_defaults(GTK_TABLE(table), a->entry, 1, 2, 0, 1); 1093 gtk_table_attach_defaults(GTK_TABLE(table), a->entry, 1, 2, 0, 1);
1094 gtk_widget_grab_focus(a->entry); 1094 gtk_widget_grab_focus(a->entry);
1095 if (buddy != NULL) 1095 if (buddy != NULL)
1096 gtk_entry_set_text(GTK_ENTRY(a->entry), buddy); 1096 gtk_entry_set_text(GTK_ENTRY(a->entry), buddy);
1097 gtk_signal_connect(GTK_OBJECT(a->entry), "activate", GTK_SIGNAL_FUNC(do_add_buddy), a); 1097 g_signal_connect(GTK_OBJECT(a->entry), "activate", G_CALLBACK(do_add_buddy), a);
1098 1098
1099 label = gtk_label_new(_("Alias")); 1099 label = gtk_label_new(_("Alias"));
1100 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2); 1100 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2);
1101 1101
1102 a->entry_for_alias = gtk_entry_new(); 1102 a->entry_for_alias = gtk_entry_new();
1125 bbox = gtk_hbox_new(FALSE, 5); 1125 bbox = gtk_hbox_new(FALSE, 5);
1126 gtk_box_pack_start(GTK_BOX(mainbox), bbox, TRUE, TRUE, 0); 1126 gtk_box_pack_start(GTK_BOX(mainbox), bbox, TRUE, TRUE, 0);
1127 1127
1128 add = picture_button(a->window, _("Add"), add_xpm); 1128 add = picture_button(a->window, _("Add"), add_xpm);
1129 gtk_box_pack_end(GTK_BOX(bbox), add, FALSE, FALSE, 0); 1129 gtk_box_pack_end(GTK_BOX(bbox), add, FALSE, FALSE, 0);
1130 gtk_signal_connect(GTK_OBJECT(add), "clicked", GTK_SIGNAL_FUNC(do_add_buddy), a); 1130 g_signal_connect(GTK_OBJECT(add), "clicked", G_CALLBACK(do_add_buddy), a);
1131 1131
1132 cancel = picture_button(a->window, _("Cancel"), cancel_xpm); 1132 cancel = picture_button(a->window, _("Cancel"), cancel_xpm);
1133 gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 0); 1133 gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 0);
1134 gtk_signal_connect(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), a->window); 1134 g_signal_connect(GTK_OBJECT(cancel), "clicked", G_CALLBACK(destroy_dialog), a->window);
1135 1135
1136 gtk_widget_show_all(a->window); 1136 gtk_widget_show_all(a->window);
1137 if (group != NULL) 1137 if (group != NULL)
1138 gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(a->combo)->entry), group); 1138 gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(a->combo)->entry), group);
1139 } 1139 }
1169 else 1169 else
1170 opt = 1170 opt =
1171 gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(set)), 1171 gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(set)),
1172 label); 1172 label);
1173 gtk_box_pack_start(GTK_BOX(box), opt, FALSE, FALSE, 0); 1173 gtk_box_pack_start(GTK_BOX(box), opt, FALSE, FALSE, 0);
1174 gtk_signal_connect(GTK_OBJECT(opt), "toggled", GTK_SIGNAL_FUNC(set_deny_mode), (void *)which); 1174 g_signal_connect(GTK_OBJECT(opt), "toggled", G_CALLBACK(set_deny_mode), (void *)which);
1175 gtk_widget_show(opt); 1175 gtk_widget_show(opt);
1176 if (current_deny_gc->permdeny == which) 1176 if (current_deny_gc->permdeny == which)
1177 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE); 1177 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE);
1178 1178
1179 return opt; 1179 return opt;
1296 c = c->next; 1296 c = c->next;
1297 if (!gc->prpl->set_permit_deny) 1297 if (!gc->prpl->set_permit_deny)
1298 continue; 1298 continue;
1299 g_snprintf(buf, sizeof buf, "%s (%s)", gc->username, gc->prpl->name); 1299 g_snprintf(buf, sizeof buf, "%s (%s)", gc->username, gc->prpl->name);
1300 opt = gtk_menu_item_new_with_label(buf); 1300 opt = gtk_menu_item_new_with_label(buf);
1301 gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(deny_gc_opt), gc); 1301 g_signal_connect(GTK_OBJECT(opt), "activate", G_CALLBACK(deny_gc_opt), gc);
1302 gtk_widget_show(opt); 1302 gtk_widget_show(opt);
1303 gtk_menu_append(GTK_MENU(menu), opt); 1303 gtk_menu_append(GTK_MENU(menu), opt);
1304 if (gc == current_deny_gc) 1304 if (gc == current_deny_gc)
1305 found = TRUE; 1305 found = TRUE;
1306 else if (!found) 1306 else if (!found)
1409 1409
1410 privacy_win = pwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); 1410 privacy_win = pwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
1411 gtk_window_set_policy(GTK_WINDOW(pwin), FALSE, TRUE, TRUE); 1411 gtk_window_set_policy(GTK_WINDOW(pwin), FALSE, TRUE, TRUE);
1412 gtk_window_set_role(GTK_WINDOW(pwin), "privacy"); 1412 gtk_window_set_role(GTK_WINDOW(pwin), "privacy");
1413 gtk_window_set_title(GTK_WINDOW(pwin), _("Gaim - Privacy")); 1413 gtk_window_set_title(GTK_WINDOW(pwin), _("Gaim - Privacy"));
1414 gtk_signal_connect(GTK_OBJECT(pwin), "destroy", GTK_SIGNAL_FUNC(destroy_privacy), NULL); 1414 g_signal_connect(GTK_OBJECT(pwin), "destroy", G_CALLBACK(destroy_privacy), NULL);
1415 gtk_widget_realize(pwin); 1415 gtk_widget_realize(pwin);
1416 1416
1417 gtk_widget_set_usize(pwin, 0, 400); 1417 gtk_widget_set_usize(pwin, 0, 400);
1418 1418
1419 box = gtk_vbox_new(FALSE, 5); 1419 box = gtk_vbox_new(FALSE, 5);
1433 gtk_box_pack_start(GTK_BOX(deny_conn_hbox), label, FALSE, FALSE, 5); 1433 gtk_box_pack_start(GTK_BOX(deny_conn_hbox), label, FALSE, FALSE, 5);
1434 gtk_widget_show(label); 1434 gtk_widget_show(label);
1435 1435
1436 deny_opt_menu = gtk_option_menu_new(); 1436 deny_opt_menu = gtk_option_menu_new();
1437 gtk_box_pack_start(GTK_BOX(deny_conn_hbox), deny_opt_menu, FALSE, FALSE, 5); 1437 gtk_box_pack_start(GTK_BOX(deny_conn_hbox), deny_opt_menu, FALSE, FALSE, 5);
1438 gtk_signal_connect(GTK_OBJECT(deny_opt_menu), "destroy", GTK_SIGNAL_FUNC(des_deny_opt), NULL); 1438 g_signal_connect(GTK_OBJECT(deny_opt_menu), "destroy", G_CALLBACK(des_deny_opt), NULL);
1439 gtk_widget_show(deny_opt_menu); 1439 gtk_widget_show(deny_opt_menu);
1440 1440
1441 build_deny_menu(); 1441 build_deny_menu();
1442 1442
1443 hbox = gtk_hbox_new(FALSE, 5); 1443 hbox = gtk_hbox_new(FALSE, 5);
1470 bbox = gtk_hbox_new(TRUE, 5); 1470 bbox = gtk_hbox_new(TRUE, 5);
1471 gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 5); 1471 gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 5);
1472 gtk_widget_show(bbox); 1472 gtk_widget_show(bbox);
1473 1473
1474 button = picture_button(pwin, _("Add"), gnome_add_xpm); 1474 button = picture_button(pwin, _("Add"), gnome_add_xpm);
1475 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(pref_deny_add), (void *)TRUE); 1475 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(pref_deny_add), (void *)TRUE);
1476 gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 5); 1476 gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 5);
1477 1477
1478 button = picture_button(pwin, _("Remove"), gnome_remove_xpm); 1478 button = picture_button(pwin, _("Remove"), gnome_remove_xpm);
1479 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(pref_deny_rem), (void *)TRUE); 1479 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(pref_deny_rem), (void *)TRUE);
1480 gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 5); 1480 gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 5);
1481 1481
1482 vbox = gtk_vbox_new(FALSE, 5); 1482 vbox = gtk_vbox_new(FALSE, 5);
1483 gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5); 1483 gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5);
1484 gtk_widget_show(vbox); 1484 gtk_widget_show(vbox);
1504 bbox = gtk_hbox_new(TRUE, 5); 1504 bbox = gtk_hbox_new(TRUE, 5);
1505 gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 5); 1505 gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 5);
1506 gtk_widget_show(bbox); 1506 gtk_widget_show(bbox);
1507 1507
1508 button = picture_button(pwin, _("Add"), gnome_add_xpm); 1508 button = picture_button(pwin, _("Add"), gnome_add_xpm);
1509 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(pref_deny_add), FALSE); 1509 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(pref_deny_add), FALSE);
1510 gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 5); 1510 gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 5);
1511 1511
1512 button = picture_button(pwin, _("Remove"), gnome_remove_xpm); 1512 button = picture_button(pwin, _("Remove"), gnome_remove_xpm);
1513 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(pref_deny_rem), FALSE); 1513 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(pref_deny_rem), FALSE);
1514 gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 5); 1514 gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 5);
1515 1515
1516 sep = gtk_hseparator_new(); 1516 sep = gtk_hseparator_new();
1517 gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 5); 1517 gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 5);
1518 gtk_widget_show(sep); 1518 gtk_widget_show(sep);
1520 hbox = gtk_hbox_new(TRUE, 5); 1520 hbox = gtk_hbox_new(TRUE, 5);
1521 gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 5); 1521 gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 5);
1522 gtk_widget_show(hbox); 1522 gtk_widget_show(hbox);
1523 close_button = picture_button(pwin, _("Close"), cancel_xpm); 1523 close_button = picture_button(pwin, _("Close"), cancel_xpm);
1524 gtk_box_pack_end(GTK_BOX(hbox), close_button, FALSE, FALSE, 5); 1524 gtk_box_pack_end(GTK_BOX(hbox), close_button, FALSE, FALSE, 5);
1525 gtk_signal_connect_object(GTK_OBJECT(close_button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), pwin); 1525 g_signal_connect_swapped(GTK_OBJECT(close_button), "clicked", G_CALLBACK(gtk_widget_destroy), pwin);
1526 1526
1527 gtk_widget_show(pwin); 1527 gtk_widget_show(pwin);
1528 } 1528 }
1529 1529
1530 1530
1627 a = (struct aim_user *)u->data; 1627 a = (struct aim_user *)u->data;
1628 p = (struct prpl *)find_prpl(a->protocol); 1628 p = (struct prpl *)find_prpl(a->protocol);
1629 g_snprintf(buf, sizeof buf, "%s (%s)", a->username, (p && p->name)?p->name:"Unknown"); 1629 g_snprintf(buf, sizeof buf, "%s (%s)", a->username, (p && p->name)?p->name:"Unknown");
1630 opt = gtk_menu_item_new_with_label(buf); 1630 opt = gtk_menu_item_new_with_label(buf);
1631 gtk_object_set_user_data(GTK_OBJECT(opt), a); 1631 gtk_object_set_user_data(GTK_OBJECT(opt), a);
1632 gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(pounce_choose), b); 1632 g_signal_connect(GTK_OBJECT(opt), "activate", G_CALLBACK(pounce_choose), b);
1633 gtk_menu_append(GTK_MENU(menu), opt); 1633 gtk_menu_append(GTK_MENU(menu), opt);
1634 gtk_widget_show(opt); 1634 gtk_widget_show(opt);
1635 1635
1636 if (b->user == a) { 1636 if (b->user == a) {
1637 gtk_menu_item_activate(GTK_MENU_ITEM(opt)); 1637 gtk_menu_item_activate(GTK_MENU_ITEM(opt));
1677 GAIM_DIALOG(b->window); 1677 GAIM_DIALOG(b->window);
1678 dialogwindows = g_list_prepend(dialogwindows, b->window); 1678 dialogwindows = g_list_prepend(dialogwindows, b->window);
1679 gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE); 1679 gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
1680 gtk_window_set_role(GTK_WINDOW(b->window), "new_bp"); 1680 gtk_window_set_role(GTK_WINDOW(b->window), "new_bp");
1681 gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - New Buddy Pounce")); 1681 gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - New Buddy Pounce"));
1682 gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window); 1682 g_signal_connect(GTK_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window);
1683 gtk_widget_realize(b->window); 1683 gtk_widget_realize(b->window);
1684 1684
1685 vbox = gtk_vbox_new(FALSE, 5); 1685 vbox = gtk_vbox_new(FALSE, 5);
1686 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); 1686 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
1687 gtk_container_add(GTK_CONTAINER(b->window), vbox); 1687 gtk_container_add(GTK_CONTAINER(b->window), vbox);
1810 gtk_table_attach(GTK_TABLE(table), b->sendim, 0, 1, 1, 2, GTK_FILL, 0, 0, 0); 1810 gtk_table_attach(GTK_TABLE(table), b->sendim, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
1811 gtk_widget_show(b->sendim); 1811 gtk_widget_show(b->sendim);
1812 1812
1813 b->messentry = gtk_entry_new(); 1813 b->messentry = gtk_entry_new();
1814 gtk_table_attach(GTK_TABLE(table), b->messentry, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0); 1814 gtk_table_attach(GTK_TABLE(table), b->messentry, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
1815 gtk_signal_connect(GTK_OBJECT(b->messentry), "activate", GTK_SIGNAL_FUNC(do_new_bp), b); 1815 g_signal_connect(GTK_OBJECT(b->messentry), "activate", G_CALLBACK(do_new_bp), b);
1816 if(edit_bp) { 1816 if(edit_bp) {
1817 gtk_widget_set_sensitive(GTK_WIDGET(b->messentry), 1817 gtk_widget_set_sensitive(GTK_WIDGET(b->messentry),
1818 (edit_bp->options & OPT_POUNCE_SEND_IM) ? TRUE : FALSE); 1818 (edit_bp->options & OPT_POUNCE_SEND_IM) ? TRUE : FALSE);
1819 gtk_entry_set_text(GTK_ENTRY(b->messentry), edit_bp->message); 1819 gtk_entry_set_text(GTK_ENTRY(b->messentry), edit_bp->message);
1820 } 1820 }
1821 gtk_widget_show(b->messentry); 1821 gtk_widget_show(b->messentry);
1822 1822
1823 gtk_signal_connect(GTK_OBJECT(b->sendim), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), b->messentry); 1823 g_signal_connect(GTK_OBJECT(b->sendim), "clicked", G_CALLBACK(toggle_sensitive), b->messentry);
1824 1824
1825 b->command = gtk_check_button_new_with_label(_("Execute command on pounce")); 1825 b->command = gtk_check_button_new_with_label(_("Execute command on pounce"));
1826 gtk_table_attach(GTK_TABLE(table), b->command, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); 1826 gtk_table_attach(GTK_TABLE(table), b->command, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
1827 if(edit_bp) 1827 if(edit_bp)
1828 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->command), 1828 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->command),
1831 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->command), FALSE); 1831 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->command), FALSE);
1832 gtk_widget_show(b->command); 1832 gtk_widget_show(b->command);
1833 1833
1834 b->commentry = gtk_entry_new(); 1834 b->commentry = gtk_entry_new();
1835 gtk_table_attach(GTK_TABLE(table), b->commentry, 1, 2, 2, 3, GTK_FILL | GTK_EXPAND, 0, 0, 0); 1835 gtk_table_attach(GTK_TABLE(table), b->commentry, 1, 2, 2, 3, GTK_FILL | GTK_EXPAND, 0, 0, 0);
1836 gtk_signal_connect(GTK_OBJECT(b->commentry), "activate", GTK_SIGNAL_FUNC(do_new_bp), b); 1836 g_signal_connect(GTK_OBJECT(b->commentry), "activate", G_CALLBACK(do_new_bp), b);
1837 if(edit_bp) { 1837 if(edit_bp) {
1838 gtk_widget_set_sensitive(GTK_WIDGET(b->commentry), 1838 gtk_widget_set_sensitive(GTK_WIDGET(b->commentry),
1839 (edit_bp->options & OPT_POUNCE_COMMAND) ? TRUE : FALSE); 1839 (edit_bp->options & OPT_POUNCE_COMMAND) ? TRUE : FALSE);
1840 gtk_entry_set_text(GTK_ENTRY(b->commentry), edit_bp->command); 1840 gtk_entry_set_text(GTK_ENTRY(b->commentry), edit_bp->command);
1841 } 1841 }
1842 else 1842 else
1843 gtk_widget_set_sensitive(GTK_WIDGET(b->commentry), FALSE); 1843 gtk_widget_set_sensitive(GTK_WIDGET(b->commentry), FALSE);
1844 gtk_widget_show(b->commentry); 1844 gtk_widget_show(b->commentry);
1845 gtk_signal_connect(GTK_OBJECT(b->command), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), b->commentry); 1845 g_signal_connect(GTK_OBJECT(b->command), "clicked", G_CALLBACK(toggle_sensitive), b->commentry);
1846 1846
1847 b->sound = gtk_check_button_new_with_label(_("Play sound on pounce")); 1847 b->sound = gtk_check_button_new_with_label(_("Play sound on pounce"));
1848 if(edit_bp) 1848 if(edit_bp)
1849 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->sound), 1849 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(b->sound),
1850 (edit_bp->options & OPT_POUNCE_SOUND) ? TRUE : FALSE); 1850 (edit_bp->options & OPT_POUNCE_SOUND) ? TRUE : FALSE);
1853 gtk_table_attach(GTK_TABLE(table), b->sound, 0, 1, 3, 4, GTK_FILL, 0, 0, 0); 1853 gtk_table_attach(GTK_TABLE(table), b->sound, 0, 1, 3, 4, GTK_FILL, 0, 0, 0);
1854 gtk_widget_show(b->sound); 1854 gtk_widget_show(b->sound);
1855 1855
1856 b->soundentry = gtk_entry_new(); 1856 b->soundentry = gtk_entry_new();
1857 gtk_table_attach(GTK_TABLE(table), b->soundentry, 1, 2, 3, 4, GTK_FILL | GTK_EXPAND, 0, 0, 0); 1857 gtk_table_attach(GTK_TABLE(table), b->soundentry, 1, 2, 3, 4, GTK_FILL | GTK_EXPAND, 0, 0, 0);
1858 gtk_signal_connect(GTK_OBJECT(b->soundentry), "activate", GTK_SIGNAL_FUNC(do_new_bp), b); 1858 g_signal_connect(GTK_OBJECT(b->soundentry), "activate", G_CALLBACK(do_new_bp), b);
1859 if(edit_bp) { 1859 if(edit_bp) {
1860 gtk_widget_set_sensitive(GTK_WIDGET(b->soundentry), 1860 gtk_widget_set_sensitive(GTK_WIDGET(b->soundentry),
1861 (edit_bp->options & OPT_POUNCE_SOUND) ? TRUE : FALSE); 1861 (edit_bp->options & OPT_POUNCE_SOUND) ? TRUE : FALSE);
1862 gtk_entry_set_text(GTK_ENTRY(b->soundentry), edit_bp->sound); 1862 gtk_entry_set_text(GTK_ENTRY(b->soundentry), edit_bp->sound);
1863 } else 1863 } else
1864 gtk_widget_set_sensitive(GTK_WIDGET(b->soundentry), FALSE); 1864 gtk_widget_set_sensitive(GTK_WIDGET(b->soundentry), FALSE);
1865 gtk_widget_show(b->soundentry); 1865 gtk_widget_show(b->soundentry);
1866 gtk_signal_connect(GTK_OBJECT(b->sound), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), b->soundentry); 1866 g_signal_connect(GTK_OBJECT(b->sound), "clicked", G_CALLBACK(toggle_sensitive), b->soundentry);
1867 /* </pounce type="action"> */ 1867 /* </pounce type="action"> */
1868 1868
1869 b->save = gtk_check_button_new_with_label(_("Save this pounce after activation")); 1869 b->save = gtk_check_button_new_with_label(_("Save this pounce after activation"));
1870 gtk_container_set_border_width(GTK_CONTAINER(b->save), 7); 1870 gtk_container_set_border_width(GTK_CONTAINER(b->save), 7);
1871 if(edit_bp) 1871 if(edit_bp)
1886 1886
1887 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 1887 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
1888 1888
1889 button = gaim_pixbuf_button_from_stock(_("_Save"), "gtk-execute", GAIM_BUTTON_HORIZONTAL); 1889 button = gaim_pixbuf_button_from_stock(_("_Save"), "gtk-execute", GAIM_BUTTON_HORIZONTAL);
1890 gtk_size_group_add_widget(sg, button); 1890 gtk_size_group_add_widget(sg, button);
1891 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_new_bp), b); 1891 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(do_new_bp), b);
1892 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); 1892 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
1893 gtk_widget_show(button); 1893 gtk_widget_show(button);
1894 1894
1895 button = gaim_pixbuf_button_from_stock(_("C_ancel"), "gtk-cancel", GAIM_BUTTON_HORIZONTAL); 1895 button = gaim_pixbuf_button_from_stock(_("C_ancel"), "gtk-cancel", GAIM_BUTTON_HORIZONTAL);
1896 gtk_size_group_add_widget(sg, button); 1896 gtk_size_group_add_widget(sg, button);
1897 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window); 1897 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(destroy_dialog), b->window);
1898 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); 1898 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
1899 gtk_widget_show(button); 1899 gtk_widget_show(button);
1900 1900
1901 1901
1902 gtk_widget_show(b->window); 1902 gtk_widget_show(b->window);
1962 GAIM_DIALOG(b->window); 1962 GAIM_DIALOG(b->window);
1963 dialogwindows = g_list_prepend(dialogwindows, b->window); 1963 dialogwindows = g_list_prepend(dialogwindows, b->window);
1964 gtk_window_set_role(GTK_WINDOW(b->window), "set_dir"); 1964 gtk_window_set_role(GTK_WINDOW(b->window), "set_dir");
1965 gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE); 1965 gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
1966 gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Set Dir Info")); 1966 gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Set Dir Info"));
1967 gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window); 1967 g_signal_connect(GTK_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window);
1968 gtk_widget_realize(b->window); 1968 gtk_widget_realize(b->window);
1969 1969
1970 fbox = gtk_vbox_new(FALSE, 5); 1970 fbox = gtk_vbox_new(FALSE, 5);
1971 gtk_container_add(GTK_CONTAINER(b->window), fbox); 1971 gtk_container_add(GTK_CONTAINER(b->window), fbox);
1972 gtk_widget_show(fbox); 1972 gtk_widget_show(fbox);
2095 gtk_box_pack_start(GTK_BOX(fbox), bot, FALSE, FALSE, 0); 2095 gtk_box_pack_start(GTK_BOX(fbox), bot, FALSE, FALSE, 0);
2096 gtk_widget_show(bot); 2096 gtk_widget_show(bot);
2097 2097
2098 b->save = picture_button(b->window, _("Save"), save_xpm); 2098 b->save = picture_button(b->window, _("Save"), save_xpm);
2099 gtk_box_pack_end(GTK_BOX(bot), b->save, FALSE, FALSE, 0); 2099 gtk_box_pack_end(GTK_BOX(bot), b->save, FALSE, FALSE, 0);
2100 gtk_signal_connect(GTK_OBJECT(b->save), "clicked", GTK_SIGNAL_FUNC(do_set_dir), b); 2100 g_signal_connect(GTK_OBJECT(b->save), "clicked", G_CALLBACK(do_set_dir), b);
2101 2101
2102 b->cancel = picture_button(b->window, _("Cancel"), cancel_xpm); 2102 b->cancel = picture_button(b->window, _("Cancel"), cancel_xpm);
2103 gtk_box_pack_end(GTK_BOX(bot), b->cancel, FALSE, FALSE, 0); 2103 gtk_box_pack_end(GTK_BOX(bot), b->cancel, FALSE, FALSE, 0);
2104 gtk_signal_connect(GTK_OBJECT(b->cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window); 2104 g_signal_connect(GTK_OBJECT(b->cancel), "clicked", G_CALLBACK(destroy_dialog), b->window);
2105 2105
2106 gtk_window_set_focus(GTK_WINDOW(b->window), b->first); 2106 gtk_window_set_focus(GTK_WINDOW(b->window), b->first);
2107 2107
2108 gtk_widget_show(b->window); 2108 gtk_widget_show(b->window);
2109 } 2109 }
2146 2146
2147 GAIM_DIALOG(b->window); 2147 GAIM_DIALOG(b->window);
2148 gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE); 2148 gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
2149 gtk_window_set_role(GTK_WINDOW(b->window), "change_passwd"); 2149 gtk_window_set_role(GTK_WINDOW(b->window), "change_passwd");
2150 gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Password Change")); 2150 gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Password Change"));
2151 gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window); 2151 g_signal_connect(GTK_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window);
2152 gtk_widget_realize(b->window); 2152 gtk_widget_realize(b->window);
2153 dialogwindows = g_list_prepend(dialogwindows, b->window); 2153 dialogwindows = g_list_prepend(dialogwindows, b->window);
2154 2154
2155 fbox = gtk_vbox_new(FALSE, 5); 2155 fbox = gtk_vbox_new(FALSE, 5);
2156 gtk_container_border_width(GTK_CONTAINER(fbox), 5); 2156 gtk_container_border_width(GTK_CONTAINER(fbox), 5);
2218 gtk_box_pack_start(GTK_BOX(fbox), hbox, FALSE, FALSE, 0); 2218 gtk_box_pack_start(GTK_BOX(fbox), hbox, FALSE, FALSE, 0);
2219 gtk_widget_show(hbox); 2219 gtk_widget_show(hbox);
2220 2220
2221 b->ok = picture_button(b->window, _("OK"), ok_xpm); 2221 b->ok = picture_button(b->window, _("OK"), ok_xpm);
2222 gtk_box_pack_end(GTK_BOX(hbox), b->ok, FALSE, FALSE, 0); 2222 gtk_box_pack_end(GTK_BOX(hbox), b->ok, FALSE, FALSE, 0);
2223 gtk_signal_connect(GTK_OBJECT(b->ok), "clicked", GTK_SIGNAL_FUNC(do_change_password), b); 2223 g_signal_connect(GTK_OBJECT(b->ok), "clicked", G_CALLBACK(do_change_password), b);
2224 2224
2225 b->cancel = picture_button(b->window, _("Cancel"), cancel_xpm); 2225 b->cancel = picture_button(b->window, _("Cancel"), cancel_xpm);
2226 gtk_box_pack_end(GTK_BOX(hbox), b->cancel, FALSE, FALSE, 0); 2226 gtk_box_pack_end(GTK_BOX(hbox), b->cancel, FALSE, FALSE, 0);
2227 gtk_signal_connect(GTK_OBJECT(b->cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window); 2227 g_signal_connect(GTK_OBJECT(b->cancel), "clicked", G_CALLBACK(destroy_dialog), b->window);
2228 2228
2229 gtk_widget_show(b->window); 2229 gtk_widget_show(b->window);
2230 } 2230 }
2231 2231
2232 void show_set_info(struct gaim_connection *gc) 2232 void show_set_info(struct gaim_connection *gc)
2245 2245
2246 GAIM_DIALOG(b->window); 2246 GAIM_DIALOG(b->window);
2247 gtk_window_set_role(GTK_WINDOW(b->window), "set_info"); 2247 gtk_window_set_role(GTK_WINDOW(b->window), "set_info");
2248 dialogwindows = g_list_prepend(dialogwindows, b->window); 2248 dialogwindows = g_list_prepend(dialogwindows, b->window);
2249 gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Set User Info")); 2249 gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Set User Info"));
2250 gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window); 2250 g_signal_connect(GTK_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window);
2251 gtk_widget_realize(b->window); 2251 gtk_widget_realize(b->window);
2252 2252
2253 vbox = gtk_vbox_new(FALSE, 5); 2253 vbox = gtk_vbox_new(FALSE, 5);
2254 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); 2254 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
2255 gtk_container_add(GTK_CONTAINER(b->window), vbox); 2255 gtk_container_add(GTK_CONTAINER(b->window), vbox);
2283 gtk_box_pack_start(GTK_BOX(vbox), buttons, FALSE, FALSE, 0); 2283 gtk_box_pack_start(GTK_BOX(vbox), buttons, FALSE, FALSE, 0);
2284 gtk_widget_show(buttons); 2284 gtk_widget_show(buttons);
2285 2285
2286 b->save = picture_button(b->window, _("Save"), save_xpm); 2286 b->save = picture_button(b->window, _("Save"), save_xpm);
2287 gtk_box_pack_end(GTK_BOX(buttons), b->save, FALSE, FALSE, 0); 2287 gtk_box_pack_end(GTK_BOX(buttons), b->save, FALSE, FALSE, 0);
2288 gtk_signal_connect(GTK_OBJECT(b->save), "clicked", GTK_SIGNAL_FUNC(do_save_info), b); 2288 g_signal_connect(GTK_OBJECT(b->save), "clicked", G_CALLBACK(do_save_info), b);
2289 2289
2290 b->cancel = picture_button(b->window, _("Cancel"), cancel_xpm); 2290 b->cancel = picture_button(b->window, _("Cancel"), cancel_xpm);
2291 gtk_box_pack_end(GTK_BOX(buttons), b->cancel, FALSE, FALSE, 0); 2291 gtk_box_pack_end(GTK_BOX(buttons), b->cancel, FALSE, FALSE, 0);
2292 gtk_signal_connect(GTK_OBJECT(b->cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window); 2292 g_signal_connect(GTK_OBJECT(b->cancel), "clicked", G_CALLBACK(destroy_dialog), b->window);
2293 2293
2294 gtk_widget_show(b->window); 2294 gtk_widget_show(b->window);
2295 2295
2296 } 2296 }
2297 2297
2354 2354
2355 GAIM_DIALOG(b->window); 2355 GAIM_DIALOG(b->window);
2356 gtk_window_set_title(GTK_WINDOW(b->window), "Gaim"); 2356 gtk_window_set_title(GTK_WINDOW(b->window), "Gaim");
2357 gtk_container_border_width(GTK_CONTAINER(b->window), 5); 2357 gtk_container_border_width(GTK_CONTAINER(b->window), 5);
2358 gtk_widget_realize(GTK_WIDGET(b->window)); 2358 gtk_widget_realize(GTK_WIDGET(b->window));
2359 gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(info_dlg_free), b); 2359 g_signal_connect(GTK_OBJECT(b->window), "destroy", G_CALLBACK(info_dlg_free), b);
2360 2360
2361 bbox = gtk_vbox_new(FALSE, 5); 2361 bbox = gtk_vbox_new(FALSE, 5);
2362 gtk_container_add(GTK_CONTAINER(b->window), bbox); 2362 gtk_container_add(GTK_CONTAINER(b->window), bbox);
2363 2363
2364 label = gtk_label_new(_("Below are the results of your search: ")); 2364 label = gtk_label_new(_("Below are the results of your search: "));
2375 gtk_widget_set_usize(sw, 300, 250); 2375 gtk_widget_set_usize(sw, 300, 250);
2376 gtk_imhtml_set_img_handler(GTK_IMHTML(text), info_img_handler); 2376 gtk_imhtml_set_img_handler(GTK_IMHTML(text), info_img_handler);
2377 gaim_setup_imhtml(text); 2377 gaim_setup_imhtml(text);
2378 2378
2379 ok = picture_button(b->window, _("OK"), ok_xpm); 2379 ok = picture_button(b->window, _("OK"), ok_xpm);
2380 gtk_signal_connect_object(GTK_OBJECT(ok), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), 2380 g_signal_connect_swapped(GTK_OBJECT(ok), "clicked", G_CALLBACK(gtk_widget_destroy),
2381 GTK_OBJECT(b->window)); 2381 GTK_OBJECT(b->window));
2382 gtk_box_pack_start(GTK_BOX(bbox), ok, FALSE, FALSE, 0); 2382 gtk_box_pack_start(GTK_BOX(bbox), ok, FALSE, FALSE, 0);
2383 2383
2384 gtk_widget_show_all(b->window); 2384 gtk_widget_show_all(b->window);
2385 } 2385 }
2519 topbox=gtk_hbox_new(FALSE, 5); 2519 topbox=gtk_hbox_new(FALSE, 5);
2520 gtk_box_pack_start(GTK_BOX(topbox), vbox, FALSE, FALSE, 5); 2520 gtk_box_pack_start(GTK_BOX(topbox), vbox, FALSE, FALSE, 5);
2521 2521
2522 2522
2523 /* Handle closes right */ 2523 /* Handle closes right */
2524 gtk_signal_connect(GTK_OBJECT(p->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), p->window); 2524 g_signal_connect(GTK_OBJECT(p->window), "destroy", G_CALLBACK(destroy_dialog), p->window);
2525 gtk_signal_connect(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), p->window); 2525 g_signal_connect(GTK_OBJECT(cancel), "clicked", G_CALLBACK(destroy_dialog), p->window);
2526 gtk_signal_connect(GTK_OBJECT(add), "clicked", GTK_SIGNAL_FUNC(do_add_perm), p); 2526 g_signal_connect(GTK_OBJECT(add), "clicked", G_CALLBACK(do_add_perm), p);
2527 gtk_signal_connect(GTK_OBJECT(p->entry), "activate", GTK_SIGNAL_FUNC(do_add_perm), p); 2527 g_signal_connect(GTK_OBJECT(p->entry), "activate", G_CALLBACK(do_add_perm), p);
2528 2528
2529 /* Finish up */ 2529 /* Finish up */
2530 gtk_widget_show(add); 2530 gtk_widget_show(add);
2531 gtk_widget_show(cancel); 2531 gtk_widget_show(cancel);
2532 gtk_widget_show(p->entry); 2532 gtk_widget_show(p->entry);
2600 gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(c->log_dialog)); 2600 gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(c->log_dialog));
2601 2601
2602 g_snprintf(buf, BUF_LEN - 1, "%s" G_DIR_SEPARATOR_S "%s.log", gaim_home_dir(), normalize(c->name)); 2602 g_snprintf(buf, BUF_LEN - 1, "%s" G_DIR_SEPARATOR_S "%s.log", gaim_home_dir(), normalize(c->name));
2603 gtk_object_set_user_data(GTK_OBJECT(c->log_dialog), "log dialog"); 2603 gtk_object_set_user_data(GTK_OBJECT(c->log_dialog), "log dialog");
2604 gtk_file_selection_set_filename(GTK_FILE_SELECTION(c->log_dialog), buf); 2604 gtk_file_selection_set_filename(GTK_FILE_SELECTION(c->log_dialog), buf);
2605 gtk_signal_connect(GTK_OBJECT(c->log_dialog), "delete_event", 2605 g_signal_connect(GTK_OBJECT(c->log_dialog), "delete_event",
2606 GTK_SIGNAL_FUNC(delete_event_dialog), c); 2606 G_CALLBACK(delete_event_dialog), c);
2607 gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(c->log_dialog)->ok_button), "clicked", 2607 g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(c->log_dialog)->ok_button), "clicked",
2608 GTK_SIGNAL_FUNC(do_log), c); 2608 G_CALLBACK(do_log), c);
2609 gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(c->log_dialog)->cancel_button), 2609 g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(c->log_dialog)->cancel_button),
2610 "clicked", GTK_SIGNAL_FUNC(cancel_log), c); 2610 "clicked", G_CALLBACK(cancel_log), c);
2611 } 2611 }
2612 2612
2613 g_free(buf); 2613 g_free(buf);
2614 2614
2615 gtk_widget_show(c->log_dialog); 2615 gtk_widget_show(c->log_dialog);
2781 2781
2782 gtk_container_add(GTK_CONTAINER(frame), vbox); 2782 gtk_container_add(GTK_CONTAINER(frame), vbox);
2783 gtk_box_pack_start(GTK_BOX(fbox), frame, FALSE, FALSE, 0); 2783 gtk_box_pack_start(GTK_BOX(fbox), frame, FALSE, FALSE, 0);
2784 gtk_box_pack_start(GTK_BOX(fbox), bbox, FALSE, FALSE, 0); 2784 gtk_box_pack_start(GTK_BOX(fbox), bbox, FALSE, FALSE, 0);
2785 2785
2786 gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window); 2786 g_signal_connect(GTK_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window);
2787 gtk_signal_connect(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window); 2787 g_signal_connect(GTK_OBJECT(cancel), "clicked", G_CALLBACK(destroy_dialog), b->window);
2788 gtk_signal_connect(GTK_OBJECT(ok), "clicked", GTK_SIGNAL_FUNC(do_find_info), b); 2788 g_signal_connect(GTK_OBJECT(ok), "clicked", G_CALLBACK(do_find_info), b);
2789 2789
2790 gtk_widget_show(ok); 2790 gtk_widget_show(ok);
2791 gtk_widget_show(cancel); 2791 gtk_widget_show(cancel);
2792 gtk_widget_show(b->firstentry); 2792 gtk_widget_show(b->firstentry);
2793 gtk_widget_show(b->middleentry); 2793 gtk_widget_show(b->middleentry);
2825 GAIM_DIALOG(b->window); 2825 GAIM_DIALOG(b->window);
2826 gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE); 2826 gtk_window_set_policy(GTK_WINDOW(b->window), FALSE, TRUE, TRUE);
2827 gtk_window_set_role(GTK_WINDOW(b->window), "find_email"); 2827 gtk_window_set_role(GTK_WINDOW(b->window), "find_email");
2828 gtk_widget_realize(b->window); 2828 gtk_widget_realize(b->window);
2829 dialogwindows = g_list_prepend(dialogwindows, b->window); 2829 dialogwindows = g_list_prepend(dialogwindows, b->window);
2830 gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), b->window); 2830 g_signal_connect(GTK_OBJECT(b->window), "destroy", G_CALLBACK(destroy_dialog), b->window);
2831 gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Find Buddy By Email")); 2831 gtk_window_set_title(GTK_WINDOW(b->window), _("Gaim - Find Buddy By Email"));
2832 2832
2833 vbox = gtk_vbox_new(FALSE, 5); 2833 vbox = gtk_vbox_new(FALSE, 5);
2834 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); 2834 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
2835 gtk_container_add(GTK_CONTAINER(b->window), vbox); 2835 gtk_container_add(GTK_CONTAINER(b->window), vbox);
2844 label = gtk_label_new(_("Email")); 2844 label = gtk_label_new(_("Email"));
2845 gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 0); 2845 gtk_box_pack_start(GTK_BOX(topbox), label, FALSE, FALSE, 0);
2846 2846
2847 b->emailentry = gtk_entry_new(); 2847 b->emailentry = gtk_entry_new();
2848 gtk_box_pack_start(GTK_BOX(topbox), b->emailentry, TRUE, TRUE, 0); 2848 gtk_box_pack_start(GTK_BOX(topbox), b->emailentry, TRUE, TRUE, 0);
2849 gtk_signal_connect(GTK_OBJECT(b->emailentry), "activate", GTK_SIGNAL_FUNC(do_find_email), b); 2849 g_signal_connect(GTK_OBJECT(b->emailentry), "activate", G_CALLBACK(do_find_email), b);
2850 gtk_window_set_focus(GTK_WINDOW(b->window), b->emailentry); 2850 gtk_window_set_focus(GTK_WINDOW(b->window), b->emailentry);
2851 2851
2852 bbox = gtk_hbox_new(FALSE, 5); 2852 bbox = gtk_hbox_new(FALSE, 5);
2853 gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); 2853 gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
2854 2854
2855 button = picture_button(b->window, _("OK"), ok_xpm); 2855 button = picture_button(b->window, _("OK"), ok_xpm);
2856 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_find_email), b); 2856 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(do_find_email), b);
2857 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); 2857 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
2858 2858
2859 button = picture_button(b->window, _("Cancel"), cancel_xpm); 2859 button = picture_button(b->window, _("Cancel"), cancel_xpm);
2860 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), b->window); 2860 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(destroy_dialog), b->window);
2861 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); 2861 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
2862 2862
2863 gtk_widget_show_all(b->window); 2863 gtk_widget_show_all(b->window);
2864 } 2864 }
2865 2865
2959 gtk_container_add(GTK_CONTAINER(frame), vbox); 2959 gtk_container_add(GTK_CONTAINER(frame), vbox);
2960 gtk_box_pack_start(GTK_BOX(fbox), frame, FALSE, FALSE, 5); 2960 gtk_box_pack_start(GTK_BOX(fbox), frame, FALSE, FALSE, 5);
2961 gtk_box_pack_start(GTK_BOX(fbox), bbox, TRUE, TRUE, 5); 2961 gtk_box_pack_start(GTK_BOX(fbox), bbox, TRUE, TRUE, 5);
2962 gtk_widget_show(vbox); 2962 gtk_widget_show(vbox);
2963 2963
2964 gtk_signal_connect(GTK_OBJECT(c->link_dialog), "destroy", 2964 g_signal_connect(GTK_OBJECT(c->link_dialog), "destroy",
2965 GTK_SIGNAL_FUNC(cancel_link), c); 2965 G_CALLBACK(cancel_link), c);
2966 gtk_signal_connect(GTK_OBJECT(b->cancel), "clicked", GTK_SIGNAL_FUNC(cancel_link), c); 2966 g_signal_connect(GTK_OBJECT(b->cancel), "clicked", G_CALLBACK(cancel_link), c);
2967 gtk_signal_connect(GTK_OBJECT(b->ok), "clicked", GTK_SIGNAL_FUNC(do_add_link), b); 2967 g_signal_connect(GTK_OBJECT(b->ok), "clicked", G_CALLBACK(do_add_link), b);
2968 2968
2969 gtk_container_add(GTK_CONTAINER(c->link_dialog), fbox); 2969 gtk_container_add(GTK_CONTAINER(c->link_dialog), fbox);
2970 gtk_container_border_width(GTK_CONTAINER(c->link_dialog), 10); 2970 gtk_container_border_width(GTK_CONTAINER(c->link_dialog), 10);
2971 gtk_window_set_title(GTK_WINDOW(c->link_dialog), _("Gaim - Add URL")); 2971 gtk_window_set_title(GTK_WINDOW(c->link_dialog), _("Gaim - Add URL"));
2972 gtk_window_set_focus(GTK_WINDOW(c->link_dialog), b->url); 2972 gtk_window_set_focus(GTK_WINDOW(c->link_dialog), b->url);
3080 fgclr[2] = (gdouble)(fgcolor.blue) / 255; 3080 fgclr[2] = (gdouble)(fgcolor.blue) / 255;
3081 3081
3082 fgcseld = gtk_color_selection_dialog_new(_("Select Text Color")); 3082 fgcseld = gtk_color_selection_dialog_new(_("Select Text Color"));
3083 gtk_color_selection_set_color(GTK_COLOR_SELECTION 3083 gtk_color_selection_set_color(GTK_COLOR_SELECTION
3084 (GTK_COLOR_SELECTION_DIALOG(fgcseld)->colorsel), fgclr); 3084 (GTK_COLOR_SELECTION_DIALOG(fgcseld)->colorsel), fgclr);
3085 gtk_signal_connect(GTK_OBJECT(fgcseld), "delete_event", 3085 g_signal_connect(GTK_OBJECT(fgcseld), "delete_event",
3086 GTK_SIGNAL_FUNC(destroy_colorsel), (void *)1); 3086 G_CALLBACK(destroy_colorsel), (void *)1);
3087 gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(fgcseld)->cancel_button), 3087 g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(fgcseld)->cancel_button),
3088 "clicked", GTK_SIGNAL_FUNC(destroy_colorsel), (void *)1); 3088 "clicked", G_CALLBACK(destroy_colorsel), (void *)1);
3089 gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(fgcseld)->ok_button), "clicked", 3089 g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(fgcseld)->ok_button), "clicked",
3090 GTK_SIGNAL_FUNC(apply_color_dlg), (void *)1); 3090 G_CALLBACK(apply_color_dlg), (void *)1);
3091 gtk_widget_realize(fgcseld); 3091 gtk_widget_realize(fgcseld);
3092 gtk_widget_show(fgcseld); 3092 gtk_widget_show(fgcseld);
3093 gdk_window_raise(fgcseld->window); 3093 gdk_window_raise(fgcseld->window);
3094 return; 3094 return;
3095 } 3095 }
3102 c->fg_color_dialog = gtk_color_selection_dialog_new(_("Select Text Color")); 3102 c->fg_color_dialog = gtk_color_selection_dialog_new(_("Select Text Color"));
3103 colorsel = GTK_COLOR_SELECTION_DIALOG(c->fg_color_dialog)->colorsel; 3103 colorsel = GTK_COLOR_SELECTION_DIALOG(c->fg_color_dialog)->colorsel;
3104 gtk_color_selection_set_color(GTK_COLOR_SELECTION(colorsel), fgclr); 3104 gtk_color_selection_set_color(GTK_COLOR_SELECTION(colorsel), fgclr);
3105 gtk_object_set_user_data(GTK_OBJECT(colorsel), c); 3105 gtk_object_set_user_data(GTK_OBJECT(colorsel), c);
3106 3106
3107 gtk_signal_connect(GTK_OBJECT(c->fg_color_dialog), "delete_event", 3107 g_signal_connect(GTK_OBJECT(c->fg_color_dialog), "delete_event",
3108 GTK_SIGNAL_FUNC(delete_event_dialog), c); 3108 G_CALLBACK(delete_event_dialog), c);
3109 gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(c->fg_color_dialog)->ok_button), 3109 g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(c->fg_color_dialog)->ok_button),
3110 "clicked", GTK_SIGNAL_FUNC(do_fgcolor), colorsel); 3110 "clicked", G_CALLBACK(do_fgcolor), colorsel);
3111 gtk_signal_connect(GTK_OBJECT 3111 g_signal_connect(GTK_OBJECT
3112 (GTK_COLOR_SELECTION_DIALOG(c->fg_color_dialog)->cancel_button), 3112 (GTK_COLOR_SELECTION_DIALOG(c->fg_color_dialog)->cancel_button),
3113 "clicked", GTK_SIGNAL_FUNC(cancel_fgcolor), c); 3113 "clicked", G_CALLBACK(cancel_fgcolor), c);
3114 3114
3115 gtk_widget_realize(c->fg_color_dialog); 3115 gtk_widget_realize(c->fg_color_dialog);
3116 } 3116 }
3117 3117
3118 gtk_widget_show(c->fg_color_dialog); 3118 gtk_widget_show(c->fg_color_dialog);
3132 bgclr[2] = (gdouble)(bgcolor.blue) / 255; 3132 bgclr[2] = (gdouble)(bgcolor.blue) / 255;
3133 3133
3134 bgcseld = gtk_color_selection_dialog_new(_("Select Background Color")); 3134 bgcseld = gtk_color_selection_dialog_new(_("Select Background Color"));
3135 gtk_color_selection_set_color(GTK_COLOR_SELECTION 3135 gtk_color_selection_set_color(GTK_COLOR_SELECTION
3136 (GTK_COLOR_SELECTION_DIALOG(bgcseld)->colorsel), bgclr); 3136 (GTK_COLOR_SELECTION_DIALOG(bgcseld)->colorsel), bgclr);
3137 gtk_signal_connect(GTK_OBJECT(bgcseld), "delete_event", 3137 g_signal_connect(GTK_OBJECT(bgcseld), "delete_event",
3138 GTK_SIGNAL_FUNC(destroy_colorsel), NULL); 3138 G_CALLBACK(destroy_colorsel), NULL);
3139 gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(bgcseld)->cancel_button), 3139 g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(bgcseld)->cancel_button),
3140 "clicked", GTK_SIGNAL_FUNC(destroy_colorsel), NULL); 3140 "clicked", G_CALLBACK(destroy_colorsel), NULL);
3141 gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(bgcseld)->ok_button), "clicked", 3141 g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(bgcseld)->ok_button), "clicked",
3142 GTK_SIGNAL_FUNC(apply_color_dlg), (void *)2); 3142 G_CALLBACK(apply_color_dlg), (void *)2);
3143 gtk_widget_realize(bgcseld); 3143 gtk_widget_realize(bgcseld);
3144 gtk_widget_show(bgcseld); 3144 gtk_widget_show(bgcseld);
3145 gdk_window_raise(bgcseld->window); 3145 gdk_window_raise(bgcseld->window);
3146 return; 3146 return;
3147 } 3147 }
3154 c->bg_color_dialog = gtk_color_selection_dialog_new(_("Select Background Color")); 3154 c->bg_color_dialog = gtk_color_selection_dialog_new(_("Select Background Color"));
3155 colorsel = GTK_COLOR_SELECTION_DIALOG(c->bg_color_dialog)->colorsel; 3155 colorsel = GTK_COLOR_SELECTION_DIALOG(c->bg_color_dialog)->colorsel;
3156 gtk_color_selection_set_color(GTK_COLOR_SELECTION(colorsel), bgclr); 3156 gtk_color_selection_set_color(GTK_COLOR_SELECTION(colorsel), bgclr);
3157 gtk_object_set_user_data(GTK_OBJECT(colorsel), c); 3157 gtk_object_set_user_data(GTK_OBJECT(colorsel), c);
3158 3158
3159 gtk_signal_connect(GTK_OBJECT(c->bg_color_dialog), "delete_event", 3159 g_signal_connect(GTK_OBJECT(c->bg_color_dialog), "delete_event",
3160 GTK_SIGNAL_FUNC(delete_event_dialog), c); 3160 G_CALLBACK(delete_event_dialog), c);
3161 gtk_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(c->bg_color_dialog)->ok_button), 3161 g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(c->bg_color_dialog)->ok_button),
3162 "clicked", GTK_SIGNAL_FUNC(do_bgcolor), colorsel); 3162 "clicked", G_CALLBACK(do_bgcolor), colorsel);
3163 gtk_signal_connect(GTK_OBJECT 3163 g_signal_connect(GTK_OBJECT
3164 (GTK_COLOR_SELECTION_DIALOG(c->bg_color_dialog)->cancel_button), 3164 (GTK_COLOR_SELECTION_DIALOG(c->bg_color_dialog)->cancel_button),
3165 "clicked", GTK_SIGNAL_FUNC(cancel_bgcolor), c); 3165 "clicked", G_CALLBACK(cancel_bgcolor), c);
3166 3166
3167 gtk_widget_realize(c->bg_color_dialog); 3167 gtk_widget_realize(c->bg_color_dialog);
3168 } 3168 }
3169 3169
3170 gtk_widget_show(c->bg_color_dialog); 3170 gtk_widget_show(c->bg_color_dialog);
3235 gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(fontseld), 3235 gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(fontseld),
3236 DEFAULT_FONT_FACE " 12"); 3236 DEFAULT_FONT_FACE " 12");
3237 } 3237 }
3238 3238
3239 gtk_object_set_user_data(GTK_OBJECT(fontseld), NULL); 3239 gtk_object_set_user_data(GTK_OBJECT(fontseld), NULL);
3240 gtk_signal_connect(GTK_OBJECT(fontseld), "delete_event", 3240 g_signal_connect(GTK_OBJECT(fontseld), "delete_event",
3241 GTK_SIGNAL_FUNC(destroy_fontsel), NULL); 3241 G_CALLBACK(destroy_fontsel), NULL);
3242 gtk_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(fontseld)->cancel_button), 3242 g_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(fontseld)->cancel_button),
3243 "clicked", GTK_SIGNAL_FUNC(destroy_fontsel), NULL); 3243 "clicked", G_CALLBACK(destroy_fontsel), NULL);
3244 gtk_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(fontseld)->ok_button), "clicked", 3244 g_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(fontseld)->ok_button), "clicked",
3245 GTK_SIGNAL_FUNC(apply_font_dlg), fontseld); 3245 G_CALLBACK(apply_font_dlg), fontseld);
3246 gtk_widget_realize(fontseld); 3246 gtk_widget_realize(fontseld);
3247 gtk_widget_show(fontseld); 3247 gtk_widget_show(fontseld);
3248 gdk_window_raise(fontseld->window); 3248 gdk_window_raise(fontseld->window);
3249 return; 3249 return;
3250 } 3250 }
3264 } else { 3264 } else {
3265 gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(c->font_dialog), 3265 gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(c->font_dialog),
3266 DEFAULT_FONT_FACE); 3266 DEFAULT_FONT_FACE);
3267 } 3267 }
3268 3268
3269 gtk_signal_connect(GTK_OBJECT(c->font_dialog), "delete_event", 3269 g_signal_connect(GTK_OBJECT(c->font_dialog), "delete_event",
3270 GTK_SIGNAL_FUNC(delete_event_dialog), c); 3270 G_CALLBACK(delete_event_dialog), c);
3271 gtk_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(c->font_dialog)->ok_button), 3271 g_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(c->font_dialog)->ok_button),
3272 "clicked", GTK_SIGNAL_FUNC(apply_font), c->font_dialog); 3272 "clicked", G_CALLBACK(apply_font), c->font_dialog);
3273 gtk_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(c->font_dialog)->cancel_button), 3273 g_signal_connect(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(c->font_dialog)->cancel_button),
3274 "clicked", GTK_SIGNAL_FUNC(cancel_font), c); 3274 "clicked", G_CALLBACK(cancel_font), c);
3275 3275
3276 gtk_widget_realize(c->font_dialog); 3276 gtk_widget_realize(c->font_dialog);
3277 3277
3278 } 3278 }
3279 gtk_widget_show(c->font_dialog); 3279 gtk_widget_show(c->font_dialog);
3335 3335
3336 while (g) { 3336 while (g) {
3337 c = (struct gaim_connection *)g->data; 3337 c = (struct gaim_connection *)g->data;
3338 g_snprintf(buf, sizeof buf, "%s (%s)", c->username, c->prpl->name); 3338 g_snprintf(buf, sizeof buf, "%s (%s)", c->username, c->prpl->name);
3339 opt = gtk_menu_item_new_with_label(buf); 3339 opt = gtk_menu_item_new_with_label(buf);
3340 gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(set_import_gc), c); 3340 g_signal_connect(GTK_OBJECT(opt), "activate", G_CALLBACK(set_import_gc), c);
3341 gtk_widget_show(opt); 3341 gtk_widget_show(opt);
3342 gtk_menu_append(GTK_MENU(menu), opt); 3342 gtk_menu_append(GTK_MENU(menu), opt);
3343 g = g->next; 3343 g = g->next;
3344 } 3344 }
3345 3345
3356 gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(importdialog)); 3356 gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(importdialog));
3357 3357
3358 g_snprintf(buf, BUF_LEN - 1, "%s" G_DIR_SEPARATOR_S, gaim_home_dir()); 3358 g_snprintf(buf, BUF_LEN - 1, "%s" G_DIR_SEPARATOR_S, gaim_home_dir());
3359 3359
3360 gtk_file_selection_set_filename(GTK_FILE_SELECTION(importdialog), buf); 3360 gtk_file_selection_set_filename(GTK_FILE_SELECTION(importdialog), buf);
3361 gtk_signal_connect(GTK_OBJECT(importdialog), "destroy", 3361 g_signal_connect(GTK_OBJECT(importdialog), "destroy",
3362 GTK_SIGNAL_FUNC(destroy_dialog), importdialog); 3362 G_CALLBACK(destroy_dialog), importdialog);
3363 3363
3364 gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(importdialog)->ok_button), 3364 g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(importdialog)->ok_button),
3365 "clicked", GTK_SIGNAL_FUNC(do_import_dialog), NULL); 3365 "clicked", G_CALLBACK(do_import_dialog), NULL);
3366 gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(importdialog)->cancel_button), 3366 g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(importdialog)->cancel_button),
3367 "clicked", GTK_SIGNAL_FUNC(destroy_dialog), importdialog); 3367 "clicked", G_CALLBACK(destroy_dialog), importdialog);
3368 3368
3369 create_import_dropdown(GTK_FILE_SELECTION(importdialog)); 3369 create_import_dropdown(GTK_FILE_SELECTION(importdialog));
3370 } 3370 }
3371 3371
3372 g_free(buf); 3372 g_free(buf);
3482 GAIM_DIALOG(ca->window); 3482 GAIM_DIALOG(ca->window);
3483 gtk_widget_set_usize(ca->window, -1, 250); 3483 gtk_widget_set_usize(ca->window, -1, 250);
3484 gtk_container_border_width(GTK_CONTAINER(ca->window), 5); 3484 gtk_container_border_width(GTK_CONTAINER(ca->window), 5);
3485 gtk_window_set_role(GTK_WINDOW(ca->window), "away_mess"); 3485 gtk_window_set_role(GTK_WINDOW(ca->window), "away_mess");
3486 gtk_window_set_title(GTK_WINDOW(ca->window), _("Gaim - New away message")); 3486 gtk_window_set_title(GTK_WINDOW(ca->window), _("Gaim - New away message"));
3487 gtk_signal_connect(GTK_OBJECT(ca->window), "delete_event", 3487 g_signal_connect(GTK_OBJECT(ca->window), "delete_event",
3488 GTK_SIGNAL_FUNC(destroy_dialog), ca->window); 3488 G_CALLBACK(destroy_dialog), ca->window);
3489 gtk_widget_realize(ca->window); 3489 gtk_widget_realize(ca->window);
3490 3490
3491 tbox = gtk_vbox_new(FALSE, 5); 3491 tbox = gtk_vbox_new(FALSE, 5);
3492 gtk_container_add(GTK_CONTAINER(ca->window), tbox); 3492 gtk_container_add(GTK_CONTAINER(ca->window), tbox);
3493 gtk_widget_show(tbox); 3493 gtk_widget_show(tbox);
3551 hbox = gtk_hbox_new(FALSE, 5); 3551 hbox = gtk_hbox_new(FALSE, 5);
3552 gtk_box_pack_start(GTK_BOX(tbox), hbox, FALSE, FALSE, 0); 3552 gtk_box_pack_start(GTK_BOX(tbox), hbox, FALSE, FALSE, 0);
3553 gtk_widget_show(hbox); 3553 gtk_widget_show(hbox);
3554 3554
3555 button = picture_button(ca->window, _("Save"), ok_xpm); 3555 button = picture_button(ca->window, _("Save"), ok_xpm);
3556 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(save_away_mess), ca); 3556 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(save_away_mess), ca);
3557 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); 3557 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
3558 3558
3559 button = picture_button(ca->window, _("Save & Use"), add_xpm); 3559 button = picture_button(ca->window, _("Save & Use"), add_xpm);
3560 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(su_away_mess), ca); 3560 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(su_away_mess), ca);
3561 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); 3561 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
3562 3562
3563 button = picture_button(ca->window, _("Use"), gnome_preferences_xpm); 3563 button = picture_button(ca->window, _("Use"), gnome_preferences_xpm);
3564 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(use_away_mess), ca); 3564 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(use_away_mess), ca);
3565 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); 3565 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
3566 3566
3567 button = picture_button(ca->window, _("Cancel"), cancel_xpm); 3567 button = picture_button(ca->window, _("Cancel"), cancel_xpm);
3568 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), ca->window); 3568 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(destroy_dialog), ca->window);
3569 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); 3569 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
3570 3570
3571 gtk_widget_show(ca->window); 3571 gtk_widget_show(ca->window);
3572 } 3572 }
3573 3573
3618 buf = g_build_filename(path, filename, NULL); 3618 buf = g_build_filename(path, filename, NULL);
3619 image = gtk_image_new_from_file(buf); 3619 image = gtk_image_new_from_file(buf);
3620 g_free(buf); 3620 g_free(buf);
3621 button = 3621 button =
3622 gtk_toolbar_append_item(GTK_TOOLBAR(bar), NULL, NULL, NULL, 3622 gtk_toolbar_append_item(GTK_TOOLBAR(bar), NULL, NULL, NULL,
3623 image, GTK_SIGNAL_FUNC(set_smiley), (char *)face); 3623 image, G_CALLBACK(set_smiley), (char *)face);
3624 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(insert_smiley_text), c); 3624 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(insert_smiley_text), c);
3625 3625
3626 /* these look really weird with borders */ 3626 /* these look really weird with borders */
3627 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); 3627 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
3628 } 3628 }
3629 3629
3689 gtk_container_add(GTK_CONTAINER(dialog), vbox); 3689 gtk_container_add(GTK_CONTAINER(dialog), vbox);
3690 gtk_container_set_border_width(GTK_CONTAINER(dialog), 5); 3690 gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);
3691 3691
3692 /* connect signals */ 3692 /* connect signals */
3693 gtk_object_set_user_data(GTK_OBJECT(dialog), "smiley dialog"); 3693 gtk_object_set_user_data(GTK_OBJECT(dialog), "smiley dialog");
3694 gtk_signal_connect(GTK_OBJECT(dialog), "delete_event", GTK_SIGNAL_FUNC(delete_event_dialog), c); 3694 g_signal_connect(GTK_OBJECT(dialog), "delete_event", G_CALLBACK(delete_event_dialog), c);
3695 3695
3696 /* show everything */ 3696 /* show everything */
3697 gtk_window_set_title(GTK_WINDOW(dialog), _("Smile!")); 3697 gtk_window_set_title(GTK_WINDOW(dialog), _("Smile!"));
3698 gtk_widget_show_all(dialog); 3698 gtk_widget_show_all(dialog);
3699 3699
3769 /* And the boxes in the box */ 3769 /* And the boxes in the box */
3770 gtk_box_pack_start(GTK_BOX(vbox), topbox, TRUE, TRUE, 5); 3770 gtk_box_pack_start(GTK_BOX(vbox), topbox, TRUE, TRUE, 5);
3771 gtk_box_pack_start(GTK_BOX(vbox), bbox, TRUE, TRUE, 5); 3771 gtk_box_pack_start(GTK_BOX(vbox), bbox, TRUE, TRUE, 5);
3772 3772
3773 /* Handle closes right */ 3773 /* Handle closes right */
3774 gtk_signal_connect(GTK_OBJECT(aliasdlg), "destroy", GTK_SIGNAL_FUNC(destroy_dialog), aliasdlg); 3774 g_signal_connect(GTK_OBJECT(aliasdlg), "destroy", G_CALLBACK(destroy_dialog), aliasdlg);
3775 gtk_signal_connect(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), aliasdlg); 3775 g_signal_connect(GTK_OBJECT(cancel), "clicked", G_CALLBACK(destroy_dialog), aliasdlg);
3776 a = gtk_signal_connect(GTK_OBJECT(add), "clicked", GTK_SIGNAL_FUNC(do_alias_bud), b); 3776 a = g_signal_connect(GTK_OBJECT(add), "clicked", G_CALLBACK(do_alias_bud), b);
3777 c = gtk_signal_connect(GTK_OBJECT(aliasname), "activate", GTK_SIGNAL_FUNC(do_alias_bud), b); 3777 c = g_signal_connect(GTK_OBJECT(aliasname), "activate", G_CALLBACK(do_alias_bud), b);
3778 /* Finish up */ 3778 /* Finish up */
3779 gtk_widget_show(add); 3779 gtk_widget_show(add);
3780 gtk_widget_show(cancel); 3780 gtk_widget_show(cancel);
3781 gtk_widget_show(aliasentry); 3781 gtk_widget_show(aliasentry);
3782 gtk_widget_show(aliasname); 3782 gtk_widget_show(aliasname);
3851 3851
3852 g_snprintf(buf, BUF_LEN - 1, "%s" G_DIR_SEPARATOR_S "%s%s", gaim_home_dir(), 3852 g_snprintf(buf, BUF_LEN - 1, "%s" G_DIR_SEPARATOR_S "%s%s", gaim_home_dir(),
3853 name ? normalize(name) : "system", name ? ".log" : ""); 3853 name ? normalize(name) : "system", name ? ".log" : "");
3854 3854
3855 filesel = gtk_file_selection_new(_("Gaim - Save Log File")); 3855 filesel = gtk_file_selection_new(_("Gaim - Save Log File"));
3856 gtk_signal_connect(GTK_OBJECT(filesel), "delete_event", 3856 g_signal_connect(GTK_OBJECT(filesel), "delete_event",
3857 GTK_SIGNAL_FUNC(destroy_dialog), filesel); 3857 G_CALLBACK(destroy_dialog), filesel);
3858 3858
3859 gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(filesel)); 3859 gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(filesel));
3860 gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), buf); 3860 gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), buf);
3861 gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), 3861 g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button),
3862 "clicked", GTK_SIGNAL_FUNC(do_save_log), filesel); 3862 "clicked", G_CALLBACK(do_save_log), filesel);
3863 gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button), 3863 g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button),
3864 "clicked", GTK_SIGNAL_FUNC(destroy_dialog), filesel); 3864 "clicked", G_CALLBACK(destroy_dialog), filesel);
3865 gtk_object_set_user_data(GTK_OBJECT(filesel), name); 3865 gtk_object_set_user_data(GTK_OBJECT(filesel), name);
3866 3866
3867 gtk_widget_realize(filesel); 3867 gtk_widget_realize(filesel);
3868 gtk_widget_show(filesel); 3868 gtk_widget_show(filesel);
3869 3869
3901 3901
3902 GAIM_DIALOG(window); 3902 GAIM_DIALOG(window);
3903 gtk_window_set_role(GTK_WINDOW(window), "dialog"); 3903 gtk_window_set_role(GTK_WINDOW(window), "dialog");
3904 gtk_container_set_border_width(GTK_CONTAINER(window), 10); 3904 gtk_container_set_border_width(GTK_CONTAINER(window), 10);
3905 gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE); 3905 gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
3906 gtk_signal_connect(GTK_OBJECT(window), "delete_event", GTK_SIGNAL_FUNC(destroy_dialog), window); 3906 g_signal_connect(GTK_OBJECT(window), "delete_event", G_CALLBACK(destroy_dialog), window);
3907 gtk_widget_realize(window); 3907 gtk_widget_realize(window);
3908 3908
3909 box = gtk_vbox_new(FALSE, 5); 3909 box = gtk_vbox_new(FALSE, 5);
3910 gtk_container_add(GTK_CONTAINER(window), box); 3910 gtk_container_add(GTK_CONTAINER(window), box);
3911 3911
3918 hbox = gtk_hbox_new(FALSE, 0); 3918 hbox = gtk_hbox_new(FALSE, 0);
3919 gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0); 3919 gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
3920 gtk_widget_show(hbox); 3920 gtk_widget_show(hbox);
3921 3921
3922 button = picture_button(window, _("Cancel"), cancel_xpm); 3922 button = picture_button(window, _("Cancel"), cancel_xpm);
3923 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), window); 3923 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(destroy_dialog), window);
3924 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5); 3924 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5);
3925 gtk_widget_show(button); 3925 gtk_widget_show(button);
3926 3926
3927 button = picture_button(window, _("Okay"), ok_xpm); 3927 button = picture_button(window, _("Okay"), ok_xpm);
3928 gtk_object_set_user_data(GTK_OBJECT(button), gtk_object_get_user_data(GTK_OBJECT(w))); 3928 gtk_object_set_user_data(GTK_OBJECT(button), gtk_object_get_user_data(GTK_OBJECT(w)));
3929 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_clear_log_file), name); 3929 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(do_clear_log_file), name);
3930 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), window); 3930 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(destroy_dialog), window);
3931 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5); 3931 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5);
3932 gtk_widget_show(button); 3932 gtk_widget_show(button);
3933 3933
3934 gtk_widget_show_all(window); 3934 gtk_widget_show_all(window);
3935 3935
3960 return; 3960 return;
3961 } 3961 }
3962 3962
3963 gtk_widget_set_sensitive(view->bbox, FALSE); 3963 gtk_widget_set_sensitive(view->bbox, FALSE);
3964 gtk_signal_disconnect_by_func(GTK_OBJECT(view->window), 3964 gtk_signal_disconnect_by_func(GTK_OBJECT(view->window),
3965 GTK_SIGNAL_FUNC(destroy_dialog), view->window); 3965 G_CALLBACK(destroy_dialog), view->window);
3966 block = gtk_signal_connect(GTK_OBJECT(view->window), "delete_event", 3966 block = g_signal_connect(GTK_OBJECT(view->window), "delete_event",
3967 GTK_SIGNAL_FUNC(dont_destroy), view->window); 3967 G_CALLBACK(dont_destroy), view->window);
3968 3968
3969 fseek(fp, view->offset, SEEK_SET); 3969 fseek(fp, view->offset, SEEK_SET);
3970 gtk_imhtml_clear(GTK_IMHTML(view->layout)); 3970 gtk_imhtml_clear(GTK_IMHTML(view->layout));
3971 /* 3971 /*
3972 while (gtk_events_pending()) 3972 while (gtk_events_pending())
3998 gtk_imhtml_append_text(GTK_IMHTML(view->layout), string->str, -1, view->options); 3998 gtk_imhtml_append_text(GTK_IMHTML(view->layout), string->str, -1, view->options);
3999 gtk_imhtml_append_text(GTK_IMHTML(view->layout), "<BR>", -1, view->options); 3999 gtk_imhtml_append_text(GTK_IMHTML(view->layout), "<BR>", -1, view->options);
4000 4000
4001 gtk_widget_set_sensitive(view->bbox, TRUE); 4001 gtk_widget_set_sensitive(view->bbox, TRUE);
4002 gtk_signal_disconnect(GTK_OBJECT(view->window), block); 4002 gtk_signal_disconnect(GTK_OBJECT(view->window), block);
4003 gtk_signal_connect(GTK_OBJECT(view->window), "delete_event", 4003 g_signal_connect(GTK_OBJECT(view->window), "delete_event",
4004 GTK_SIGNAL_FUNC(destroy_dialog), view->window); 4004 G_CALLBACK(destroy_dialog), view->window);
4005 g_string_free(string, TRUE); 4005 g_string_free(string, TRUE);
4006 fclose(fp); 4006 fclose(fp);
4007 } 4007 }
4008 4008
4009 static void des_view_item(GtkObject *obj, struct view_log *view) 4009 static void des_view_item(GtkObject *obj, struct view_log *view)
4070 if (convo_options & OPT_CONVO_IGNORE_SIZES) 4070 if (convo_options & OPT_CONVO_IGNORE_SIZES)
4071 options ^= GTK_IMHTML_NO_SIZES; 4071 options ^= GTK_IMHTML_NO_SIZES;
4072 4072
4073 window = gtk_window_new(GTK_WINDOW_TOPLEVEL); 4073 window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
4074 gtk_object_set_user_data(GTK_OBJECT(window), name); 4074 gtk_object_set_user_data(GTK_OBJECT(window), name);
4075 gtk_signal_connect(GTK_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(des_log_win), NULL); 4075 g_signal_connect(GTK_OBJECT(window), "destroy", G_CALLBACK(des_log_win), NULL);
4076 gtk_window_set_role(GTK_WINDOW(window), "log"); 4076 gtk_window_set_role(GTK_WINDOW(window), "log");
4077 if (name) 4077 if (name)
4078 g_snprintf(buf, BUF_LONG, "Gaim - Conversations with %s", name); 4078 g_snprintf(buf, BUF_LONG, "Gaim - Conversations with %s", name);
4079 else 4079 else
4080 g_snprintf(buf, BUF_LONG, "Gaim - System Log"); 4080 g_snprintf(buf, BUF_LONG, "Gaim - System Log");
4081 gtk_window_set_title(GTK_WINDOW(window), buf); 4081 gtk_window_set_title(GTK_WINDOW(window), buf);
4082 gtk_container_set_border_width(GTK_CONTAINER(window), 10); 4082 gtk_container_set_border_width(GTK_CONTAINER(window), 10);
4083 gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE); 4083 gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
4084 block = gtk_signal_connect(GTK_OBJECT(window), "delete_event", 4084 block = g_signal_connect(GTK_OBJECT(window), "delete_event",
4085 GTK_SIGNAL_FUNC(dont_destroy), window); 4085 G_CALLBACK(dont_destroy), window);
4086 gtk_widget_realize(window); 4086 gtk_widget_realize(window);
4087 4087
4088 layout = gtk_imhtml_new(NULL, NULL); 4088 layout = gtk_imhtml_new(NULL, NULL);
4089 bbox = gtk_hbox_new(FALSE, 0); 4089 bbox = gtk_hbox_new(FALSE, 0);
4090 4090
4144 view->offset = offset; 4144 view->offset = offset;
4145 view->name = g_strdup(name); 4145 view->name = g_strdup(name);
4146 view->bbox = bbox; 4146 view->bbox = bbox;
4147 view->window = window; 4147 view->window = window;
4148 view->layout = layout; 4148 view->layout = layout;
4149 gtk_signal_connect(GTK_OBJECT(item), "select", 4149 g_signal_connect(GTK_OBJECT(item), "select",
4150 GTK_SIGNAL_FUNC(log_show_convo), view); 4150 G_CALLBACK(log_show_convo), view);
4151 gtk_signal_connect(GTK_OBJECT(item), "destroy", 4151 g_signal_connect(GTK_OBJECT(item), "destroy",
4152 GTK_SIGNAL_FUNC(des_view_item), view); 4152 G_CALLBACK(des_view_item), view);
4153 last = item; 4153 last = item;
4154 item_list = g_list_append(item_list, item); 4154 item_list = g_list_append(item_list, item);
4155 4155
4156 gtk_widget_show(item); 4156 gtk_widget_show(item);
4157 } 4157 }
4164 if (item_list) 4164 if (item_list)
4165 gtk_list_insert_items(GTK_LIST(list), item_list, 0 ); 4165 gtk_list_insert_items(GTK_LIST(list), item_list, 0 );
4166 } 4166 }
4167 4167
4168 gtk_signal_disconnect(GTK_OBJECT(window), block); 4168 gtk_signal_disconnect(GTK_OBJECT(window), block);
4169 gtk_signal_connect(GTK_OBJECT(window), "delete_event", GTK_SIGNAL_FUNC(destroy_dialog), window); 4169 g_signal_connect(GTK_OBJECT(window), "delete_event", G_CALLBACK(destroy_dialog), window);
4170 4170
4171 frame = gtk_frame_new(_("Conversation")); 4171 frame = gtk_frame_new(_("Conversation"));
4172 gtk_widget_show(frame); 4172 gtk_widget_show(frame);
4173 4173
4174 sw = gtk_scrolled_window_new(NULL, NULL); 4174 sw = gtk_scrolled_window_new(NULL, NULL);
4176 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); 4176 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
4177 gtk_widget_set_usize(sw, 390, 220); 4177 gtk_widget_set_usize(sw, 390, 220);
4178 gtk_container_add(GTK_CONTAINER(frame), sw); 4178 gtk_container_add(GTK_CONTAINER(frame), sw);
4179 gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, 0); 4179 gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, 0);
4180 4180
4181 gtk_signal_connect(GTK_OBJECT(layout), "url_clicked", GTK_SIGNAL_FUNC(open_url), NULL); 4181 g_signal_connect(GTK_OBJECT(layout), "url_clicked", G_CALLBACK(open_url), NULL);
4182 gtk_container_add(GTK_CONTAINER(sw), layout); 4182 gtk_container_add(GTK_CONTAINER(sw), layout);
4183 gaim_setup_imhtml(layout); 4183 gaim_setup_imhtml(layout);
4184 4184
4185 gtk_box_pack_start(GTK_BOX(box), bbox, FALSE, FALSE, 0); 4185 gtk_box_pack_start(GTK_BOX(box), bbox, FALSE, FALSE, 0);
4186 gtk_widget_set_sensitive(bbox, FALSE); 4186 gtk_widget_set_sensitive(bbox, FALSE);
4187 4187
4188 close_button = picture_button(window, _("Close"), cancel_xpm); 4188 close_button = picture_button(window, _("Close"), cancel_xpm);
4189 gtk_box_pack_end(GTK_BOX(bbox), close_button, FALSE, FALSE, 5); 4189 gtk_box_pack_end(GTK_BOX(bbox), close_button, FALSE, FALSE, 5);
4190 gtk_signal_connect(GTK_OBJECT(close_button), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), window); 4190 g_signal_connect(GTK_OBJECT(close_button), "clicked", G_CALLBACK(destroy_dialog), window);
4191 4191
4192 clear_button = picture_button(window, _("Clear"), close_xpm); 4192 clear_button = picture_button(window, _("Clear"), close_xpm);
4193 gtk_object_set_user_data(GTK_OBJECT(clear_button), window); 4193 gtk_object_set_user_data(GTK_OBJECT(clear_button), window);
4194 gtk_box_pack_end(GTK_BOX(bbox), clear_button, FALSE, FALSE, 5); 4194 gtk_box_pack_end(GTK_BOX(bbox), clear_button, FALSE, FALSE, 5);
4195 gtk_signal_connect(GTK_OBJECT(clear_button), "clicked", GTK_SIGNAL_FUNC(show_clear_log), name); 4195 g_signal_connect(GTK_OBJECT(clear_button), "clicked", G_CALLBACK(show_clear_log), name);
4196 4196
4197 save_button = picture_button(window, _("Save"), save_xpm); 4197 save_button = picture_button(window, _("Save"), save_xpm);
4198 gtk_box_pack_end(GTK_BOX(bbox), save_button, FALSE, FALSE, 5); 4198 gtk_box_pack_end(GTK_BOX(bbox), save_button, FALSE, FALSE, 5);
4199 gtk_signal_connect(GTK_OBJECT(save_button), "clicked", GTK_SIGNAL_FUNC(show_save_log), name); 4199 g_signal_connect(GTK_OBJECT(save_button), "clicked", G_CALLBACK(show_save_log), name);
4200 4200
4201 gtk_widget_show_all(window); 4201 gtk_widget_show_all(window);
4202 4202
4203 if (!name) { 4203 if (!name) {
4204 view = g_new0(struct view_log, 1); 4204 view = g_new0(struct view_log, 1);
4206 view->name = NULL; 4206 view->name = NULL;
4207 view->bbox = bbox; 4207 view->bbox = bbox;
4208 view->window = window; 4208 view->window = window;
4209 view->layout = layout; 4209 view->layout = layout;
4210 log_show_convo(layout, view); 4210 log_show_convo(layout, view);
4211 gtk_signal_connect(GTK_OBJECT(layout), "destroy", GTK_SIGNAL_FUNC(des_view_item), view); 4211 g_signal_connect(GTK_OBJECT(layout), "destroy", G_CALLBACK(des_view_item), view);
4212 } else { 4212 } else {
4213 gtk_list_select_item(GTK_LIST(list), 0); 4213 gtk_list_select_item(GTK_LIST(list), 0);
4214 } 4214 }
4215 4215
4216 gtk_widget_set_sensitive(bbox, TRUE); 4216 gtk_widget_set_sensitive(bbox, TRUE);
4270 if (!rename_dialog) { 4270 if (!rename_dialog) {
4271 GAIM_DIALOG(rename_dialog); 4271 GAIM_DIALOG(rename_dialog);
4272 gtk_window_set_role(GTK_WINDOW(rename_dialog), "rename_dialog"); 4272 gtk_window_set_role(GTK_WINDOW(rename_dialog), "rename_dialog");
4273 gtk_window_set_policy(GTK_WINDOW(rename_dialog), FALSE, TRUE, TRUE); 4273 gtk_window_set_policy(GTK_WINDOW(rename_dialog), FALSE, TRUE, TRUE);
4274 gtk_window_set_title(GTK_WINDOW(rename_dialog), _("Gaim - Rename Group")); 4274 gtk_window_set_title(GTK_WINDOW(rename_dialog), _("Gaim - Rename Group"));
4275 gtk_signal_connect(GTK_OBJECT(rename_dialog), "destroy", 4275 g_signal_connect(GTK_OBJECT(rename_dialog), "destroy",
4276 GTK_SIGNAL_FUNC(destroy_dialog), rename_dialog); 4276 G_CALLBACK(destroy_dialog), rename_dialog);
4277 gtk_widget_realize(rename_dialog); 4277 gtk_widget_realize(rename_dialog);
4278 4278
4279 mainbox = gtk_vbox_new(FALSE, 5); 4279 mainbox = gtk_vbox_new(FALSE, 5);
4280 gtk_container_set_border_width(GTK_CONTAINER(mainbox), 5); 4280 gtk_container_set_border_width(GTK_CONTAINER(mainbox), 5);
4281 gtk_container_add(GTK_CONTAINER(rename_dialog), mainbox); 4281 gtk_container_add(GTK_CONTAINER(rename_dialog), mainbox);
4292 4292
4293 name_entry = gtk_entry_new(); 4293 name_entry = gtk_entry_new();
4294 gtk_box_pack_start(GTK_BOX(fbox), name_entry, TRUE, TRUE, 0); 4294 gtk_box_pack_start(GTK_BOX(fbox), name_entry, TRUE, TRUE, 0);
4295 gtk_object_set_user_data(GTK_OBJECT(name_entry), g); 4295 gtk_object_set_user_data(GTK_OBJECT(name_entry), g);
4296 gtk_entry_set_text(GTK_ENTRY(name_entry), g->name); 4296 gtk_entry_set_text(GTK_ENTRY(name_entry), g->name);
4297 gtk_signal_connect(GTK_OBJECT(name_entry), "activate", 4297 g_signal_connect(GTK_OBJECT(name_entry), "activate",
4298 GTK_SIGNAL_FUNC(do_rename_group), name_entry); 4298 G_CALLBACK(do_rename_group), name_entry);
4299 gtk_widget_grab_focus(name_entry); 4299 gtk_widget_grab_focus(name_entry);
4300 4300
4301 bbox = gtk_hbox_new(FALSE, 5); 4301 bbox = gtk_hbox_new(FALSE, 5);
4302 gtk_box_pack_start(GTK_BOX(mainbox), bbox, FALSE, FALSE, 0); 4302 gtk_box_pack_start(GTK_BOX(mainbox), bbox, FALSE, FALSE, 0);
4303 4303
4304 button = picture_button(rename_dialog, _("Cancel"), cancel_xpm); 4304 button = picture_button(rename_dialog, _("Cancel"), cancel_xpm);
4305 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); 4305 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
4306 gtk_signal_connect(GTK_OBJECT(button), "clicked", 4306 g_signal_connect(GTK_OBJECT(button), "clicked",
4307 GTK_SIGNAL_FUNC(destroy_dialog), rename_dialog); 4307 G_CALLBACK(destroy_dialog), rename_dialog);
4308 4308
4309 button = picture_button(rename_dialog, _("OK"), ok_xpm); 4309 button = picture_button(rename_dialog, _("OK"), ok_xpm);
4310 gtk_object_set_user_data(GTK_OBJECT(button), g); 4310 gtk_object_set_user_data(GTK_OBJECT(button), g);
4311 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); 4311 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
4312 gtk_signal_connect(GTK_OBJECT(button), "clicked", 4312 g_signal_connect(GTK_OBJECT(button), "clicked",
4313 GTK_SIGNAL_FUNC(do_rename_group), name_entry); 4313 G_CALLBACK(do_rename_group), name_entry);
4314 } 4314 }
4315 4315
4316 gtk_widget_show_all(rename_dialog); 4316 gtk_widget_show_all(rename_dialog);
4317 } 4317 }
4318 4318
4375 if (!rename_bud_dialog) { 4375 if (!rename_bud_dialog) {
4376 GAIM_DIALOG(rename_bud_dialog); 4376 GAIM_DIALOG(rename_bud_dialog);
4377 gtk_window_set_role(GTK_WINDOW(rename_bud_dialog), "rename_bud_dialog"); 4377 gtk_window_set_role(GTK_WINDOW(rename_bud_dialog), "rename_bud_dialog");
4378 gtk_window_set_policy(GTK_WINDOW(rename_bud_dialog), FALSE, TRUE, TRUE); 4378 gtk_window_set_policy(GTK_WINDOW(rename_bud_dialog), FALSE, TRUE, TRUE);
4379 gtk_window_set_title(GTK_WINDOW(rename_bud_dialog), _("Gaim - Rename Buddy")); 4379 gtk_window_set_title(GTK_WINDOW(rename_bud_dialog), _("Gaim - Rename Buddy"));
4380 gtk_signal_connect(GTK_OBJECT(rename_bud_dialog), "destroy", 4380 g_signal_connect(GTK_OBJECT(rename_bud_dialog), "destroy",
4381 GTK_SIGNAL_FUNC(destroy_dialog), rename_bud_dialog); 4381 G_CALLBACK(destroy_dialog), rename_bud_dialog);
4382 gtk_widget_realize(rename_bud_dialog); 4382 gtk_widget_realize(rename_bud_dialog);
4383 4383
4384 mainbox = gtk_vbox_new(FALSE, 5); 4384 mainbox = gtk_vbox_new(FALSE, 5);
4385 gtk_container_set_border_width(GTK_CONTAINER(mainbox), 5); 4385 gtk_container_set_border_width(GTK_CONTAINER(mainbox), 5);
4386 gtk_container_add(GTK_CONTAINER(rename_bud_dialog), mainbox); 4386 gtk_container_add(GTK_CONTAINER(rename_bud_dialog), mainbox);
4397 4397
4398 name_entry = gtk_entry_new(); 4398 name_entry = gtk_entry_new();
4399 gtk_box_pack_start(GTK_BOX(fbox), name_entry, TRUE, TRUE, 0); 4399 gtk_box_pack_start(GTK_BOX(fbox), name_entry, TRUE, TRUE, 0);
4400 gtk_object_set_user_data(GTK_OBJECT(name_entry), b); 4400 gtk_object_set_user_data(GTK_OBJECT(name_entry), b);
4401 gtk_entry_set_text(GTK_ENTRY(name_entry), b->name); 4401 gtk_entry_set_text(GTK_ENTRY(name_entry), b->name);
4402 gtk_signal_connect(GTK_OBJECT(name_entry), "activate", 4402 g_signal_connect(GTK_OBJECT(name_entry), "activate",
4403 GTK_SIGNAL_FUNC(do_rename_buddy), name_entry); 4403 G_CALLBACK(do_rename_buddy), name_entry);
4404 gtk_widget_grab_focus(name_entry); 4404 gtk_widget_grab_focus(name_entry);
4405 4405
4406 bbox = gtk_hbox_new(FALSE, 5); 4406 bbox = gtk_hbox_new(FALSE, 5);
4407 gtk_box_pack_start(GTK_BOX(mainbox), bbox, FALSE, FALSE, 0); 4407 gtk_box_pack_start(GTK_BOX(mainbox), bbox, FALSE, FALSE, 0);
4408 4408
4409 button = picture_button(rename_bud_dialog, _("Cancel"), cancel_xpm); 4409 button = picture_button(rename_bud_dialog, _("Cancel"), cancel_xpm);
4410 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); 4410 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
4411 gtk_signal_connect(GTK_OBJECT(button), "clicked", 4411 g_signal_connect(GTK_OBJECT(button), "clicked",
4412 GTK_SIGNAL_FUNC(destroy_dialog), rename_bud_dialog); 4412 G_CALLBACK(destroy_dialog), rename_bud_dialog);
4413 4413
4414 button = picture_button(rename_bud_dialog, _("OK"), ok_xpm); 4414 button = picture_button(rename_bud_dialog, _("OK"), ok_xpm);
4415 gtk_object_set_user_data(GTK_OBJECT(button), b); 4415 gtk_object_set_user_data(GTK_OBJECT(button), b);
4416 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0); 4416 gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
4417 gtk_signal_connect(GTK_OBJECT(button), "clicked", 4417 g_signal_connect(GTK_OBJECT(button), "clicked",
4418 GTK_SIGNAL_FUNC(do_rename_buddy), name_entry); 4418 G_CALLBACK(do_rename_buddy), name_entry);
4419 } 4419 }
4420 4420
4421 gtk_widget_show_all(rename_bud_dialog); 4421 gtk_widget_show_all(rename_bud_dialog);
4422 } 4422 }
4423 4423
4480 buf = g_strconcat(perl_last_dir, G_DIR_SEPARATOR_S, NULL); 4480 buf = g_strconcat(perl_last_dir, G_DIR_SEPARATOR_S, NULL);
4481 } 4481 }
4482 4482
4483 gtk_file_selection_set_filename(GTK_FILE_SELECTION(perl_config), buf); 4483 gtk_file_selection_set_filename(GTK_FILE_SELECTION(perl_config), buf);
4484 gtk_file_selection_complete(GTK_FILE_SELECTION(perl_config), "*.pl"); 4484 gtk_file_selection_complete(GTK_FILE_SELECTION(perl_config), "*.pl");
4485 gtk_signal_connect(GTK_OBJECT(perl_config), "destroy", GTK_SIGNAL_FUNC(cfdes), perl_config); 4485 g_signal_connect(GTK_OBJECT(perl_config), "destroy", G_CALLBACK(cfdes), perl_config);
4486 4486
4487 gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(perl_config)->ok_button), 4487 g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(perl_config)->ok_button),
4488 "clicked", GTK_SIGNAL_FUNC(do_load), NULL); 4488 "clicked", G_CALLBACK(do_load), NULL);
4489 4489
4490 gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(perl_config)->cancel_button), 4490 g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(perl_config)->cancel_button),
4491 "clicked", GTK_SIGNAL_FUNC(cfdes), NULL); 4491 "clicked", G_CALLBACK(cfdes), NULL);
4492 4492
4493 g_free(buf); 4493 g_free(buf);
4494 gtk_widget_show(perl_config); 4494 gtk_widget_show(perl_config);
4495 gdk_window_raise(perl_config->window); 4495 gdk_window_raise(perl_config->window);
4496 } 4496 }
5119 gtk_container_set_border_width(GTK_CONTAINER(b->window), 5); 5119 gtk_container_set_border_width(GTK_CONTAINER(b->window), 5);
5120 gtk_window_set_role(GTK_WINDOW(b->window), b->role); 5120 gtk_window_set_role(GTK_WINDOW(b->window), b->role);
5121 gtk_window_set_title(GTK_WINDOW (b->window), b->title); 5121 gtk_window_set_title(GTK_WINDOW (b->window), b->title);
5122 5122
5123 /* Clean up if user dismisses window via window manager! */ 5123 /* Clean up if user dismisses window via window manager! */
5124 gtk_signal_connect(GTK_OBJECT(b->window), "destroy", GTK_SIGNAL_FUNC(b->cancel), (gpointer) b); 5124 g_signal_connect(GTK_OBJECT(b->window), "destroy", G_CALLBACK(b->cancel), (gpointer) b);
5125 gtk_widget_realize(b->window); 5125 gtk_widget_realize(b->window);
5126 5126
5127 vbox = gtk_vbox_new(FALSE, 5); 5127 vbox = gtk_vbox_new(FALSE, 5);
5128 gtk_container_add(GTK_CONTAINER (b->window), vbox); 5128 gtk_container_add(GTK_CONTAINER (b->window), vbox);
5129 5129
5149 gtk_widget_show(hbox); 5149 gtk_widget_show(hbox);
5150 5150
5151 button = picture_button(b->window, _("Cancel"), cancel_xpm); 5151 button = picture_button(b->window, _("Cancel"), cancel_xpm);
5152 5152
5153 /* Let "destroy handling" (set above) handle cleanup */ 5153 /* Let "destroy handling" (set above) handle cleanup */
5154 gtk_signal_connect_object(GTK_OBJECT (button), "clicked", 5154 g_signal_connect_swapped(GTK_OBJECT (button), "clicked",
5155 GTK_SIGNAL_FUNC (gtk_widget_destroy), GTK_OBJECT (b->window)); 5155 G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (b->window));
5156 gtk_box_pack_end(GTK_BOX (hbox), button, FALSE, FALSE, 5); 5156 gtk_box_pack_end(GTK_BOX (hbox), button, FALSE, FALSE, 5);
5157 gtk_widget_show(button); 5157 gtk_widget_show(button);
5158 5158
5159 button = picture_button(b->window, _("Save"), save_xpm); 5159 button = picture_button(b->window, _("Save"), save_xpm);
5160 gtk_signal_connect(GTK_OBJECT (button), "clicked", 5160 g_signal_connect(GTK_OBJECT (button), "clicked",
5161 GTK_SIGNAL_FUNC (b->ok), (gpointer) b); 5161 G_CALLBACK (b->ok), (gpointer) b);
5162 gtk_box_pack_end(GTK_BOX (hbox), button, FALSE, FALSE, 5); 5162 gtk_box_pack_end(GTK_BOX (hbox), button, FALSE, FALSE, 5);
5163 gtk_widget_show(button); 5163 gtk_widget_show(button);
5164 5164
5165 gtk_widget_show(vbox); 5165 gtk_widget_show(vbox);
5166 gtk_widget_show(b->window); 5166 gtk_widget_show(b->window);