Mercurial > pidgin.yaz

comparison pidgin/gtkprefs.c @ 31933:6b3bc0947068

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged from im.pidgin.pidgin
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 21 Apr 2011 20:36:02 +0900
parents 7281d151e492 9a7c5d242521
children 380f530c3f86
comparison
equal deleted inserted replaced
31895:8b9e9c61d061 31933:6b3bc0947068
2042 gtk_box_pack_start(GTK_BOX(vbox), prefs_proxy_frame, 0, 0, 0); 2042 gtk_box_pack_start(GTK_BOX(vbox), prefs_proxy_frame, 0, 0, 0);
2043 2043
2044 pidgin_prefs_dropdown(prefs_proxy_frame, _("Proxy t_ype:"), PURPLE_PREF_STRING, 2044 pidgin_prefs_dropdown(prefs_proxy_frame, _("Proxy t_ype:"), PURPLE_PREF_STRING,
2045 "/purple/proxy/type", 2045 "/purple/proxy/type",
2046 _("No proxy"), "none", 2046 _("No proxy"), "none",
2047 "SOCKS 4", "socks4", 2047 _("SOCKS 4"), "socks4",
2048 "SOCKS 5", "socks5", 2048 _("SOCKS 5"), "socks5",
2049 "HTTP", "http", 2049 _("Tor/Privacy (SOCKS5)"), "tor",
2050 _("HTTP"), "http",
2050 _("Use Environmental Settings"), "envvar", 2051 _("Use Environmental Settings"), "envvar",
2051 NULL); 2052 NULL);
2052 gtk_box_pack_start(GTK_BOX(prefs_proxy_frame), prefs_proxy_subframe, 0, 0, 0); 2053 gtk_box_pack_start(GTK_BOX(prefs_proxy_frame), prefs_proxy_subframe, 0, 0, 0);
2053 proxy_info = purple_global_proxy_get_info(); 2054 proxy_info = purple_global_proxy_get_info();
2054 2055