Mercurial > pidgin

comparison src/gtkprefs.c @ 8881:1ab2a9c17f4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 9650] I'm going to thoroughly remove the prefs that we're sure about. Starting with the show_smileys one. I also tagged the commented out preferences with /* PREFSLASH04 */ to make them easily findable. And got rid of a compile warning or 5. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 06 May 2004 04:44:33 +0000
parents 831da5209d83
children 25344c2d74c4
comparison
equal deleted inserted replaced
8880:ec3e041dc3bd 8881:1ab2a9c17f4a
89 * PROTOTYPES 89 * PROTOTYPES
90 */ 90 */
91 static GtkTreeIter *prefs_notebook_add_page(const char*, GdkPixbuf*, 91 static GtkTreeIter *prefs_notebook_add_page(const char*, GdkPixbuf*,
92 GtkWidget*, GtkTreeIter*, 92 GtkWidget*, GtkTreeIter*,
93 GtkTreeIter*, int); 93 GtkTreeIter*, int);
94 #if 0 /* PREFSLASH04 */
94 static GtkWidget *show_color_pref(GtkWidget *, gboolean); 95 static GtkWidget *show_color_pref(GtkWidget *, gboolean);
96 #endif
95 static void delete_prefs(GtkWidget *, void *); 97 static void delete_prefs(GtkWidget *, void *);
96 static void update_plugin_list(void *data); 98 static void update_plugin_list(void *data);
97 99
98 static void set_default_away(GtkWidget *, gpointer); 100 static void set_default_away(GtkWidget *, gpointer);
99 101
753 GtkWidget *vbox; 755 GtkWidget *vbox;
754 ret = gtk_vbox_new(FALSE, 18); 756 ret = gtk_vbox_new(FALSE, 18);
755 gtk_container_set_border_width (GTK_CONTAINER (ret), 12); 757 gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
756 758
757 vbox = gaim_gtk_make_frame (ret, _("Display")); 759 vbox = gaim_gtk_make_frame (ret, _("Display"));
758 /*
759 gaim_gtk_prefs_checkbox(_("Show graphical _smileys"),
760 "/gaim/gtk/conversations/show_smileys", vbox);
761 */
762 gaim_gtk_prefs_checkbox(_("Show _timestamp on messages"), 760 gaim_gtk_prefs_checkbox(_("Show _timestamp on messages"),
763 "/gaim/gtk/conversations/show_timestamps", vbox); 761 "/gaim/gtk/conversations/show_timestamps", vbox);
764 /* 762 #if 0 /* PREFSLASH04 */
765 gaim_gtk_prefs_checkbox(_("Show _URLs as links"), 763 gaim_gtk_prefs_checkbox(_("Show _URLs as links"),
766 "/gaim/gtk/conversations/show_urls_as_links", vbox); 764 "/gaim/gtk/conversations/show_urls_as_links", vbox);
767 */ 765 #endif /* PREFSLASH04 */
768 #ifdef USE_GTKSPELL 766 #ifdef USE_GTKSPELL
769 gaim_gtk_prefs_checkbox(_("_Highlight misspelled words"), 767 gaim_gtk_prefs_checkbox(_("_Highlight misspelled words"),
770 "/gaim/gtk/conversations/spellcheck", vbox); 768 "/gaim/gtk/conversations/spellcheck", vbox);
771 #endif 769 #endif
772 /* vbox = gaim_gtk_make_frame (ret, _("Ignore")); 770 #if 0 /* PREFSLASH04 */
771 vbox = gaim_gtk_make_frame (ret, _("Ignore"));
773 gaim_gtk_prefs_checkbox(_("Ignore c_olors"), 772 gaim_gtk_prefs_checkbox(_("Ignore c_olors"),
774 "/gaim/gtk/conversations/ignore_colors", vbox); 773 "/gaim/gtk/conversations/ignore_colors", vbox);
775 gaim_gtk_prefs_checkbox(_("Ignore font _faces"), 774 gaim_gtk_prefs_checkbox(_("Ignore font _faces"),
776 "/gaim/gtk/conversations/ignore_fonts", vbox); 775 "/gaim/gtk/conversations/ignore_fonts", vbox);
777 gaim_gtk_prefs_checkbox(_("Ignore font si_zes"), 776 gaim_gtk_prefs_checkbox(_("Ignore font si_zes"),
778 "/gaim/gtk/conversations/ignore_font_sizes", vbox); 777 "/gaim/gtk/conversations/ignore_font_sizes", vbox);
779 */ 778 #endif /* PREFSLASH04 */
780 gaim_gtk_prefs_checkbox(_("Ignore formatting on incoming messages"), NULL, vbox); 779 gaim_gtk_prefs_checkbox(_("Ignore formatting on incoming messages"), NULL, vbox);
781 gtk_widget_show_all(ret); 780 gtk_widget_show_all(ret);
782 return ret; 781 return ret;
783 } 782 }
784 783
829 gaim_gtk_prefs_dropdown_from_list(vbox, _("_Sorting:"), GAIM_PREF_STRING, 828 gaim_gtk_prefs_dropdown_from_list(vbox, _("_Sorting:"), GAIM_PREF_STRING,
830 "/gaim/gtk/blist/sort_type", l); 829 "/gaim/gtk/blist/sort_type", l);
831 830
832 g_list_free(l); 831 g_list_free(l);
833 832
834 /* 833 #if 0 /* PREFSLASH04 */
835 vbox = gaim_gtk_make_frame (ret, _("Buddy List Toolbar")); 834 vbox = gaim_gtk_make_frame (ret, _("Buddy List Toolbar"));
836 gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT, 835 gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT,
837 "/gaim/gtk/blist/button_style", 836 "/gaim/gtk/blist/button_style",
838 _("Pictures"), GAIM_BUTTON_IMAGE, 837 _("Pictures"), GAIM_BUTTON_IMAGE,
839 _("Text"), GAIM_BUTTON_TEXT, 838 _("Text"), GAIM_BUTTON_TEXT,
840 _("Pictures and text"), GAIM_BUTTON_TEXT_IMAGE, 839 _("Pictures and text"), GAIM_BUTTON_TEXT_IMAGE,
841 _("None"), GAIM_BUTTON_NONE, 840 _("None"), GAIM_BUTTON_NONE,
842 NULL); 841 NULL);
843 */ 842 #endif /* PREFSLASH04 */
844 843
845 vbox = gaim_gtk_make_frame (ret, _("Buddy List Window")); 844 vbox = gaim_gtk_make_frame (ret, _("Buddy List Window"));
846 gaim_gtk_prefs_checkbox(_("_Raise window on events"), 845 gaim_gtk_prefs_checkbox(_("_Raise window on events"),
847 "/gaim/gtk/blist/raise_on_events", vbox); 846 "/gaim/gtk/blist/raise_on_events", vbox);
848 847
849 /* 848 #if 0 /* PREFSLASH04 */
850 vbox = gaim_gtk_make_frame (ret, _("Group Display")); 849 vbox = gaim_gtk_make_frame (ret, _("Group Display"));
851 gaim_gtk_prefs_checkbox(_("Show _numbers in groups"), 850 gaim_gtk_prefs_checkbox(_("Show _numbers in groups"),
852 "/gaim/gtk/blist/show_group_count", vbox); 851 "/gaim/gtk/blist/show_group_count", vbox);
853 */ 852 #endif /* PREFSLASH04 */
854 853
855 vbox = gaim_gtk_make_frame (ret, _("Buddy Display")); 854 vbox = gaim_gtk_make_frame (ret, _("Buddy Display"));
856 gaim_gtk_prefs_checkbox(_("Show buddy _icons"), 855 gaim_gtk_prefs_checkbox(_("Show buddy _icons"),
857 "/gaim/gtk/blist/show_buddy_icons", vbox); 856 "/gaim/gtk/blist/show_buddy_icons", vbox);
858 gaim_gtk_prefs_checkbox(_("Show _warning levels"), 857 gaim_gtk_prefs_checkbox(_("Show _warning levels"),
871 870
872 GtkWidget *conv_page() { 871 GtkWidget *conv_page() {
873 GtkWidget *ret; 872 GtkWidget *ret;
874 GtkWidget *vbox; 873 GtkWidget *vbox;
875 GtkWidget *label; 874 GtkWidget *label;
876 GtkWidget *close_checkbox, *icons_checkbox; 875 GtkWidget *close_checkbox;/*, *icons_checkbox;*/
877 GtkWidget *tabs_checkbox, *same_checkbox; 876 GtkWidget *tabs_checkbox, *same_checkbox;
878 GtkSizeGroup *sg; 877 GtkSizeGroup *sg;
879 GList *names = NULL; 878 GList *names = NULL;
880 879
881 ret = gtk_vbox_new(FALSE, 18); 880 ret = gtk_vbox_new(FALSE, 18);
891 g_list_free(names); 890 g_list_free(names);
892 891
893 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); 892 gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
894 gtk_size_group_add_widget(sg, label); 893 gtk_size_group_add_widget(sg, label);
895 894
896 /* 895 #if 0 /* PREFSLASH04 */
897 gaim_gtk_prefs_checkbox(_("Send _URLs as links"), 896 gaim_gtk_prefs_checkbox(_("Send _URLs as links"),
898 "/core/conversations/send_urls_as_links", vbox); 897 "/core/conversations/send_urls_as_links", vbox);
899 */ 898 #endif /* PREFSLASH04 */
900 gaim_gtk_prefs_checkbox(_("Show _formatting toolbar"), 899 gaim_gtk_prefs_checkbox(_("Show _formatting toolbar"),
901 "/gaim/gtk/conversations/show_formatting_toolbar", vbox); 900 "/gaim/gtk/conversations/show_formatting_toolbar", vbox);
902 901
903 gaim_gtk_prefs_checkbox(_("Show a_liases in tabs/titles"), 902 gaim_gtk_prefs_checkbox(_("Show a_liases in tabs/titles"),
904 "/core/conversations/use_alias_for_title", vbox); 903 "/core/conversations/use_alias_for_title", vbox);
937 gtk_widget_set_sensitive(GTK_WIDGET(close_checkbox), FALSE); 936 gtk_widget_set_sensitive(GTK_WIDGET(close_checkbox), FALSE);
938 } 937 }
939 938
940 g_signal_connect(G_OBJECT(tabs_checkbox), "clicked", 939 g_signal_connect(G_OBJECT(tabs_checkbox), "clicked",
941 G_CALLBACK(gaim_gtk_toggle_sensitive), close_checkbox); 940 G_CALLBACK(gaim_gtk_toggle_sensitive), close_checkbox);
942 /* 941 #if 0 /* PREFSLASH04 */
943 icons_checkbox = gaim_gtk_prefs_checkbox(_("Show status _icons on tabs"), 942 icons_checkbox = gaim_gtk_prefs_checkbox(_("Show status _icons on tabs"),
944 "/gaim/gtk/conversations/icons_on_tabs", 943 "/gaim/gtk/conversations/icons_on_tabs",
945 vbox); 944 vbox);
946 945
947 if (!gaim_prefs_get_bool("/gaim/gtk/conversations/tabs")) { 946 if (!gaim_prefs_get_bool("/gaim/gtk/conversations/tabs")) {
948 gtk_widget_set_sensitive(GTK_WIDGET(icons_checkbox), FALSE); 947 gtk_widget_set_sensitive(GTK_WIDGET(icons_checkbox), FALSE);
949 } 948 }
950 949
951 g_signal_connect(G_OBJECT(tabs_checkbox), "clicked", 950 g_signal_connect(G_OBJECT(tabs_checkbox), "clicked",
952 G_CALLBACK(gaim_gtk_toggle_sensitive), icons_checkbox); 951 G_CALLBACK(gaim_gtk_toggle_sensitive), icons_checkbox);
953 */ 952 #endif /* PREFSLASH04 */
954 953
955 gtk_widget_show_all(ret); 954 gtk_widget_show_all(ret);
956 955
957 return ret; 956 return ret;
958 } 957 }
959 958
960 GtkWidget *im_page() { 959 GtkWidget *im_page() {
961 GtkWidget *ret; 960 GtkWidget *ret;
962 GtkWidget *vbox; 961 GtkWidget *vbox;
962 #if 0 /* PREFSLASH04 */
963 GtkWidget *widge; 963 GtkWidget *widge;
964 #endif /* PREFSLASH04 */
964 GtkSizeGroup *sg; 965 GtkSizeGroup *sg;
965 966
966 ret = gtk_vbox_new(FALSE, 18); 967 ret = gtk_vbox_new(FALSE, 18);
967 gtk_container_set_border_width (GTK_CONTAINER (ret), 12); 968 gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
968 969
969 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 970 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
970 971
971 /*vbox = gaim_gtk_make_frame (ret, _("Window")); 972 #if 0 /* PREFSLASH04 */
973 vbox = gaim_gtk_make_frame (ret, _("Window"));
972 widge = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT, 974 widge = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT,
973 "/gaim/gtk/conversations/im/button_type", 975 "/gaim/gtk/conversations/im/button_type",
974 _("Pictures"), GAIM_BUTTON_IMAGE, 976 _("Pictures"), GAIM_BUTTON_IMAGE,
975 _("Text"), GAIM_BUTTON_TEXT, 977 _("Text"), GAIM_BUTTON_TEXT,
976 _("Pictures and text"), GAIM_BUTTON_TEXT_IMAGE, 978 _("Pictures and text"), GAIM_BUTTON_TEXT_IMAGE,
988 gaim_gtk_prefs_checkbox(_("_Raise window on events"), 990 gaim_gtk_prefs_checkbox(_("_Raise window on events"),
989 "/gaim/gtk/conversations/im/raise_on_events", vbox); 991 "/gaim/gtk/conversations/im/raise_on_events", vbox);
990 gaim_gtk_prefs_checkbox(_("Hide window on _send"), 992 gaim_gtk_prefs_checkbox(_("Hide window on _send"),
991 "/gaim/gtk/conversations/im/hide_on_send", vbox); 993 "/gaim/gtk/conversations/im/hide_on_send", vbox);
992 gtk_widget_show (vbox); 994 gtk_widget_show (vbox);
993 */ 995 #endif /* PREFSLASH04 */
994 vbox = gaim_gtk_make_frame (ret, _("Buddy Icons")); 996 vbox = gaim_gtk_make_frame (ret, _("Buddy Icons"));
995 gaim_gtk_prefs_checkbox(_("Show buddy _icons"), 997 gaim_gtk_prefs_checkbox(_("Show buddy _icons"),
996 "/gaim/gtk/conversations/im/show_buddy_icons", vbox); 998 "/gaim/gtk/conversations/im/show_buddy_icons", vbox);
997 gaim_gtk_prefs_checkbox(_("Enable buddy icon a_nimation"), 999 gaim_gtk_prefs_checkbox(_("Enable buddy icon a_nimation"),
998 "/gaim/gtk/conversations/im/animate_buddy_icons", vbox); 1000 "/gaim/gtk/conversations/im/animate_buddy_icons", vbox);
999 1001
1000 /*vbox = gaim_gtk_make_frame (ret, _("Display")); 1002 #if 0 /* PREFSLASH04 */
1003 vbox = gaim_gtk_make_frame (ret, _("Display"));
1001 gaim_gtk_prefs_checkbox(_("Show _logins in window"), 1004 gaim_gtk_prefs_checkbox(_("Show _logins in window"),
1002 "/core/conversations/im/show_login", vbox); 1005 "/core/conversations/im/show_login", vbox);
1003 */ 1006 #endif /* PREFSLASH04 */
1004 vbox = gaim_gtk_make_frame (ret, _("Typing Notification")); 1007 vbox = gaim_gtk_make_frame (ret, _("Typing Notification"));
1005 gaim_gtk_prefs_checkbox(_("Notify buddies that you are _typing to them"), 1008 gaim_gtk_prefs_checkbox(_("Notify buddies that you are _typing to them"),
1006 "/core/conversations/im/send_typing", vbox); 1009 "/core/conversations/im/send_typing", vbox);
1007 1010
1008 gtk_widget_show_all(ret); 1011 gtk_widget_show_all(ret);
1010 } 1013 }
1011 1014
1012 GtkWidget *chat_page() { 1015 GtkWidget *chat_page() {
1013 GtkWidget *ret; 1016 GtkWidget *ret;
1014 GtkWidget *vbox; 1017 GtkWidget *vbox;
1018 #if 0 /* PREFSLASH04 */
1015 GtkWidget *dd; 1019 GtkWidget *dd;
1020 #endif /* PREFSLASH04 */
1016 GtkSizeGroup *sg; 1021 GtkSizeGroup *sg;
1017 1022
1018 ret = gtk_vbox_new(FALSE, 18); 1023 ret = gtk_vbox_new(FALSE, 18);
1019 gtk_container_set_border_width (GTK_CONTAINER (ret), 12); 1024 gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
1020 1025
1021 sg = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); 1026 sg = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
1022 /* 1027 #if 0 /* PREFSLASH04 */
1023 vbox = gaim_gtk_make_frame (ret, _("Window")); 1028 vbox = gaim_gtk_make_frame (ret, _("Window"));
1024 dd = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT, 1029 dd = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT,
1025 "/gaim/gtk/conversations/chat/button_type", 1030 "/gaim/gtk/conversations/chat/button_type",
1026 _("Pictures"), GAIM_BUTTON_IMAGE, 1031 _("Pictures"), GAIM_BUTTON_IMAGE,
1027 _("Text"), GAIM_BUTTON_TEXT, 1032 _("Text"), GAIM_BUTTON_TEXT,
1043 vbox = gaim_gtk_make_frame (ret, _("Tab Completion")); 1048 vbox = gaim_gtk_make_frame (ret, _("Tab Completion"));
1044 gaim_gtk_prefs_checkbox(_("_Tab-complete nicks"), 1049 gaim_gtk_prefs_checkbox(_("_Tab-complete nicks"),
1045 "/gaim/gtk/conversations/chat/tab_completion", vbox); 1050 "/gaim/gtk/conversations/chat/tab_completion", vbox);
1046 gaim_gtk_prefs_checkbox(_("_Old-style tab completion"), 1051 gaim_gtk_prefs_checkbox(_("_Old-style tab completion"),
1047 "/gaim/gtk/conversations/chat/old_tab_complete", vbox); 1052 "/gaim/gtk/conversations/chat/old_tab_complete", vbox);
1048 */ 1053 #endif /* PREFSLASH04 */
1049 vbox = gaim_gtk_make_frame (ret, _("Display")); 1054 vbox = gaim_gtk_make_frame (ret, _("Display"));
1050 /* 1055 #if 0 /* PREFSLASH04 */
1051 gaim_gtk_prefs_checkbox(_("_Show people joining in window"), 1056 gaim_gtk_prefs_checkbox(_("_Show people joining in window"),
1052 "/core/conversations/chat/show_join", vbox); 1057 "/core/conversations/chat/show_join", vbox);
1053 gaim_gtk_prefs_checkbox(_("_Show people leaving in window"), 1058 gaim_gtk_prefs_checkbox(_("_Show people leaving in window"),
1054 "/core/conversations/chat/show_leave", vbox); 1059 "/core/conversations/chat/show_leave", vbox);
1055 */ 1060 #endif /* PREFSLASH04 */
1056 gaim_gtk_prefs_checkbox(_("Co_lorize screen names"), 1061 gaim_gtk_prefs_checkbox(_("Co_lorize screen names"),
1057 "/gaim/gtk/conversations/chat/color_nicks", vbox); 1062 "/gaim/gtk/conversations/chat/color_nicks", vbox);
1058 1063
1059 gtk_widget_show_all(ret); 1064 gtk_widget_show_all(ret);
1060 return ret; 1065 return ret;
1466 "/core/logging/log_own_states", vbox); 1471 "/core/logging/log_own_states", vbox);
1467 g_signal_connect(G_OBJECT(sys_box), "clicked", 1472 g_signal_connect(G_OBJECT(sys_box), "clicked",
1468 G_CALLBACK(gaim_gtk_toggle_sensitive), box); 1473 G_CALLBACK(gaim_gtk_toggle_sensitive), box);
1469 gtk_widget_set_sensitive(box, syslog_enabled); 1474 gtk_widget_set_sensitive(box, syslog_enabled);
1470 1475
1471 /* 1476 #if 0 /* PREFSLASH04 */
1472 gaim_gtk_prefs_checkbox(_("I_ndividual log file for each buddy's signons"), 1477 gaim_gtk_prefs_checkbox(_("I_ndividual log file for each buddy's signons"),
1473 "/gaim/gtk/logging/individual_logs", vbox); 1478 "/gaim/gtk/logging/individual_logs", vbox);
1474 */ 1479 #endif /* PREFSLASH04 */
1475 1480
1476 gtk_widget_show_all(ret); 1481 gtk_widget_show_all(ret);
1477 return ret; 1482 return ret;
1478 } 1483 }
1479 1484
1512 gtk_container_set_border_width (GTK_CONTAINER (ret), 12); 1517 gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
1513 1518
1514 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 1519 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
1515 1520
1516 vbox = gaim_gtk_make_frame (ret, _("Sound Options")); 1521 vbox = gaim_gtk_make_frame (ret, _("Sound Options"));
1517 /* gaim_gtk_prefs_checkbox(_("Sounds when you _log in"), 1522 #if 0 /* PREFSLASH04 */
1523 gaim_gtk_prefs_checkbox(_("Sounds when you _log in"),
1518 "/gaim/gtk/sound/signon", vbox); 1524 "/gaim/gtk/sound/signon", vbox);
1519 */ 1525 #endif /* PREFSLASH04 */
1520 gaim_gtk_prefs_checkbox(_("Sounds when conversation has _focus"), 1526 gaim_gtk_prefs_checkbox(_("Sounds when conversation has _focus"),
1521 "/gaim/gtk/sound/conv_focus", vbox); 1527 "/gaim/gtk/sound/conv_focus", vbox);
1522 gaim_gtk_prefs_checkbox(_("_Sounds while away"), 1528 gaim_gtk_prefs_checkbox(_("_Sounds while away"),
1523 "/core/sound/while_away", vbox); 1529 "/core/sound/while_away", vbox);
1524 1530
1574 gtk_widget_show_all(ret); 1580 gtk_widget_show_all(ret);
1575 1581
1576 return ret; 1582 return ret;
1577 } 1583 }
1578 1584
1585 #if 0 /* PREFSLASH04 */
1579 static void 1586 static void
1580 auto_resp_changed_cb(const char *name, GaimPrefType type, gpointer value, 1587 auto_resp_changed_cb(const char *name, GaimPrefType type, gpointer value,
1581 gpointer data) 1588 gpointer data)
1582 { 1589 {
1583 GtkWidget *hbox = data; 1590 GtkWidget *hbox = data;
1584 gboolean enabled = GPOINTER_TO_INT(value); 1591 gboolean enabled = GPOINTER_TO_INT(value);
1585 1592
1586 gtk_widget_set_sensitive(hbox, enabled); 1593 gtk_widget_set_sensitive(hbox, enabled);
1587 } 1594 }
1595 #endif /* PREFSLASH04 */
1588 1596
1589 GtkWidget *away_page() { 1597 GtkWidget *away_page() {
1590 GtkWidget *ret; 1598 GtkWidget *ret;
1591 GtkWidget *vbox; 1599 GtkWidget *vbox;
1592 GtkWidget *hbox; 1600 GtkWidget *hbox;
1600 gtk_container_set_border_width (GTK_CONTAINER (ret), 12); 1608 gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
1601 1609
1602 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 1610 sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
1603 1611
1604 vbox = gaim_gtk_make_frame (ret, _("Away")); 1612 vbox = gaim_gtk_make_frame (ret, _("Away"));
1605 /* 1613 #if 0 /* PREFSLASH04 */
1606 gaim_gtk_prefs_checkbox(_("_Sending messages removes away status"), 1614 gaim_gtk_prefs_checkbox(_("_Sending messages removes away status"),
1607 "/core/conversations/away_back_on_send", vbox); 1615 "/core/conversations/away_back_on_send", vbox);
1608 */ 1616 #endif /* PREFSLASH04 */
1609 gaim_gtk_prefs_checkbox(_("_Queue new messages when away"), 1617 gaim_gtk_prefs_checkbox(_("_Queue new messages when away"),
1610 "/gaim/gtk/away/queue_messages", vbox); 1618 "/gaim/gtk/away/queue_messages", vbox);
1611 1619
1612 vbox = gaim_gtk_make_frame (ret, _("Auto-response")); 1620 vbox = gaim_gtk_make_frame (ret, _("Auto-response"));
1613 /* 1621 #if 0 /* PREFSLASH04 */
1614 hbox = gtk_hbox_new(FALSE, 0); 1622 hbox = gtk_hbox_new(FALSE, 0);
1615 gtk_container_add(GTK_CONTAINER(vbox), hbox); 1623 gtk_container_add(GTK_CONTAINER(vbox), hbox);
1616 gaim_gtk_prefs_labeled_spin_button(hbox, _("Seconds before _resending:"), 1624 gaim_gtk_prefs_labeled_spin_button(hbox, _("Seconds before _resending:"),
1617 "/core/away/auto_response/sec_before_resend", 1625 "/core/away/auto_response/sec_before_resend",
1618 1, 24 * 60 * 60, sg); 1626 1, 24 * 60 * 60, sg);
1619 */ 1627 #endif /* PREFSLASH04 */
1620 gaim_gtk_prefs_checkbox(_("_Send auto-response"), 1628 gaim_gtk_prefs_checkbox(_("_Send auto-response"),
1621 "/core/away/auto_response/enabled", vbox); 1629 "/core/away/auto_response/enabled", vbox);
1622 gaim_gtk_prefs_checkbox(_("_Only send auto-response when idle"), 1630 gaim_gtk_prefs_checkbox(_("_Only send auto-response when idle"),
1623 "/core/away/auto_response/idle_only", vbox); 1631 "/core/away/auto_response/idle_only", vbox);
1624 /* 1632 #if 0 /* PREFSLASH04 */
1625 gaim_gtk_prefs_checkbox(_("Send auto-response in _active conversations"), 1633 gaim_gtk_prefs_checkbox(_("Send auto-response in _active conversations"),
1626 "/core/away/auto_response/in_active_conv", vbox); 1634 "/core/away/auto_response/in_active_conv", vbox);
1627 if (!gaim_prefs_get_bool("/core/away/auto_response/enabled")) 1635 if (!gaim_prefs_get_bool("/core/away/auto_response/enabled"))
1628 gtk_widget_set_sensitive(hbox, FALSE); 1636 gtk_widget_set_sensitive(hbox, FALSE);
1629 1637
1630 auto_resp_pref_id = gaim_prefs_connect_callback("/core/away/auto_response/enabled", 1638 auto_resp_pref_id = gaim_prefs_connect_callback("/core/away/auto_response/enabled",
1631 auto_resp_changed_cb, hbox); 1639 auto_resp_changed_cb, hbox);
1632 */ 1640 #endif /* PREFSLASH04 */
1633 1641
1634 vbox = gaim_gtk_make_frame (ret, _("Idle")); 1642 vbox = gaim_gtk_make_frame (ret, _("Idle"));
1635 dd = gaim_gtk_prefs_dropdown(vbox, _("Idle _time reporting:"), 1643 dd = gaim_gtk_prefs_dropdown(vbox, _("Idle _time reporting:"),
1636 GAIM_PREF_STRING, "/gaim/gtk/idle/reporting_method", 1644 GAIM_PREF_STRING, "/gaim/gtk/idle/reporting_method",
1637 _("None"), "none", 1645 _("None"), "none",
2850 gaim_prefs_set_string("/core/away/default_message", default_away->name); 2858 gaim_prefs_set_string("/core/away/default_message", default_away->name);
2851 else 2859 else
2852 gaim_prefs_set_string("/core/away/default_message", ""); 2860 gaim_prefs_set_string("/core/away/default_message", "");
2853 } 2861 }
2854 2862
2863 #if 0 /* PREFSLASH04 */
2855 static GtkWidget *show_color_pref(GtkWidget *box, gboolean fgc) 2864 static GtkWidget *show_color_pref(GtkWidget *box, gboolean fgc)
2856 { 2865 {
2857 /* more stuff stolen from X-Chat */ 2866 /* more stuff stolen from X-Chat */
2858 GtkWidget *swid; 2867 GtkWidget *swid;
2859 GdkColor c; 2868 GdkColor c;
2903 gtk_widget_set_size_request(GTK_WIDGET(swid), 40, -1); 2912 gtk_widget_set_size_request(GTK_WIDGET(swid), 40, -1);
2904 gtk_box_pack_start(GTK_BOX(box), swid, FALSE, FALSE, 5); 2913 gtk_box_pack_start(GTK_BOX(box), swid, FALSE, FALSE, 5);
2905 gtk_widget_show(swid); 2914 gtk_widget_show(swid);
2906 return swid; 2915 return swid;
2907 } 2916 }
2917 #endif /* PREFSLASH04 */
2908 2918
2909 void apply_font_dlg(GtkWidget *w, GtkWidget *f) 2919 void apply_font_dlg(GtkWidget *w, GtkWidget *f)
2910 { 2920 {
2911 char *fontname, *space; 2921 char *fontname, *space;
2912 2922