Mercurial > pidgin
comparison src/proxy.h @ 6621:42fdf16f1dad
[gaim-migrate @ 7145]
Individual accounts remember the "No Proxy" setting instead of reverting
back to "Use Global Proxy Settings"
Proxy settings for individual accounts do not revert to "No Proxy" if
you open an account, don't change the proxy drop down, then save the
account.
Those two sound like the same thing, but they're different. I think.
Added the "use environmental variables" setting in a way that isn't
horrible.
We're not using that thing that splits the proxy variable into
host:port yet. I'll do that later. I would have done that
earlier, but I had to go buy a bike.
Also, I'd like to show what the environmental variables are set to
somewhere. That'll come later.
Also a patch from Robot101:
(22:10:25) Bzubhipheron: I have a patch that replaces #define WFLAG_* with
GaimMessageFlags GAIM_MESSAGE_*
(22:10:30) Bzubhipheron: (an enum in disguise)
(22:14:18) Bzubhipheron: GaimMessageFlags protrays much better typing
information than "int". most of the other #defines are gone, and glib
standardises on enums for its flags too.
(22:14:27) Bzubhipheron: (gone or going)
(22:14:45) Bzubhipheron: and it makes the prototype of my message queueing stuff prettier.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Mon, 25 Aug 2003 02:49:42 +0000 |
parents | 5239a3b4ab33 |
children | 41120df7ed94 |
comparison
equal
deleted
inserted
replaced
6620:7230e5920911 | 6621:42fdf16f1dad |
---|---|
33 { | 33 { |
34 GAIM_PROXY_USE_GLOBAL = -1, /**< Use the global proxy information. */ | 34 GAIM_PROXY_USE_GLOBAL = -1, /**< Use the global proxy information. */ |
35 GAIM_PROXY_NONE = 0, /**< No proxy. */ | 35 GAIM_PROXY_NONE = 0, /**< No proxy. */ |
36 GAIM_PROXY_HTTP, /**< HTTP proxy. */ | 36 GAIM_PROXY_HTTP, /**< HTTP proxy. */ |
37 GAIM_PROXY_SOCKS4, /**< SOCKS 4 proxy. */ | 37 GAIM_PROXY_SOCKS4, /**< SOCKS 4 proxy. */ |
38 GAIM_PROXY_SOCKS5 /**< SOCKS 5 proxy. */ | 38 GAIM_PROXY_SOCKS5, /**< SOCKS 5 proxy. */ |
39 GAIM_PROXY_USE_ENVVAR /**< Use environmental settings. */ | |
39 | 40 |
40 } GaimProxyType; | 41 } GaimProxyType; |
41 | 42 |
42 /** | 43 /** |
43 * An input condition. | 44 * An input condition. |
182 /** @name Global Proxy API */ | 183 /** @name Global Proxy API */ |
183 /**************************************************************************/ | 184 /**************************************************************************/ |
184 /*@{*/ | 185 /*@{*/ |
185 | 186 |
186 /** | 187 /** |
187 * Sets whether or not the global proxy information is from preferences. | |
188 * | |
189 * @param from_prefs @c TRUE if the info is from preferences. | |
190 */ | |
191 void gaim_global_proxy_set_from_prefs(gboolean from_prefs); | |
192 | |
193 /** | |
194 * Returns gaim's global proxy information. | 188 * Returns gaim's global proxy information. |
195 * | 189 * |
196 * @return The global proxy information. | 190 * @return The global proxy information. |
197 */ | 191 */ |
198 GaimProxyInfo *gaim_global_proxy_get_info(void); | 192 GaimProxyInfo *gaim_global_proxy_get_info(void); |
199 | |
200 /** | |
201 * Returns whether or not the current global proxy information is from | |
202 * preferences. | |
203 * | |
204 * @return @c TRUE if the info is from preferences. | |
205 */ | |
206 gboolean gaim_global_proxy_is_from_prefs(void); | |
207 | 193 |
208 /*@}*/ | 194 /*@}*/ |
209 | 195 |
210 /**************************************************************************/ | 196 /**************************************************************************/ |
211 /** @name Proxy API */ | 197 /** @name Proxy API */ |