[network-manager-applet] editor: allow appending manual DNS servers, domains in auto mode (bgo #611236)

[JiÅÃ KlimeÅ <jklimes src gnome org>]

commit ff79055c8dac924cf6bfb7bd517db36d51346015
Author: JiÅÃ KlimeÅ <jklimes redhat com>
Date:   Mon May 14 09:37:12 2012 +0200

    editor: allow appending manual DNS servers,domains in auto mode (bgo #611236)

 src/connection-editor/page-ip4.c |   11 +++++++++++
 src/connection-editor/page-ip6.c |   11 +++++++++++
 2 files changed, 22 insertions(+), 0 deletions(-)
---
diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c
index d397a10..d038b3b 100644
--- a/src/connection-editor/page-ip4.c
+++ b/src/connection-editor/page-ip4.c
@@ -244,6 +244,7 @@ method_changed (GtkComboBox *combo, gpointer user_data)
 	gboolean dhcp_enabled = FALSE;
 	gboolean routes_enabled = FALSE;
 	gboolean ip4_required_enabled = TRUE;
+	gboolean method_auto = FALSE;
 	GtkTreeIter iter;
 
 	if (gtk_combo_box_get_active_iter (priv->method, &iter)) {
@@ -255,6 +256,8 @@ method_changed (GtkComboBox *combo, gpointer user_data)
 	case IP4_METHOD_AUTO:
 		addr_enabled = FALSE;
 		dhcp_enabled = routes_enabled = TRUE;
+		dns_enabled = TRUE;
+		method_auto = TRUE;
 		break;
 	case IP4_METHOD_AUTO_ADDRESSES:
 		addr_enabled = FALSE;
@@ -290,11 +293,19 @@ method_changed (GtkComboBox *combo, gpointer user_data)
 	}
 
 	gtk_widget_set_sensitive (priv->dns_servers_label, dns_enabled);
+	if (method_auto)
+		gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_servers_label), "Additional _DNS servers:");
+	else
+		gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_servers_label), "_DNS servers:");
 	gtk_widget_set_sensitive (GTK_WIDGET (priv->dns_servers), dns_enabled);
 	if (!dns_enabled)
 		gtk_entry_set_text (priv->dns_servers, "");
 
 	gtk_widget_set_sensitive (priv->dns_searches_label, dns_enabled);
+	if (method_auto)
+		gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_searches_label), "Additional s_earch domains:");
+	else
+		gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_searches_label), "S_earch domains:");
 	gtk_widget_set_sensitive (GTK_WIDGET (priv->dns_searches), dns_enabled);
 	if (!dns_enabled)
 		gtk_entry_set_text (priv->dns_searches, "");
diff --git a/src/connection-editor/page-ip6.c b/src/connection-editor/page-ip6.c
index 41b3a39..1218676 100644
--- a/src/connection-editor/page-ip6.c
+++ b/src/connection-editor/page-ip6.c
@@ -247,6 +247,7 @@ method_changed (GtkComboBox *combo, gpointer user_data)
 	gboolean dns_enabled = FALSE;
 	gboolean routes_enabled = FALSE;
 	gboolean ip6_required_enabled = TRUE;
+	gboolean method_auto = FALSE;
 	GtkTreeIter iter;
 
 	if (gtk_combo_box_get_active_iter (priv->method, &iter)) {
@@ -258,6 +259,8 @@ method_changed (GtkComboBox *combo, gpointer user_data)
 	case IP6_METHOD_AUTO:
 		addr_enabled = FALSE;
 		routes_enabled = TRUE;
+		dns_enabled = TRUE;
+		method_auto = TRUE;
 		break;
 	case IP6_METHOD_AUTO_ADDRESSES:
 		addr_enabled = FALSE;
@@ -289,11 +292,19 @@ method_changed (GtkComboBox *combo, gpointer user_data)
 	}
 
 	gtk_widget_set_sensitive (priv->dns_servers_label, dns_enabled);
+	if (method_auto)
+		gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_servers_label), "Additional _DNS servers:");
+	else
+		gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_servers_label), "_DNS servers:");
 	gtk_widget_set_sensitive (GTK_WIDGET (priv->dns_servers), dns_enabled);
 	if (!dns_enabled)
 		gtk_entry_set_text (priv->dns_servers, "");
 
 	gtk_widget_set_sensitive (priv->dns_searches_label, dns_enabled);
+	if (method_auto)
+		gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_searches_label), "Additional s_earch domains:");
+	else
+		gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_searches_label), "S_earch domains:");
 	gtk_widget_set_sensitive (GTK_WIDGET (priv->dns_searches), dns_enabled);
 	if (!dns_enabled)
 		gtk_entry_set_text (priv->dns_searches, "");