[network-manager-applet] editor: remove PUK handling



commit ebbde00d324bc2a2ff0a02cf10c5e91f4a1dd80a
Author: Dan Williams <dcbw redhat com>
Date:   Mon Sep 21 13:28:53 2009 -0700

    editor: remove PUK handling
    
    PUK handling is dangerous enough that it should be out-of-band in the
    applet only, when needed, and not stored around in the keyring.

 src/connection-editor/ce-page-mobile.glade |   29 ----------------------------
 src/connection-editor/page-mobile.c        |   14 -------------
 2 files changed, 0 insertions(+), 43 deletions(-)
---
diff --git a/src/connection-editor/ce-page-mobile.glade b/src/connection-editor/ce-page-mobile.glade
index 92508b5..386c69f 100644
--- a/src/connection-editor/ce-page-mobile.glade
+++ b/src/connection-editor/ce-page-mobile.glade
@@ -292,35 +292,6 @@ Prefer 2G (GPRS/EDGE)</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label34">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">PU_K:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">mobile_puk</property>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">5</property>
-                        <property name="bottom_attach">6</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkEntry" id="mobile_puk">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="visibility">False</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">5</property>
-                        <property name="bottom_attach">6</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
                       <widget class="GtkHBox" id="hbox2">
                         <property name="visible">True</property>
                         <property name="spacing">6</property>
diff --git a/src/connection-editor/page-mobile.c b/src/connection-editor/page-mobile.c
index 1789765..ebe081f 100644
--- a/src/connection-editor/page-mobile.c
+++ b/src/connection-editor/page-mobile.c
@@ -55,7 +55,6 @@ typedef struct {
 	GtkComboBox *network_type;
 	GtkComboBox *band;
 	GtkEntry *pin;
-	GtkEntry *puk;
 
 	GtkWindowGroup *window_group;
 	gboolean window_added;
@@ -88,7 +87,6 @@ mobile_private_init (CEPageMobile *self)
 	priv->band = GTK_COMBO_BOX (glade_xml_get_widget (xml, "mobile_band"));
 
 	priv->pin = GTK_ENTRY (glade_xml_get_widget (xml, "mobile_pin"));
-	priv->puk = GTK_ENTRY (glade_xml_get_widget (xml, "mobile_puk"));
 
 	priv->window_group = gtk_window_group_new ();
 }
@@ -187,15 +185,6 @@ populate_gsm_ui (CEPageMobile *self, NMConnection *connection)
 			gtk_entry_set_text (priv->pin, g_value_get_string (value));
 	}
 
-	s = nm_setting_gsm_get_puk (setting);
-	if (s)
-		gtk_entry_set_text (priv->pin, s);
-	else if (secrets) {
-		value = g_hash_table_lookup (secrets, NM_SETTING_GSM_PUK);
-		if (value)
-			gtk_entry_set_text (priv->puk, g_value_get_string (value));
-	}
-
 	if (secrets)
 		g_hash_table_destroy (secrets);
 }
@@ -252,7 +241,6 @@ show_passwords (GtkToggleButton *button, gpointer user_data)
 
 	gtk_entry_set_visibility (priv->password, active);
 	gtk_entry_set_visibility (priv->pin, active);
-	gtk_entry_set_visibility (priv->puk, active);
 }
 
 static void
@@ -338,7 +326,6 @@ finish_setup (CEPageMobile *self, gpointer unused, GError *error, gpointer user_
 	g_signal_connect (priv->network_id, "changed", G_CALLBACK (stuff_changed), self);
 	g_signal_connect (priv->network_type, "changed", G_CALLBACK (stuff_changed), self);
 	g_signal_connect (priv->pin, "changed", G_CALLBACK (stuff_changed), self);
-	g_signal_connect (priv->puk, "changed", G_CALLBACK (stuff_changed), self);
 
 	g_signal_connect (glade_xml_get_widget (parent->xml, "mobile_show_passwords"),
 	                  "toggled",
@@ -446,7 +433,6 @@ gsm_ui_to_setting (CEPageMobile *self)
 				  NM_SETTING_GSM_NETWORK_ID, nm_entry_get_text (priv->network_id),
 				  NM_SETTING_GSM_NETWORK_TYPE, net_type,
 				  NM_SETTING_GSM_PIN, nm_entry_get_text (priv->pin),
-				  NM_SETTING_GSM_PUK, nm_entry_get_text (priv->puk),
 				  NULL);
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]