[network-manager-applet: 12/13] mobile-broadband: consolidate network password dialog code

[Dan Williams <dcbw src gnome org>]

commit 7f1e6656fe2df0668cf66b9fa475fa72948603a8
Author: Dan Williams <dcbw redhat com>
Date:   Fri Feb 19 01:55:56 2010 -0800

    mobile-broadband: consolidate network password dialog code
    
    Since BT will need it too.

 src/applet-device-cdma.c |   56 +--------------------------------------------
 src/applet-device-gsm.c  |   56 +--------------------------------------------
 src/applet-dialogs.c     |   54 ++++++++++++++++++++++++++++++++++++++++++++
 src/applet-dialogs.h     |    3 ++
 4 files changed, 61 insertions(+), 108 deletions(-)
---
diff --git a/src/applet-device-cdma.c b/src/applet-device-cdma.c
index 1473277..f0e9141 100644
--- a/src/applet-device-cdma.c
+++ b/src/applet-device-cdma.c
@@ -39,6 +39,7 @@
 #include "applet-device-cdma.h"
 #include "utils.h"
 #include "mobile-wizard.h"
+#include "applet-dialogs.h"
 
 typedef struct {
 	NMApplet *applet;
@@ -477,59 +478,6 @@ get_cdma_secrets_cb (GtkDialog *dialog,
 	destroy_cdma_dialog (info, NULL);
 }
 
-static GtkWidget *
-ask_for_password (NMDevice *device,
-                  NMConnection *connection,
-                  GtkEntry **out_secret_entry)
-{
-	GtkDialog *dialog;
-	GtkWidget *w;
-	GtkBox *box;
-	char *dev_str;
-	NMSettingConnection *s_con;
-	char *tmp;
-	const char *id;
-
-	dialog = GTK_DIALOG (gtk_dialog_new ());
-	gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-	gtk_window_set_title (GTK_WINDOW (dialog), _("Mobile broadband network password"));
-
-	w = gtk_dialog_add_button (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT);
-	w = gtk_dialog_add_button (dialog, GTK_STOCK_OK, GTK_RESPONSE_OK);
-	gtk_window_set_default (GTK_WINDOW (dialog), w);
-
-	s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
-	id = nm_setting_connection_get_id (s_con);
-	g_assert (id);
-	tmp = g_strdup_printf (_("A password is required to connect to '%s'."), id);
-	w = gtk_label_new (tmp);
-	g_free (tmp);
-	gtk_box_pack_start (GTK_BOX (dialog->vbox), w, TRUE, TRUE, 0);
-
-	dev_str = g_strdup_printf ("<b>%s</b>", utils_get_device_description (device));
-	w = gtk_label_new (NULL);
-	gtk_label_set_markup (GTK_LABEL (w), dev_str);
-	g_free (dev_str);
-	gtk_box_pack_start (GTK_BOX (dialog->vbox), w, TRUE, TRUE, 0);
-
-	w = gtk_alignment_new (0.5, 0.5, 0, 1.0);
-	gtk_box_pack_start (GTK_BOX (dialog->vbox), w, TRUE, TRUE, 0);
-
-	box = GTK_BOX (gtk_hbox_new (FALSE, 6));
-	gtk_container_set_border_width (GTK_CONTAINER (box), 6);
-	gtk_container_add (GTK_CONTAINER (w), GTK_WIDGET (box));
-
-	gtk_box_pack_start (box, gtk_label_new (_("Password:")), FALSE, FALSE, 0);
-
-	w = gtk_entry_new ();
-	*out_secret_entry = GTK_ENTRY (w);
-	gtk_entry_set_activates_default (GTK_ENTRY (w), TRUE);
-	gtk_box_pack_start (box, w, FALSE, FALSE, 0);
-
-	gtk_widget_show_all (dialog->vbox);
-	return GTK_WIDGET (dialog);
-}
-
 static gboolean
 cdma_get_secrets (NMDevice *device,
                   NMSettingsConnectionInterface *connection,
@@ -555,7 +503,7 @@ cdma_get_secrets (NMDevice *device,
 	}
 
 	if (!strcmp (hints[0], NM_SETTING_CDMA_PASSWORD))
-		widget = ask_for_password (device, NM_CONNECTION (connection), &secret_entry);
+		widget = applet_mobile_password_dialog_new (device, NM_CONNECTION (connection), &secret_entry);
 	else {
 		g_set_error (error,
 		             NM_SETTINGS_INTERFACE_ERROR,
diff --git a/src/applet-device-gsm.c b/src/applet-device-gsm.c
index 31575e9..89f006e 100644
--- a/src/applet-device-gsm.c
+++ b/src/applet-device-gsm.c
@@ -40,6 +40,7 @@
 #include "applet-device-gsm.h"
 #include "utils.h"
 #include "mobile-wizard.h"
+#include "applet-dialogs.h"
 
 typedef struct {
 	NMApplet *applet;
@@ -623,59 +624,6 @@ ask_for_pin_puk (NMDevice *device,
 	return GTK_WIDGET (dialog);
 }
 
-static GtkWidget *
-ask_for_password (NMDevice *device,
-                  NMConnection *connection,
-                  GtkEntry **out_secret_entry)
-{
-	GtkDialog *dialog;
-	GtkWidget *w;
-	GtkBox *box;
-	char *dev_str;
-	NMSettingConnection *s_con;
-	char *tmp;
-	const char *id;
-
-	dialog = GTK_DIALOG (gtk_dialog_new ());
-	gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-	gtk_window_set_title (GTK_WINDOW (dialog), _("Mobile broadband network password"));
-
-	w = gtk_dialog_add_button (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT);
-	w = gtk_dialog_add_button (dialog, GTK_STOCK_OK, GTK_RESPONSE_OK);
-	gtk_window_set_default (GTK_WINDOW (dialog), w);
-
-	s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
-	id = nm_setting_connection_get_id (s_con);
-	g_assert (id);
-	tmp = g_strdup_printf (_("A password is required to connect to '%s'."), id);
-	w = gtk_label_new (tmp);
-	g_free (tmp);
-	gtk_box_pack_start (GTK_BOX (dialog->vbox), w, TRUE, TRUE, 0);
-
-	dev_str = g_strdup_printf ("<b>%s</b>", utils_get_device_description (device));
-	w = gtk_label_new (NULL);
-	gtk_label_set_markup (GTK_LABEL (w), dev_str);
-	g_free (dev_str);
-	gtk_box_pack_start (GTK_BOX (dialog->vbox), w, TRUE, TRUE, 0);
-
-	w = gtk_alignment_new (0.5, 0.5, 0, 1.0);
-	gtk_box_pack_start (GTK_BOX (dialog->vbox), w, TRUE, TRUE, 0);
-
-	box = GTK_BOX (gtk_hbox_new (FALSE, 6));
-	gtk_container_set_border_width (GTK_CONTAINER (box), 6);
-	gtk_container_add (GTK_CONTAINER (w), GTK_WIDGET (box));
-
-	gtk_box_pack_start (box, gtk_label_new (_("Password:")), FALSE, FALSE, 0);
-
-	w = gtk_entry_new ();
-	*out_secret_entry = GTK_ENTRY (w);
-	gtk_entry_set_activates_default (GTK_ENTRY (w), TRUE);
-	gtk_box_pack_start (box, w, FALSE, FALSE, 0);
-
-	gtk_widget_show_all (dialog->vbox);
-	return GTK_WIDGET (dialog);
-}
-
 static gboolean
 gsm_get_secrets (NMDevice *device,
                  NMSettingsConnectionInterface *connection,
@@ -704,7 +652,7 @@ gsm_get_secrets (NMDevice *device,
 	    || !strcmp (hints[0], NM_SETTING_GSM_PUK))
 		widget = ask_for_pin_puk (device, NM_CONNECTION (connection), hints[0], &secret_entry);
 	else if (!strcmp (hints[0], NM_SETTING_GSM_PASSWORD))
-		widget = ask_for_password (device, NM_CONNECTION (connection), &secret_entry);
+		widget = applet_mobile_password_dialog_new (device, NM_CONNECTION (connection), &secret_entry);
 	else {
 		g_set_error (error,
 		             NM_SETTINGS_INTERFACE_ERROR,
diff --git a/src/applet-dialogs.c b/src/applet-dialogs.c
index 4a93688..54251ae 100644
--- a/src/applet-dialogs.c
+++ b/src/applet-dialogs.c
@@ -42,6 +42,7 @@
 #include <glib/gi18n.h>
 
 #include "applet-dialogs.h"
+#include "utils.h"
 
 
 static void
@@ -702,3 +703,56 @@ applet_warning_dialog_show (const char *message)
 	return dialog;
 }
 
+GtkWidget *
+applet_mobile_password_dialog_new (NMDevice *device,
+                                   NMConnection *connection,
+                                   GtkEntry **out_secret_entry)
+{
+	GtkDialog *dialog;
+	GtkWidget *w;
+	GtkBox *box;
+	char *dev_str;
+	NMSettingConnection *s_con;
+	char *tmp;
+	const char *id;
+
+	dialog = GTK_DIALOG (gtk_dialog_new ());
+	gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+	gtk_window_set_title (GTK_WINDOW (dialog), _("Mobile broadband network password"));
+
+	w = gtk_dialog_add_button (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT);
+	w = gtk_dialog_add_button (dialog, GTK_STOCK_OK, GTK_RESPONSE_OK);
+	gtk_window_set_default (GTK_WINDOW (dialog), w);
+
+	s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
+	id = nm_setting_connection_get_id (s_con);
+	g_assert (id);
+	tmp = g_strdup_printf (_("A password is required to connect to '%s'."), id);
+	w = gtk_label_new (tmp);
+	g_free (tmp);
+	gtk_box_pack_start (GTK_BOX (dialog->vbox), w, TRUE, TRUE, 0);
+
+	dev_str = g_strdup_printf ("<b>%s</b>", utils_get_device_description (device));
+	w = gtk_label_new (NULL);
+	gtk_label_set_markup (GTK_LABEL (w), dev_str);
+	g_free (dev_str);
+	gtk_box_pack_start (GTK_BOX (dialog->vbox), w, TRUE, TRUE, 0);
+
+	w = gtk_alignment_new (0.5, 0.5, 0, 1.0);
+	gtk_box_pack_start (GTK_BOX (dialog->vbox), w, TRUE, TRUE, 0);
+
+	box = GTK_BOX (gtk_hbox_new (FALSE, 6));
+	gtk_container_set_border_width (GTK_CONTAINER (box), 6);
+	gtk_container_add (GTK_CONTAINER (w), GTK_WIDGET (box));
+
+	gtk_box_pack_start (box, gtk_label_new (_("Password:")), FALSE, FALSE, 0);
+
+	w = gtk_entry_new ();
+	*out_secret_entry = GTK_ENTRY (w);
+	gtk_entry_set_activates_default (GTK_ENTRY (w), TRUE);
+	gtk_box_pack_start (box, w, FALSE, FALSE, 0);
+
+	gtk_widget_show_all (dialog->vbox);
+	return GTK_WIDGET (dialog);
+}
+
diff --git a/src/applet-dialogs.h b/src/applet-dialogs.h
index 7dff515..fcf54eb 100644
--- a/src/applet-dialogs.h
+++ b/src/applet-dialogs.h
@@ -33,5 +33,8 @@ void applet_about_dialog_show (NMApplet *applet);
 
 GtkWidget *applet_warning_dialog_show (const char *message);
 
+GtkWidget *applet_mobile_password_dialog_new (NMDevice *device,
+                                              NMConnection *connection,
+                                              GtkEntry **out_secret_entry);
 
 #endif /* __APPLET_DIALOGS_H__ */