evolution r37235 - trunk/mail

[mcrha svn gnome org]

Author: mcrha
Date: Mon Feb  9 10:43:31 2009
New Revision: 37235
URL: http://svn.gnome.org/viewvc/evolution?rev=37235&view=rev

Log:
2009-02-09  Milan Crha  <mcrha redhat com>

	** Fix for bug #548623

	* mail-config.glade:
	* em-network-prefs.h:
	* em-network-prefs.c: (emnp_set_sensitiveness),
	(emnp_load_sys_settings), (notify_proxy_type_changed),
	(em_network_prefs_construct), (emnp_set_markups):
	No auto-proxy at the moment.



Modified:
   trunk/mail/ChangeLog
   trunk/mail/em-network-prefs.c
   trunk/mail/em-network-prefs.h
   trunk/mail/mail-config.glade

Modified: trunk/mail/em-network-prefs.c
==============================================================================
--- trunk/mail/em-network-prefs.c	(original)
+++ trunk/mail/em-network-prefs.c	Mon Feb  9 10:43:31 2009
@@ -186,10 +186,13 @@
 static void
 emnp_set_sensitiveness (EMNetworkPrefs *prefs, NetworkConfigProxyType type, gboolean sensitivity)
 {
+#if 0
 	if (type == NETWORK_PROXY_AUTOCONFIG) {
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->auto_proxy_url, sensitivity);
 		d(g_print ("Setting sensitivity of autoconfig to: %d\n", sensitivity));
-	} else if (type == NETWORK_PROXY_MANUAL) {
+	} else
+#endif	
+	if (type == NETWORK_PROXY_MANUAL) {
 		gboolean state; 
 
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->http_host, sensitivity);
@@ -266,9 +269,11 @@
 	gconf_client_set_string (gconf, GCONF_E_SOCKS_HOST_KEY, buf, NULL);
 	g_free (buf);
 
+#if 0
 	buf = gconf_client_get_string (gconf, GCONF_SYS_AUTOCONFIG_URL_KEY, NULL);
 	gconf_client_set_string (gconf, GCONF_E_AUTOCONFIG_URL_KEY, buf, NULL);
 	g_free (buf);
+#endif
 
 	buf = gconf_client_get_string (gconf, GCONF_SYS_AUTH_USER_KEY, NULL);
 	gconf_client_set_string (gconf, GCONF_E_AUTH_USER_KEY, buf, NULL);
@@ -313,7 +318,11 @@
 	else if (gtk_toggle_button_get_active (prefs->manual_proxy))
 		type = NETWORK_PROXY_MANUAL;
 	else
+#if 0
 		type = NETWORK_PROXY_AUTOCONFIG;
+#else
+		type = NETWORK_PROXY_SYS_SETTINGS;
+#endif
 
 	gconf_client_set_int (prefs->gconf, "/apps/evolution/shell/network_config/proxy_type", type, NULL);
 
@@ -385,7 +394,9 @@
 	gtk_label_set_use_markup (GTK_LABEL (GTK_BIN(prefs->sys_proxy)->child), TRUE);
 	gtk_label_set_use_markup (GTK_LABEL (GTK_BIN(prefs->no_proxy)->child), TRUE);
 	gtk_label_set_use_markup (GTK_LABEL (GTK_BIN(prefs->manual_proxy)->child), TRUE);
+#if 0
 	gtk_label_set_use_markup (GTK_LABEL (GTK_BIN(prefs->auto_proxy)->child), TRUE);
+#endif
 }
 
 static void
@@ -430,6 +441,11 @@
 	locked = !gconf_client_key_is_writable (prefs->gconf, GCONF_E_PROXY_TYPE_KEY, NULL);
 
 	val = gconf_client_get_int (prefs->gconf, GCONF_E_PROXY_TYPE_KEY, NULL);
+
+	/* no auto-proxy at the moment */
+	if (val == NETWORK_PROXY_AUTOCONFIG)
+		val = NETWORK_PROXY_SYS_SETTINGS;
+
 	prefs->sys_proxy = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "rdoSysSettings"));
 	gtk_toggle_button_set_active (prefs->sys_proxy, val == NETWORK_PROXY_SYS_SETTINGS);
 	g_signal_connect (prefs->sys_proxy, "toggled", G_CALLBACK (notify_proxy_type_changed), prefs);
@@ -446,15 +462,18 @@
 
 	d(g_print ("No proxy settings ----!!! \n"));
 
+	/* no auto-proxy at the moment */
+#if 0
 	prefs->auto_proxy = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "rdoAutoConfig"));
 	prefs->auto_proxy_url = GTK_ENTRY (glade_xml_get_widget (gui, "txtAutoConfigUrl"));
+
 	gtk_toggle_button_set_active (prefs->auto_proxy, val == NETWORK_PROXY_AUTOCONFIG);
 
 	g_signal_connect (prefs->auto_proxy, "toggled", G_CALLBACK (notify_proxy_type_changed), prefs);
 	g_signal_connect(prefs->auto_proxy_url, "changed", G_CALLBACK(widget_entry_changed_cb), GCONF_E_AUTOCONFIG_URL_KEY);
-
 	if (locked)
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->auto_proxy, FALSE);
+#endif
 
 	d(g_print ("Auto config settings ----!!! \n"));
 

Modified: trunk/mail/em-network-prefs.h
==============================================================================
--- trunk/mail/em-network-prefs.h	(original)
+++ trunk/mail/em-network-prefs.h	Mon Feb  9 10:43:31 2009
@@ -63,14 +63,18 @@
 	struct _GtkToggleButton *sys_proxy;
 	struct _GtkToggleButton *no_proxy;
 	struct _GtkToggleButton *manual_proxy;
+#if 0
 	struct _GtkToggleButton *auto_proxy;
+#endif
 	struct _GtkToggleButton *use_auth;
 
 	struct _GtkEntry *http_host;
 	struct _GtkEntry *https_host;
 	struct _GtkEntry *socks_host;
 	struct _GtkEntry *ignore_hosts;
+#if 0
 	struct _GtkEntry *auto_proxy_url;
+#endif
 	struct _GtkEntry *auth_user;
 	struct _GtkEntry *auth_pwd;
 

Modified: trunk/mail/mail-config.glade
==============================================================================
--- trunk/mail/mail-config.glade	(original)
+++ trunk/mail/mail-config.glade	Mon Feb  9 10:43:31 2009
@@ -9781,7 +9781,7 @@
 		    </packing>
 		  </child>
 
-		  <child>
+		  <!-- <child>
 		    <widget class="GtkRadioButton" id="rdoAutoConfig">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
@@ -9832,7 +9832,7 @@
 		      <property name="expand">False</property>
 		      <property name="fill">True</property>
 		    </packing>
-		  </child>
+		  </child> -->
 		</widget>
 		<packing>
 		  <property name="padding">0</property>