diff -up nm-applet-0.7.0/src/connection-editor/ce-page-mobile.glade.applet-cid-fix nm-applet-0.7.0/src/connection-editor/ce-page-mobile.glade
--- nm-applet-0.7.0/src/connection-editor/ce-page-mobile.glade.applet-cid-fix 2008-04-14 19:35:21.000000000 +0200
+++ nm-applet-0.7.0/src/connection-editor/ce-page-mobile.glade 2008-07-28 16:32:02.000000000 +0200
@@ -285,7 +288,7 @@
True
- 6
+ 7
2
False
6
@@ -312,8 +315,8 @@
0
1
- 0
- 1
+ 1
+ 2
fill
@@ -328,8 +331,8 @@
1
2
- 0
- 1
+ 1
+ 2
@@ -360,8 +364,8 @@
0
1
- 1
- 2
+ 2
+ 3
fill
@@ -376,8 +380,8 @@
1
2
- 1
- 2
+ 2
+ 3
@@ -408,8 +413,8 @@
0
1
- 2
- 3
+ 3
+ 4
fill
@@ -429,8 +434,8 @@ Prefer GSM
1
2
- 2
- 3
+ 3
+ 4
fill
fill
@@ -457,8 +462,8 @@ Prefer GSM
0
1
- 3
- 4
+ 4
+ 5
fill
@@ -473,8 +478,8 @@ Prefer GSM
1
2
- 3
- 4
+ 4
+ 5
fill
fill
@@ -501,8 +506,8 @@ Prefer GSM
0
1
- 4
- 5
+ 5
+ 6
fill
@@ -517,8 +522,8 @@ Prefer GSM
1
2
- 4
- 5
+ 5
+ 6
@@ -549,8 +555,8 @@ Prefer GSM
0
1
- 5
- 6
+ 6
+ 7
fill
@@ -565,8 +571,57 @@ Prefer GSM
1
2
- 5
- 6
+ 6
+ 7
+
+
+
+
+
+
+ True
+ CID:
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ 1
+ 0
+ 1
+ fill
+
+
+
+
+
+
+ True
+ True
+ 1
+ 0
+ True
+ GTK_UPDATE_ALWAYS
+ False
+ False
+ 1 1 16 1 1 1
+
+
+ 1
+ 2
+ 0
+ 1
diff -up nm-applet-0.7.0/src/connection-editor/page-mobile.c.applet-cid-fix nm-applet-0.7.0/src/connection-editor/page-mobile.c
--- nm-applet-0.7.0/src/connection-editor/page-mobile.c.applet-cid-fix 2008-06-26 20:31:13.000000000 +0200
+++ nm-applet-0.7.0/src/connection-editor/page-mobile.c 2008-07-28 16:30:04.000000000 +0200
@@ -46,6 +46,7 @@ typedef struct {
GtkEntry *password;
/* GSM only */
+ GtkSpinButton *cid;
GtkEntry *apn;
GtkEntry *network_id;
GtkComboBox *network_type;
@@ -74,6 +76,7 @@ mobile_private_init (CEPageMobile *self)
priv->username = GTK_ENTRY (glade_xml_get_widget (xml, "mobile_username"));
priv->password = GTK_ENTRY (glade_xml_get_widget (xml, "mobile_password"));
+ priv->cid = GTK_SPIN_BUTTON (glade_xml_get_widget (xml, "mobile_cid"));
priv->apn = GTK_ENTRY (glade_xml_get_widget (xml, "mobile_apn"));
priv->network_id = GTK_ENTRY (glade_xml_get_widget (xml, "mobile_network_id"));
priv->network_type = GTK_COMBO_BOX (glade_xml_get_widget (xml, "mobile_network_type"));
@@ -119,6 +123,9 @@ populate_gsm_ui (CEPageMobile *self, NMC
if (setting->username)
gtk_entry_set_text (priv->username, setting->username);
+ if (setting->cid)
+ gtk_spin_button_set_value (priv->cid, setting->cid);
+
if (setting->apn)
gtk_entry_set_text (priv->apn, setting->apn);
@@ -287,6 +297,7 @@ ce_page_mobile_new (NMConnection *connec
g_signal_connect (priv->number, "changed", G_CALLBACK (stuff_changed), self);
g_signal_connect (priv->username, "changed", G_CALLBACK (stuff_changed), self);
g_signal_connect (priv->password, "changed", G_CALLBACK (stuff_changed), self);
+ g_signal_connect (priv->cid, "changed", G_CALLBACK (stuff_changed), self);
g_signal_connect (priv->apn, "changed", G_CALLBACK (stuff_changed), self);
g_signal_connect (priv->network_id, "changed", G_CALLBACK (stuff_changed), self);
g_signal_connect (priv->network_type, "changed", G_CALLBACK (stuff_changed), self);
@@ -340,6 +352,7 @@ gsm_ui_to_setting (CEPageMobile *self)
NM_SETTING_GSM_NUMBER, nm_entry_get_text (priv->number),
NM_SETTING_GSM_USERNAME, nm_entry_get_text (priv->username),
NM_SETTING_GSM_PASSWORD, nm_entry_get_text (priv->password),
+ NM_SETTING_GSM_CID, gtk_spin_button_get_value_as_int (priv->cid),
NM_SETTING_GSM_APN, nm_entry_get_text (priv->apn),
NM_SETTING_GSM_NETWORK_ID, nm_entry_get_text (priv->network_id),
NM_SETTING_GSM_NETWORK_TYPE, net_type,