Mercurial > pidgin
changeset 18226:5cfa2e63d2fd
merge of '5c5738f443887f7024ff8eab573392f8795b9413'
and 'd2f50519c5ed668dd980277afdc25d71ccb8a852'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Fri, 22 Jun 2007 17:26:16 +0000 |
| parents | 4b5fed5cb038 (current diff) a573a67c80a4 (diff) |
| children | cbc89a49e43b d1f28d545d96 |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkprefs.c Thu Jun 21 19:25:55 2007 +0000 +++ b/pidgin/gtkprefs.c Fri Jun 22 17:26:16 2007 +0000 @@ -1214,9 +1214,10 @@ } gtk_widget_show_all(ret); - if (proxy_info == NULL || + /* Only hide table if not running gnome otherwise we hide the IP address table! */ + if (!purple_running_gnome() && (proxy_info == NULL || purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_NONE || - purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_USE_ENVVAR) + purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_USE_ENVVAR)) gtk_widget_hide(table); return ret; }