Mercurial > pidgin

comparison src/buddy.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 9c31ddae80a1
children 7002b6f16bdf
comparison
equal deleted inserted replaced
4161:c79961f48063 4162:d3c8d2b40494
640 } 640 }
641 641
642 menu = gtk_menu_new(); 642 menu = gtk_menu_new();
643 643
644 button = gtk_menu_item_new_with_label(_("IM")); 644 button = gtk_menu_item_new_with_label(_("IM"));
645 gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(pressed_im), b); 645 g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(pressed_im), b);
646 gtk_menu_append(GTK_MENU(menu), button); 646 gtk_menu_append(GTK_MENU(menu), button);
647 gtk_widget_show(button); 647 gtk_widget_show(button);
648 648
649 button = gtk_menu_item_new_with_label(_("Alias")); 649 button = gtk_menu_item_new_with_label(_("Alias"));
650 gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(pressed_alias_bs), b); 650 g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(pressed_alias_bs), b);
651 gtk_menu_append(GTK_MENU(menu), button); 651 gtk_menu_append(GTK_MENU(menu), button);
652 gtk_widget_show(button); 652 gtk_widget_show(button);
653 653
654 button = gtk_menu_item_new_with_label(_("Add Buddy Pounce")); 654 button = gtk_menu_item_new_with_label(_("Add Buddy Pounce"));
655 gtk_signal_connect(GTK_OBJECT(button), "activate", 655 g_signal_connect(GTK_OBJECT(button), "activate",
656 GTK_SIGNAL_FUNC(new_bp_callback), 656 G_CALLBACK(new_bp_callback),
657 cn ? find_buddy(cn->data, b->name) : NULL); 657 cn ? find_buddy(cn->data, b->name) : NULL);
658 gtk_menu_append(GTK_MENU(menu), button); 658 gtk_menu_append(GTK_MENU(menu), button);
659 gtk_widget_show(button); 659 gtk_widget_show(button);
660 660
661 button = gtk_menu_item_new_with_label(_("View Log")); 661 button = gtk_menu_item_new_with_label(_("View Log"));
662 gtk_signal_connect(GTK_OBJECT(button), "activate", 662 g_signal_connect(GTK_OBJECT(button), "activate",
663 GTK_SIGNAL_FUNC(pressed_log), b->name); 663 G_CALLBACK(pressed_log), b->name);
664 gtk_menu_append(GTK_MENU(menu), button); 664 gtk_menu_append(GTK_MENU(menu), button);
665 gtk_widget_show(button); 665 gtk_widget_show(button);
666 666
667 if (g_slist_length(cn) > 1) { 667 if (g_slist_length(cn) > 1) {
668 while (cn) { 668 while (cn) {
681 while (mo) { 681 while (mo) {
682 struct proto_buddy_menu *pbm = mo->data; 682 struct proto_buddy_menu *pbm = mo->data;
683 GtkWidget *button; 683 GtkWidget *button;
684 684
685 button = gtk_menu_item_new_with_label(pbm->label); 685 button = gtk_menu_item_new_with_label(pbm->label);
686 gtk_signal_connect(GTK_OBJECT(button), "activate", 686 g_signal_connect(GTK_OBJECT(button), "activate",
687 GTK_SIGNAL_FUNC(menu_click), b->name); 687 G_CALLBACK(menu_click), b->name);
688 gtk_object_set_user_data(GTK_OBJECT(button), mo); 688 gtk_object_set_user_data(GTK_OBJECT(button), mo);
689 gtk_menu_append(GTK_MENU(conmenu), button); 689 gtk_menu_append(GTK_MENU(conmenu), button);
690 gtk_widget_show(button); 690 gtk_widget_show(button);
691 691
692 mo = mo->next; 692 mo = mo->next;
702 while (mo) { 702 while (mo) {
703 struct proto_buddy_menu *pbm = mo->data; 703 struct proto_buddy_menu *pbm = mo->data;
704 GtkWidget *button; 704 GtkWidget *button;
705 705
706 button = gtk_menu_item_new_with_label(pbm->label); 706 button = gtk_menu_item_new_with_label(pbm->label);
707 gtk_signal_connect(GTK_OBJECT(button), "activate", 707 g_signal_connect(GTK_OBJECT(button), "activate",
708 GTK_SIGNAL_FUNC(menu_click), b->name); 708 G_CALLBACK(menu_click), b->name);
709 gtk_object_set_user_data(GTK_OBJECT(button), mo); 709 gtk_object_set_user_data(GTK_OBJECT(button), mo);
710 gtk_menu_append(GTK_MENU(menu), button); 710 gtk_menu_append(GTK_MENU(menu), button);
711 gtk_widget_show(button); 711 gtk_widget_show(button);
712 712
713 mo = mo->next; 713 mo = mo->next;
795 if (*type == EDIT_GROUP) { 795 if (*type == EDIT_GROUP) {
796 struct group *group = (struct group *)type; 796 struct group *group = (struct group *)type;
797 menu = gtk_menu_new(); 797 menu = gtk_menu_new();
798 798
799 button = gtk_menu_item_new_with_label(_("Rename")); 799 button = gtk_menu_item_new_with_label(_("Rename"));
800 gtk_signal_connect(GTK_OBJECT(button), "activate", 800 g_signal_connect(GTK_OBJECT(button), "activate",
801 GTK_SIGNAL_FUNC(show_rename_group), group); 801 G_CALLBACK(show_rename_group), group);
802 gtk_menu_append(GTK_MENU(menu), button); 802 gtk_menu_append(GTK_MENU(menu), button);
803 gtk_widget_show(button); 803 gtk_widget_show(button);
804 804
805 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time); 805 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time);
806 806
808 } else if (*type == EDIT_BUDDY) { 808 } else if (*type == EDIT_BUDDY) {
809 struct buddy *b = (struct buddy *)type; 809 struct buddy *b = (struct buddy *)type;
810 menu = gtk_menu_new(); 810 menu = gtk_menu_new();
811 811
812 button = gtk_menu_item_new_with_label(_("IM")); 812 button = gtk_menu_item_new_with_label(_("IM"));
813 gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(pressed_im_bud), b); 813 g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(pressed_im_bud), b);
814 gtk_menu_append(GTK_MENU(menu), button); 814 gtk_menu_append(GTK_MENU(menu), button);
815 gtk_widget_show(button); 815 gtk_widget_show(button);
816 816
817 button = gtk_menu_item_new_with_label(_("Alias")); 817 button = gtk_menu_item_new_with_label(_("Alias"));
818 gtk_signal_connect(GTK_OBJECT(button), "activate", 818 g_signal_connect(GTK_OBJECT(button), "activate",
819 GTK_SIGNAL_FUNC(pressed_alias_bud), b); 819 G_CALLBACK(pressed_alias_bud), b);
820 gtk_menu_append(GTK_MENU(menu), button); 820 gtk_menu_append(GTK_MENU(menu), button);
821 gtk_widget_show(button); 821 gtk_widget_show(button);
822 822
823 if (strcmp(b->name, b->show)) { 823 if (strcmp(b->name, b->show)) {
824 button = gtk_menu_item_new_with_label(_("Un-Alias")); 824 button = gtk_menu_item_new_with_label(_("Un-Alias"));
825 gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(un_alias), b); 825 g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(un_alias), b);
826 gtk_menu_append(GTK_MENU(menu), button); 826 gtk_menu_append(GTK_MENU(menu), button);
827 gtk_widget_show(button); 827 gtk_widget_show(button);
828 } 828 }
829 829
830 button = gtk_menu_item_new_with_label(_("Rename")); 830 button = gtk_menu_item_new_with_label(_("Rename"));
831 gtk_signal_connect(GTK_OBJECT(button), "activate", 831 g_signal_connect(GTK_OBJECT(button), "activate",
832 GTK_SIGNAL_FUNC(show_rename_buddy), b); 832 G_CALLBACK(show_rename_buddy), b);
833 gtk_menu_append(GTK_MENU(menu), button); 833 gtk_menu_append(GTK_MENU(menu), button);
834 gtk_widget_show(button); 834 gtk_widget_show(button);
835 835
836 button = gtk_menu_item_new_with_label(_("Add Buddy Pounce")); 836 button = gtk_menu_item_new_with_label(_("Add Buddy Pounce"));
837 gtk_signal_connect(GTK_OBJECT(button), "activate", 837 g_signal_connect(GTK_OBJECT(button), "activate",
838 GTK_SIGNAL_FUNC(new_bp_callback), b); 838 G_CALLBACK(new_bp_callback), b);
839 gtk_menu_append(GTK_MENU(menu), button); 839 gtk_menu_append(GTK_MENU(menu), button);
840 gtk_widget_show(button); 840 gtk_widget_show(button);
841 841
842 button = gtk_menu_item_new_with_label(_("View Log")); 842 button = gtk_menu_item_new_with_label(_("View Log"));
843 gtk_signal_connect(GTK_OBJECT(button), "activate", 843 g_signal_connect(GTK_OBJECT(button), "activate",
844 GTK_SIGNAL_FUNC(pressed_log), b->name); 844 G_CALLBACK(pressed_log), b->name);
845 gtk_menu_append(GTK_MENU(menu), button); 845 gtk_menu_append(GTK_MENU(menu), button);
846 gtk_widget_show(button); 846 gtk_widget_show(button);
847 847
848 /* 848 /*
849 * Add protocol-specific edit buddy menu items if they exist 849 * Add protocol-specific edit buddy menu items if they exist
854 while (mo) { 854 while (mo) {
855 struct proto_buddy_menu *pbm = mo->data; 855 struct proto_buddy_menu *pbm = mo->data;
856 GtkWidget *button; 856 GtkWidget *button;
857 857
858 button = gtk_menu_item_new_with_label(pbm->label); 858 button = gtk_menu_item_new_with_label(pbm->label);
859 gtk_signal_connect(GTK_OBJECT(button), "activate", 859 g_signal_connect(GTK_OBJECT(button), "activate",
860 GTK_SIGNAL_FUNC(menu_click), b->name); 860 G_CALLBACK(menu_click), b->name);
861 gtk_object_set_user_data(GTK_OBJECT(button), mo); 861 gtk_object_set_user_data(GTK_OBJECT(button), mo);
862 gtk_menu_append(GTK_MENU(menu), button); 862 gtk_menu_append(GTK_MENU(menu), button);
863 gtk_widget_show(button); 863 gtk_widget_show(button);
864 864
865 mo = mo->next; 865 mo = mo->next;
1533 while (awy) { 1533 while (awy) {
1534 struct away_message *a = awy->data; 1534 struct away_message *a = awy->data;
1535 1535
1536 menuitem = gtk_menu_item_new_with_label(a->name); 1536 menuitem = gtk_menu_item_new_with_label(a->name);
1537 gtk_menu_append(GTK_MENU(menu), menuitem); 1537 gtk_menu_append(GTK_MENU(menu), menuitem);
1538 gtk_signal_connect(GTK_OBJECT(menuitem), "activate", 1538 g_signal_connect(GTK_OBJECT(menuitem), "activate",
1539 GTK_SIGNAL_FUNC(do_away_message), a); 1539 G_CALLBACK(do_away_message), a);
1540 gtk_widget_show(menuitem); 1540 gtk_widget_show(menuitem);
1541 awy = awy->next; 1541 awy = awy->next;
1542 } 1542 }
1543 1543
1544 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 1, GDK_CURRENT_TIME ); 1544 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 1, GDK_CURRENT_TIME );
1681 remmenu = gtk_menu_new(); 1681 remmenu = gtk_menu_new();
1682 1682
1683 menuitem = gtk_menu_item_new_with_label(_("New Buddy Pounce")); 1683 menuitem = gtk_menu_item_new_with_label(_("New Buddy Pounce"));
1684 gtk_menu_append(GTK_MENU(bpmenu), menuitem); 1684 gtk_menu_append(GTK_MENU(bpmenu), menuitem);
1685 gtk_widget_show(menuitem); 1685 gtk_widget_show(menuitem);
1686 gtk_signal_connect(GTK_OBJECT(menuitem), "activate", GTK_SIGNAL_FUNC(new_bp_callback), NULL); 1686 g_signal_connect(GTK_OBJECT(menuitem), "activate", G_CALLBACK(new_bp_callback), NULL);
1687 1687
1688 1688
1689 while (bp) { 1689 while (bp) {
1690 1690
1691 b = (struct buddy_pounce *)bp->data; 1691 b = (struct buddy_pounce *)bp->data;
1692 remitem = gtk_menu_item_new_with_label(b->name); 1692 remitem = gtk_menu_item_new_with_label(b->name);
1693 gtk_menu_append(GTK_MENU(remmenu), remitem); 1693 gtk_menu_append(GTK_MENU(remmenu), remitem);
1694 gtk_widget_show(remitem); 1694 gtk_widget_show(remitem);
1695 gtk_signal_connect(GTK_OBJECT(remitem), "activate", GTK_SIGNAL_FUNC(rem_bp), b); 1695 g_signal_connect(GTK_OBJECT(remitem), "activate", G_CALLBACK(rem_bp), b);
1696 1696
1697 bp = bp->next; 1697 bp = bp->next;
1698 1698
1699 } 1699 }
1700 1700
1729 else 1729 else
1730 mess = gtk_menu_item_new_with_label(_("[no message]")); 1730 mess = gtk_menu_item_new_with_label(_("[no message]"));
1731 gtk_menu_append(GTK_MENU(messmenu), mess); 1731 gtk_menu_append(GTK_MENU(messmenu), mess);
1732 gtk_tooltips_set_tip(bp_tooltip, GTK_WIDGET(mess), _("[Click to edit]"), NULL); 1732 gtk_tooltips_set_tip(bp_tooltip, GTK_WIDGET(mess), _("[Click to edit]"), NULL);
1733 gtk_widget_show(mess); 1733 gtk_widget_show(mess);
1734 gtk_signal_connect(GTK_OBJECT(mess), "activate", GTK_SIGNAL_FUNC(edit_bp_callback), b); 1734 g_signal_connect(GTK_OBJECT(mess), "activate", G_CALLBACK(edit_bp_callback), b);
1735 bp = bp->next; 1735 bp = bp->next;
1736 1736
1737 } 1737 }
1738 1738
1739 } 1739 }
1850 1850
1851 g->name = g_strdup(group); 1851 g->name = g_strdup(group);
1852 1852
1853 g->item = gtk_tree_item_new(); 1853 g->item = gtk_tree_item_new();
1854 1854
1855 gtk_signal_connect(GTK_OBJECT(g->item), "button_press_event", 1855 g_signal_connect(GTK_OBJECT(g->item), "button_press_event",
1856 GTK_SIGNAL_FUNC(handle_click_group), g); 1856 G_CALLBACK(handle_click_group), g);
1857 1857
1858 gtk_tree_insert(GTK_TREE(buddies), g->item, pos); 1858 gtk_tree_insert(GTK_TREE(buddies), g->item, pos);
1859 1859
1860 gtk_widget_show(g->item); 1860 gtk_widget_show(g->item);
1861 1861
1924 b->show = g_strdup(buddy->show); 1924 b->show = g_strdup(buddy->show);
1925 1925
1926 b->item = gtk_tree_item_new(); 1926 b->item = gtk_tree_item_new();
1927 gtk_tree_insert(GTK_TREE(gs->tree), b->item, pos); 1927 gtk_tree_insert(GTK_TREE(gs->tree), b->item, pos);
1928 gtk_object_set_user_data(GTK_OBJECT(b->item), b); 1928 gtk_object_set_user_data(GTK_OBJECT(b->item), b);
1929 gtk_signal_connect(GTK_OBJECT(b->item), "button_press_event", 1929 g_signal_connect(GTK_OBJECT(b->item), "button_press_event",
1930 GTK_SIGNAL_FUNC(handle_click_buddy), b); 1930 G_CALLBACK(handle_click_buddy), b);
1931 gtk_widget_show(b->item); 1931 gtk_widget_show(b->item);
1932 1932
1933 box = gtk_hbox_new(FALSE, 1); 1933 box = gtk_hbox_new(FALSE, 1);
1934 gtk_container_add(GTK_CONTAINER(b->item), box); 1934 gtk_container_add(GTK_CONTAINER(b->item), box);
1935 gtk_widget_show(box); 1935 gtk_widget_show(box);
2547 gtk_box_pack_start(GTK_BOX(imchatbox), infobutton, TRUE, TRUE, 0); 2547 gtk_box_pack_start(GTK_BOX(imchatbox), infobutton, TRUE, TRUE, 0);
2548 gtk_box_pack_start(GTK_BOX(imchatbox), chatbutton, TRUE, TRUE, 0); 2548 gtk_box_pack_start(GTK_BOX(imchatbox), chatbutton, TRUE, TRUE, 0);
2549 gtk_box_pack_start(GTK_BOX(imchatbox), awaybutton, TRUE, TRUE, 0); 2549 gtk_box_pack_start(GTK_BOX(imchatbox), awaybutton, TRUE, TRUE, 0);
2550 gtk_container_border_width(GTK_CONTAINER(imchatbox), 5); 2550 gtk_container_border_width(GTK_CONTAINER(imchatbox), 5);
2551 2551
2552 gtk_signal_connect(GTK_OBJECT(imbutton), "clicked", GTK_SIGNAL_FUNC(im_callback), 2552 g_signal_connect(GTK_OBJECT(imbutton), "clicked", G_CALLBACK(im_callback),
2553 buddies); 2553 buddies);
2554 gtk_signal_connect(GTK_OBJECT(infobutton), "clicked", GTK_SIGNAL_FUNC(info_callback), 2554 g_signal_connect(GTK_OBJECT(infobutton), "clicked", G_CALLBACK(info_callback),
2555 buddies); 2555 buddies);
2556 gtk_signal_connect(GTK_OBJECT(chatbutton), "clicked", GTK_SIGNAL_FUNC(chat_callback), 2556 g_signal_connect(GTK_OBJECT(chatbutton), "clicked", G_CALLBACK(chat_callback),
2557 buddies); 2557 buddies);
2558 gtk_signal_connect(GTK_OBJECT(awaybutton), "clicked", GTK_SIGNAL_FUNC(away_callback), 2558 g_signal_connect(GTK_OBJECT(awaybutton), "clicked", G_CALLBACK(away_callback),
2559 buddies); 2559 buddies);
2560 2560
2561 gtk_tooltips_set_tip(tips, infobutton, _("Information on selected Buddy"), "Penguin"); 2561 gtk_tooltips_set_tip(tips, infobutton, _("Information on selected Buddy"), "Penguin");
2562 gtk_tooltips_set_tip(tips, imbutton, _("Send Instant Message"), "Penguin"); 2562 gtk_tooltips_set_tip(tips, imbutton, _("Send Instant Message"), "Penguin");
2563 gtk_tooltips_set_tip(tips, chatbutton, _("Start/join a Buddy Chat"), "Penguin"); 2563 gtk_tooltips_set_tip(tips, chatbutton, _("Start/join a Buddy Chat"), "Penguin");
2627 menuitem = gaim_new_item(NULL, _("File")); 2627 menuitem = gaim_new_item(NULL, _("File"));
2628 gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu); 2628 gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
2629 gtk_menu_bar_append(GTK_MENU_BAR(menubar), menuitem); 2629 gtk_menu_bar_append(GTK_MENU_BAR(menubar), menuitem);
2630 2630
2631 gaim_new_item_from_stock(menu, _("_Add A Buddy"), GTK_STOCK_ADD, 2631 gaim_new_item_from_stock(menu, _("_Add A Buddy"), GTK_STOCK_ADD,
2632 GTK_SIGNAL_FUNC(add_buddy_callback), NULL, 'b', GDK_CONTROL_MASK, "Ctl+B"); 2632 G_CALLBACK(add_buddy_callback), NULL, 'b', GDK_CONTROL_MASK, "Ctl+B");
2633 gaim_new_item_from_stock(menu, _("_Join A Chat"), GTK_STOCK_JUMP_TO, 2633 gaim_new_item_from_stock(menu, _("_Join A Chat"), GTK_STOCK_JUMP_TO,
2634 GTK_SIGNAL_FUNC(chat_callback), NULL, 'c', GDK_CONTROL_MASK, "Ctl+C"); 2634 G_CALLBACK(chat_callback), NULL, 'c', GDK_CONTROL_MASK, "Ctl+C");
2635 gaim_new_item_from_stock(menu, _("_New Message"), GTK_STOCK_CONVERT, 2635 gaim_new_item_from_stock(menu, _("_New Message"), GTK_STOCK_CONVERT,
2636 GTK_SIGNAL_FUNC(show_im_dialog), NULL, 'i', GDK_CONTROL_MASK, "Ctl+I"); 2636 G_CALLBACK(show_im_dialog), NULL, 'i', GDK_CONTROL_MASK, "Ctl+I");
2637 gaim_new_item_from_stock(menu, _("_Get User Info"), GTK_STOCK_FIND, 2637 gaim_new_item_from_stock(menu, _("_Get User Info"), GTK_STOCK_FIND,
2638 GTK_SIGNAL_FUNC(show_info_dialog), NULL, 'j', GDK_CONTROL_MASK, "Ctl+J"); 2638 G_CALLBACK(show_info_dialog), NULL, 'j', GDK_CONTROL_MASK, "Ctl+J");
2639 2639
2640 gaim_separator(menu); 2640 gaim_separator(menu);
2641 2641
2642 gaim_new_item_from_pixbuf(menu, _("Import Buddy List"), "import-menu.png", 2642 gaim_new_item_from_pixbuf(menu, _("Import Buddy List"), "import-menu.png",
2643 GTK_SIGNAL_FUNC(import_callback), NULL, 0, 0, 0); 2643 G_CALLBACK(import_callback), NULL, 0, 0, 0);
2644 2644
2645 gaim_separator(menu); 2645 gaim_separator(menu);
2646 2646
2647 gaim_new_item_from_stock(menu, _("Signoff"), NULL, 2647 gaim_new_item_from_stock(menu, _("Signoff"), NULL,
2648 GTK_SIGNAL_FUNC(signoff_all), (void*)1, 'd', GDK_CONTROL_MASK, "Ctl+D"); 2648 G_CALLBACK(signoff_all), (void*)1, 'd', GDK_CONTROL_MASK, "Ctl+D");
2649 gaim_new_item_from_stock(menu, _("Hide"), NULL, 2649 gaim_new_item_from_stock(menu, _("Hide"), NULL,
2650 GTK_SIGNAL_FUNC(hide_buddy_list), NULL, 'h', GDK_CONTROL_MASK, "Ctl+H"); 2650 G_CALLBACK(hide_buddy_list), NULL, 'h', GDK_CONTROL_MASK, "Ctl+H");
2651 gaim_new_item_from_stock(menu, _("Quit"), GTK_STOCK_QUIT, 2651 gaim_new_item_from_stock(menu, _("Quit"), GTK_STOCK_QUIT,
2652 GTK_SIGNAL_FUNC(do_quit), NULL, 'q', GDK_CONTROL_MASK, "Ctl+Q"); 2652 G_CALLBACK(do_quit), NULL, 'q', GDK_CONTROL_MASK, "Ctl+Q");
2653 2653
2654 menu = gtk_menu_new(); 2654 menu = gtk_menu_new();
2655 2655
2656 menuitem = gaim_new_item(NULL, _("Tools")); 2656 menuitem = gaim_new_item(NULL, _("Tools"));
2657 gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu); 2657 gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
2669 2669
2670 gaim_separator(menu); 2670 gaim_separator(menu);
2671 2671
2672 #ifndef NO_MULTI 2672 #ifndef NO_MULTI
2673 gaim_new_item_from_pixbuf(menu, _("_Accounts..."), "accounts-menu.png", 2673 gaim_new_item_from_pixbuf(menu, _("_Accounts..."), "accounts-menu.png",
2674 GTK_SIGNAL_FUNC(account_editor), NULL, 'a', GDK_CONTROL_MASK, "Ctl+A"); 2674 G_CALLBACK(account_editor), NULL, 'a', GDK_CONTROL_MASK, "Ctl+A");
2675 #endif 2675 #endif
2676 gaim_new_item_from_stock(menu, _("_Preferences..."), GTK_STOCK_PREFERENCES, 2676 gaim_new_item_from_stock(menu, _("_Preferences..."), GTK_STOCK_PREFERENCES,
2677 GTK_SIGNAL_FUNC(show_prefs), NULL, 'p', GDK_CONTROL_MASK, "Ctl+P"); 2677 G_CALLBACK(show_prefs), NULL, 'p', GDK_CONTROL_MASK, "Ctl+P");
2678 2678
2679 gaim_separator(menu); 2679 gaim_separator(menu);
2680 2680
2681 protomenu = gtk_menu_new(); 2681 protomenu = gtk_menu_new();
2682 menuitem = gaim_new_item_from_stock(menu, _("Protocol Actions"), NULL, NULL, NULL, 0, 0, 0); 2682 menuitem = gaim_new_item_from_stock(menu, _("Protocol Actions"), NULL, NULL, NULL, 0, 0, 0);
2683 gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), protomenu); 2683 gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), protomenu);
2684 do_proto_menu(); 2684 do_proto_menu();
2685 2685
2686 gaim_new_item_from_stock(menu, _("Pr_ivacy..."), NULL, 2686 gaim_new_item_from_stock(menu, _("Pr_ivacy..."), NULL,
2687 GTK_SIGNAL_FUNC(show_privacy_options), NULL, 0, 0, 0); 2687 G_CALLBACK(show_privacy_options), NULL, 0, 0, 0);
2688 2688
2689 gaim_new_item_from_stock(menu, _("_View System Log..."), NULL, 2689 gaim_new_item_from_stock(menu, _("_View System Log..."), NULL,
2690 GTK_SIGNAL_FUNC(show_syslog), NULL, 0, 0, 0); 2690 G_CALLBACK(show_syslog), NULL, 0, 0, 0);
2691 2691
2692 menu = gtk_menu_new(); 2692 menu = gtk_menu_new();
2693 2693
2694 menuitem = gaim_new_item(NULL, _("Help")); 2694 menuitem = gaim_new_item(NULL, _("Help"));
2695 gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu); 2695 gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
2696 gtk_menu_bar_append(GTK_MENU_BAR(menubar), menuitem); 2696 gtk_menu_bar_append(GTK_MENU_BAR(menubar), menuitem);
2697 2697
2698 gaim_new_item_from_stock(menu, _("Online Help"), GTK_STOCK_HELP, GTK_SIGNAL_FUNC(open_url), WEBSITE"documentation.php", GDK_F1, 0, NULL); 2698 gaim_new_item_from_stock(menu, _("Online Help"), GTK_STOCK_HELP, G_CALLBACK(open_url), WEBSITE"documentation.php", GDK_F1, 0, NULL);
2699 gaim_new_item_from_stock(menu, _("Debug Window"), NULL, GTK_SIGNAL_FUNC(clicked_debug), NULL, 0, 0, NULL); 2699 gaim_new_item_from_stock(menu, _("Debug Window"), NULL, G_CALLBACK(clicked_debug), NULL, 0, 0, NULL);
2700 2700
2701 gaim_separator(menu); 2701 gaim_separator(menu);
2702 2702
2703 gaim_new_item_from_pixbuf(menu, _("About Gaim"), "about_menu.png", GTK_SIGNAL_FUNC(show_about), NULL, GDK_F1, GDK_CONTROL_MASK, NULL); 2703 gaim_new_item_from_pixbuf(menu, _("About Gaim"), "about_menu.png", G_CALLBACK(show_about), NULL, GDK_F1, GDK_CONTROL_MASK, NULL);
2704 2704
2705 gtk_widget_show(menubar); 2705 gtk_widget_show(menubar);
2706 2706
2707 vbox = gtk_vbox_new(FALSE, 0); 2707 vbox = gtk_vbox_new(FALSE, 0);
2708 2708
2738 2738
2739 edittree = gtk_ctree_new(1, 0); 2739 edittree = gtk_ctree_new(1, 0);
2740 gtk_ctree_set_line_style(GTK_CTREE(edittree), GTK_CTREE_LINES_SOLID);; 2740 gtk_ctree_set_line_style(GTK_CTREE(edittree), GTK_CTREE_LINES_SOLID);;
2741 gtk_ctree_set_expander_style(GTK_CTREE(edittree), GTK_CTREE_EXPANDER_SQUARE); 2741 gtk_ctree_set_expander_style(GTK_CTREE(edittree), GTK_CTREE_EXPANDER_SQUARE);
2742 gtk_clist_set_reorderable(GTK_CLIST(edittree), TRUE); 2742 gtk_clist_set_reorderable(GTK_CLIST(edittree), TRUE);
2743 gtk_signal_connect(GTK_OBJECT(edittree), "button_press_event", 2743 g_signal_connect(GTK_OBJECT(edittree), "button_press_event",
2744 GTK_SIGNAL_FUNC(click_edit_tree), NULL); 2744 G_CALLBACK(click_edit_tree), NULL);
2745 2745
2746 gtk_ctree_set_drag_compare_func(GTK_CTREE(edittree), 2746 gtk_ctree_set_drag_compare_func(GTK_CTREE(edittree),
2747 (GtkCTreeCompareDragFunc) edit_drag_compare_func); 2747 (GtkCTreeCompareDragFunc) edit_drag_compare_func);
2748 2748
2749 2749
2750 gtk_signal_connect_after(GTK_OBJECT(edittree), "tree_move", 2750 g_signal_connect_after(GTK_OBJECT(edittree), "tree_move",
2751 GTK_SIGNAL_FUNC(edit_tree_move), NULL); 2751 G_CALLBACK(edit_tree_move), NULL);
2752 2752
2753 2753
2754 bbox = gtk_hbox_new(TRUE, 5); 2754 bbox = gtk_hbox_new(TRUE, 5);
2755 gtk_container_set_border_width(GTK_CONTAINER(bbox), 5); 2755 gtk_container_set_border_width(GTK_CONTAINER(bbox), 5);
2756 tbox = gtk_scrolled_window_new(NULL, NULL); 2756 tbox = gtk_scrolled_window_new(NULL, NULL);