diff options
| author | Milan Crha <mcrha@redhat.com> | 2009-02-09 18:59:29 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2009-02-09 18:59:29 +0800 |
| commit | f44568a253d5c798c71469b6e7d6fca905c0c356 (patch) | |
| tree | 1a02d2034585a656c8db9aba345ab45322636214 /mail/mail-config.glade | |
| parent | de1b9c79794d17fd5d953de81e24c7c1beadffbc (diff) | |
| download | gsoc2013-evolution-f44568a253d5c798c71469b6e7d6fca905c0c356.tar gsoc2013-evolution-f44568a253d5c798c71469b6e7d6fca905c0c356.tar.gz gsoc2013-evolution-f44568a253d5c798c71469b6e7d6fca905c0c356.tar.bz2 gsoc2013-evolution-f44568a253d5c798c71469b6e7d6fca905c0c356.tar.lz gsoc2013-evolution-f44568a253d5c798c71469b6e7d6fca905c0c356.tar.xz gsoc2013-evolution-f44568a253d5c798c71469b6e7d6fca905c0c356.tar.zst gsoc2013-evolution-f44568a253d5c798c71469b6e7d6fca905c0c356.zip | |
** Part of fix for bug #555888
2009-02-09 Milan Crha <mcrha@redhat.com>
** Part of fix for bug #555888
* mail-config.glade:
* em-network-prefs.h: (struct _EMNetworkPrefs):
* em-network-prefs.c: (emnp_parse_ignore_hosts),
(emnp_load_sys_settings), (notify_proxy_type_changed),
(em_network_prefs_construct):
Do not overwrite user settings with system proxy settings.
Register signals at the end, when all widgets are read.
Hide socks settings, it is not used at the moment.
* em-utils.h: (em_utils_get_proxy_uri):
* em-utils.c: (em_utils_get_proxy_uri), (emu_proxy_setup):
* em-format-html.c: (emfh_gethttp):
Use proxy configurable within Evolution.
svn path=/trunk/; revision=37236
Diffstat (limited to 'mail/mail-config.glade')
| -rw-r--r-- | mail/mail-config.glade | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mail/mail-config.glade b/mail/mail-config.glade index c2216271d7..de881e40e5 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -9329,7 +9329,7 @@ for display purposes only. </property> </packing> </child> - <child> + <!--<child> <widget class="GtkLabel" id="lblSocksHost"> <property name="visible">True</property> <property name="label" translatable="yes">S_OCKS Host:</property> @@ -9356,7 +9356,7 @@ for display purposes only. </property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> - </child> + </child>--> <child> <widget class="GtkLabel" id="lblIgnoreHosts"> @@ -9429,7 +9429,7 @@ for display purposes only. </property> </packing> </child> - <child> + <!--<child> <widget class="GtkEntry" id="txtSocksHost"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -9448,7 +9448,7 @@ for display purposes only. </property> <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> - </child> + </child>--> <child> <widget class="GtkLabel" id="lblHttpPort"> @@ -9506,7 +9506,7 @@ for display purposes only. </property> </packing> </child> - <child> + <!--<child> <widget class="GtkLabel" id="lblSocksPort"> <property name="visible">True</property> <property name="label" translatable="yes">Port:</property> @@ -9532,7 +9532,7 @@ for display purposes only. </property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> - </child> + </child>--> <child> <widget class="GtkSpinButton" id="spnHttpPort"> @@ -9576,7 +9576,7 @@ for display purposes only. </property> </packing> </child> - <child> + <!--<child> <widget class="GtkSpinButton" id="spnSocksPort"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -9595,7 +9595,7 @@ for display purposes only. </property> <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> - </child> + </child>--> <child> <widget class="GtkEntry" id="txtIgnoreHosts"> |