Mercurial > pidgin
comparison src/gtkprefs.c @ 11878:f672349cfc1c
[gaim-migrate @ 14169]
Use GNOME proxy preferences.
Works For Me. People are going to go crazy.
We'll try it out in beta.
committer: Tailor Script <tailor@pidgin.im>
author | Sean Egan <seanegan@gmail.com> |
---|---|
date | Fri, 28 Oct 2005 23:12:04 +0000 |
parents | 60fcaea41fc0 |
children | 7d2d926704aa |
comparison
equal
deleted
inserted
replaced
11877:f1f7c83d7b6c | 11878:f672349cfc1c |
---|---|
994 if (!gaim_prefs_get_bool("/core/network/ports_range_use")) | 994 if (!gaim_prefs_get_bool("/core/network/ports_range_use")) |
995 gtk_widget_set_sensitive(GTK_WIDGET(spin_button), FALSE); | 995 gtk_widget_set_sensitive(GTK_WIDGET(spin_button), FALSE); |
996 g_signal_connect(G_OBJECT(ports_checkbox), "clicked", | 996 g_signal_connect(G_OBJECT(ports_checkbox), "clicked", |
997 G_CALLBACK(gaim_gtk_toggle_sensitive), spin_button); | 997 G_CALLBACK(gaim_gtk_toggle_sensitive), spin_button); |
998 | 998 |
999 vbox = gaim_gtk_make_frame(ret, _("Proxy Server")); | 999 if (!gaim_running_gnome()) { |
1000 prefs_proxy_frame = gtk_vbox_new(FALSE, 0); | 1000 vbox = gaim_gtk_make_frame(ret, _("Proxy Server")); |
1001 gaim_gtk_prefs_dropdown(vbox, _("Proxy _type:"), GAIM_PREF_STRING, | 1001 prefs_proxy_frame = gtk_vbox_new(FALSE, 0); |
1002 "/core/proxy/type", | 1002 gaim_gtk_prefs_dropdown(vbox, _("Proxy _type:"), GAIM_PREF_STRING, |
1003 _("No proxy"), "none", | 1003 "/core/proxy/type", |
1004 "SOCKS 4", "socks4", | 1004 _("No proxy"), "none", |
1005 "SOCKS 5", "socks5", | 1005 "SOCKS 4", "socks4", |
1006 "HTTP", "http", | 1006 "SOCKS 5", "socks5", |
1007 _("Use Environmental Settings"), "envvar", | 1007 "HTTP", "http", |
1008 NULL); | 1008 _("Use Environmental Settings"), "envvar", |
1009 gtk_box_pack_start(GTK_BOX(vbox), prefs_proxy_frame, 0, 0, 0); | 1009 NULL); |
1010 proxy_info = gaim_global_proxy_get_info(); | 1010 gtk_box_pack_start(GTK_BOX(vbox), prefs_proxy_frame, 0, 0, 0); |
1011 | 1011 proxy_info = gaim_global_proxy_get_info(); |
1012 gaim_prefs_connect_callback(prefs, "/core/proxy/type", | 1012 |
1013 proxy_changed_cb, prefs_proxy_frame); | 1013 gaim_prefs_connect_callback(prefs, "/core/proxy/type", |
1014 | 1014 proxy_changed_cb, prefs_proxy_frame); |
1015 table = gtk_table_new(4, 2, FALSE); | 1015 |
1016 gtk_container_set_border_width(GTK_CONTAINER(table), 0); | 1016 table = gtk_table_new(4, 2, FALSE); |
1017 gtk_table_set_col_spacings(GTK_TABLE(table), 5); | 1017 gtk_container_set_border_width(GTK_CONTAINER(table), 0); |
1018 gtk_table_set_row_spacings(GTK_TABLE(table), 10); | 1018 gtk_table_set_col_spacings(GTK_TABLE(table), 5); |
1019 gtk_container_add(GTK_CONTAINER(prefs_proxy_frame), table); | 1019 gtk_table_set_row_spacings(GTK_TABLE(table), 10); |
1020 | 1020 gtk_container_add(GTK_CONTAINER(prefs_proxy_frame), table); |
1021 | 1021 |
1022 label = gtk_label_new_with_mnemonic(_("_Host:")); | 1022 |
1023 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); | 1023 label = gtk_label_new_with_mnemonic(_("_Host:")); |
1024 gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); | 1024 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); |
1025 | 1025 gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); |
1026 entry = gtk_entry_new(); | 1026 |
1027 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); | 1027 entry = gtk_entry_new(); |
1028 gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 0, 1, GTK_FILL, 0, 0, 0); | 1028 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); |
1029 g_signal_connect(G_OBJECT(entry), "changed", | 1029 gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 0, 1, GTK_FILL, 0, 0, 0); |
1030 G_CALLBACK(proxy_print_option), (void *)PROXYHOST); | 1030 g_signal_connect(G_OBJECT(entry), "changed", |
1031 | 1031 G_CALLBACK(proxy_print_option), (void *)PROXYHOST); |
1032 if (proxy_info != NULL && gaim_proxy_info_get_host(proxy_info)) | 1032 |
1033 gtk_entry_set_text(GTK_ENTRY(entry), | 1033 if (proxy_info != NULL && gaim_proxy_info_get_host(proxy_info)) |
1034 gaim_proxy_info_get_host(proxy_info)); | 1034 gtk_entry_set_text(GTK_ENTRY(entry), |
1035 | 1035 gaim_proxy_info_get_host(proxy_info)); |
1036 hbox = gtk_hbox_new(TRUE, 5); | 1036 |
1037 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); | 1037 hbox = gtk_hbox_new(TRUE, 5); |
1038 gaim_set_accessible_label (entry, label); | 1038 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); |
1039 | 1039 gaim_set_accessible_label (entry, label); |
1040 label = gtk_label_new_with_mnemonic(_("_Port:")); | 1040 |
1041 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); | 1041 label = gtk_label_new_with_mnemonic(_("_Port:")); |
1042 gtk_table_attach(GTK_TABLE(table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); | 1042 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); |
1043 | 1043 gtk_table_attach(GTK_TABLE(table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); |
1044 entry = gtk_entry_new(); | 1044 |
1045 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); | 1045 entry = gtk_entry_new(); |
1046 gtk_table_attach(GTK_TABLE(table), entry, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); | 1046 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); |
1047 g_signal_connect(G_OBJECT(entry), "changed", | 1047 gtk_table_attach(GTK_TABLE(table), entry, 3, 4, 0, 1, GTK_FILL, 0, 0, 0); |
1048 G_CALLBACK(proxy_print_option), (void *)PROXYPORT); | 1048 g_signal_connect(G_OBJECT(entry), "changed", |
1049 | 1049 G_CALLBACK(proxy_print_option), (void *)PROXYPORT); |
1050 if (proxy_info != NULL && gaim_proxy_info_get_port(proxy_info) != 0) { | 1050 |
1051 char buf[128]; | 1051 if (proxy_info != NULL && gaim_proxy_info_get_port(proxy_info) != 0) { |
1052 g_snprintf(buf, sizeof(buf), "%d", | 1052 char buf[128]; |
1053 g_snprintf(buf, sizeof(buf), "%d", | |
1053 gaim_proxy_info_get_port(proxy_info)); | 1054 gaim_proxy_info_get_port(proxy_info)); |
1054 | 1055 |
1055 gtk_entry_set_text(GTK_ENTRY(entry), buf); | 1056 gtk_entry_set_text(GTK_ENTRY(entry), buf); |
1056 } | 1057 } |
1057 gaim_set_accessible_label (entry, label); | 1058 gaim_set_accessible_label (entry, label); |
1058 | 1059 |
1059 label = gtk_label_new_with_mnemonic(_("_User:")); | 1060 label = gtk_label_new_with_mnemonic(_("_User:")); |
1060 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); | 1061 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); |
1061 gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0); | 1062 gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0); |
1062 | 1063 |
1063 entry = gtk_entry_new(); | 1064 entry = gtk_entry_new(); |
1064 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); | 1065 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); |
1065 gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 1, 2, GTK_FILL, 0, 0, 0); | 1066 gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 1, 2, GTK_FILL, 0, 0, 0); |
1066 g_signal_connect(G_OBJECT(entry), "changed", | 1067 g_signal_connect(G_OBJECT(entry), "changed", |
1067 G_CALLBACK(proxy_print_option), (void *)PROXYUSER); | 1068 G_CALLBACK(proxy_print_option), (void *)PROXYUSER); |
1068 | 1069 |
1069 if (proxy_info != NULL && gaim_proxy_info_get_username(proxy_info) != NULL) | 1070 if (proxy_info != NULL && gaim_proxy_info_get_username(proxy_info) != NULL) |
1070 gtk_entry_set_text(GTK_ENTRY(entry), | 1071 gtk_entry_set_text(GTK_ENTRY(entry), |
1071 gaim_proxy_info_get_username(proxy_info)); | 1072 gaim_proxy_info_get_username(proxy_info)); |
1072 | 1073 |
1073 hbox = gtk_hbox_new(TRUE, 5); | 1074 hbox = gtk_hbox_new(TRUE, 5); |
1074 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); | 1075 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); |
1075 gaim_set_accessible_label (entry, label); | 1076 gaim_set_accessible_label (entry, label); |
1076 | 1077 |
1077 label = gtk_label_new_with_mnemonic(_("Pa_ssword:")); | 1078 label = gtk_label_new_with_mnemonic(_("Pa_ssword:")); |
1078 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); | 1079 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); |
1079 gtk_table_attach(GTK_TABLE(table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); | 1080 gtk_table_attach(GTK_TABLE(table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0); |
1080 | 1081 |
1081 entry = gtk_entry_new(); | 1082 entry = gtk_entry_new(); |
1082 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); | 1083 gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); |
1083 gtk_table_attach(GTK_TABLE(table), entry, 3, 4, 1, 2, GTK_FILL , 0, 0, 0); | 1084 gtk_table_attach(GTK_TABLE(table), entry, 3, 4, 1, 2, GTK_FILL , 0, 0, 0); |
1084 gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); | 1085 gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); |
1085 g_signal_connect(G_OBJECT(entry), "changed", | 1086 g_signal_connect(G_OBJECT(entry), "changed", |
1086 G_CALLBACK(proxy_print_option), (void *)PROXYPASS); | 1087 G_CALLBACK(proxy_print_option), (void *)PROXYPASS); |
1087 | 1088 |
1088 if (proxy_info != NULL && gaim_proxy_info_get_password(proxy_info) != NULL) | 1089 if (proxy_info != NULL && gaim_proxy_info_get_password(proxy_info) != NULL) |
1089 gtk_entry_set_text(GTK_ENTRY(entry), | 1090 gtk_entry_set_text(GTK_ENTRY(entry), |
1090 gaim_proxy_info_get_password(proxy_info)); | 1091 gaim_proxy_info_get_password(proxy_info)); |
1091 gaim_set_accessible_label (entry, label); | 1092 gaim_set_accessible_label (entry, label); |
1093 } | |
1092 | 1094 |
1093 gtk_widget_show_all(ret); | 1095 gtk_widget_show_all(ret); |
1094 if (proxy_info == NULL || | 1096 if (proxy_info == NULL || |
1095 gaim_proxy_info_get_type(proxy_info) == GAIM_PROXY_NONE || | 1097 gaim_proxy_info_get_type(proxy_info) == GAIM_PROXY_NONE || |
1096 gaim_proxy_info_get_type(proxy_info) == GAIM_PROXY_USE_ENVVAR) | 1098 gaim_proxy_info_get_type(proxy_info) == GAIM_PROXY_USE_ENVVAR) |