X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-maemo-global-settings-dialog.c;h=3eee973f2138cdf7ea32873cfc98cc5235875768;hp=e262409afa08b9ac7e9a08844046747b34c1226e;hb=d2766e0125d45ae66dbe70b51eb90e3b0e493982;hpb=9370ef584b364e702445220330867f28181b480b

diff --git a/src/maemo/modest-maemo-global-settings-dialog.c b/src/maemo/modest-maemo-global-settings-dialog.c
index e262409..3eee973 100644
--- a/src/maemo/modest-maemo-global-settings-dialog.c
+++ b/src/maemo/modest-maemo-global-settings-dialog.c
@@ -61,6 +61,8 @@
 #define MSG_SIZE_DEF_VAL 1000
 #define MSG_SIZE_MIN_VAL 1
 
+#define DEFAULT_FOCUS_WIDGET "default-focus-widget"
+
 /* 'private'/'protected' functions */
 static void modest_maemo_global_settings_dialog_class_init (ModestMaemoGlobalSettingsDialogClass *klass);
 static void modest_maemo_global_settings_dialog_init       (ModestMaemoGlobalSettingsDialog *obj);
@@ -87,6 +89,7 @@ static void       on_auto_update_toggled (GtkToggleButton *togglebutton,
 
 typedef struct _ModestMaemoGlobalSettingsDialogPrivate ModestMaemoGlobalSettingsDialogPrivate;
 struct _ModestMaemoGlobalSettingsDialogPrivate {
+	ModestPairList *connect_via_list;
 };
 #define MODEST_MAEMO_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                            MODEST_TYPE_MAEMO_GLOBAL_SETTINGS_DIALOG, \
@@ -135,6 +138,28 @@ modest_maemo_global_settings_dialog_class_init (ModestMaemoGlobalSettingsDialogC
 	MODEST_GLOBAL_SETTINGS_DIALOG_CLASS (klass)->current_connection_func = current_connection;
 }
 
+
+static void
+on_switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer user_data)
+{
+	/* grab the focus to the default element in the current page */
+	GtkWidget *child, *focus_item;
+	
+	child = gtk_notebook_get_nth_page (notebook, page_num);
+	if (!child) {
+		g_printerr ("modest: cannot get nth page\n");
+		return;
+	}
+	
+	focus_item = GTK_WIDGET(g_object_get_data (G_OBJECT(child), DEFAULT_FOCUS_WIDGET));
+	if (!focus_item) {
+		g_printerr ("modest: cannot get focus item\n");
+		return;
+	}
+
+	gtk_widget_grab_focus (focus_item);
+}
+
 static void
 modest_maemo_global_settings_dialog_init (ModestMaemoGlobalSettingsDialog *self)
 {
@@ -154,6 +179,8 @@ modest_maemo_global_settings_dialog_init (ModestMaemoGlobalSettingsDialog *self)
 	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), ppriv->notebook);
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (self)->vbox), MODEST_MARGIN_HALF);
 
+	g_signal_connect (G_OBJECT(ppriv->notebook), "switch-page", G_CALLBACK(on_switch_page), NULL);
+	
 	/* Load current config */
 	_modest_global_settings_dialog_load_conf (MODEST_GLOBAL_SETTINGS_DIALOG (self));
 	gtk_widget_show_all (ppriv->notebook);
@@ -181,7 +208,6 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self)
 {
 	GtkWidget *vbox, *vbox_update, *vbox_limit, *caption;
 	GtkSizeGroup *size_group;
-	ModestPairList *list;
 	ModestGlobalSettingsDialogPrivate *ppriv;
 
 	ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self);
@@ -202,9 +228,13 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self)
 	g_signal_connect (ppriv->auto_update, "toggled", G_CALLBACK (on_auto_update_toggled), self);
 
 	/* Connected via */
-	list = _modest_global_settings_dialog_get_connected_via ();
-	ppriv->connect_via = modest_combo_box_new (list, g_int_equal);
-	modest_pair_list_free (list);
+
+	/* Note: This ModestPairList* must exist for as long as the combo
+	 * that uses it, because the ModestComboBox uses the ID opaquely, 
+	 * so it can't know how to manage its memory. */ 
+	ppriv->connect_via_list = _modest_global_settings_dialog_get_connected_via ();
+	ppriv->connect_via = modest_combo_box_new (ppriv->connect_via_list, g_int_equal);
+
 	caption = hildon_caption_new (size_group, 
 				      _("mcen_fi_options_connectiontype"),
 				      ppriv->connect_via, 
@@ -213,9 +243,13 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self)
 	gtk_box_pack_start (GTK_BOX (vbox_update), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
 
 	/* Update interval */
-	list = _modest_global_settings_dialog_get_update_interval ();
-	ppriv->update_interval = modest_combo_box_new (list, g_int_equal);
-	modest_pair_list_free (list);
+
+	/* Note: This ModestPairList* must exist for as long as the combo
+	 * that uses it, because the ModestComboBox uses the ID opaquely, 
+	 * so it can't know how to manage its memory. */ 
+	ppriv->update_interval_list = _modest_global_settings_dialog_get_update_interval ();
+	ppriv->update_interval = modest_combo_box_new (ppriv->update_interval_list, g_int_equal);
+
 	caption = hildon_caption_new (size_group, 
 				      _("mcen_fi_options_updateinterval"),
 				      ppriv->update_interval, 
@@ -234,8 +268,8 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self)
 	size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
 	/* Size limit */
-	ppriv->size_limit = hildon_number_editor_new (MSG_SIZE_MIN_VAL, MSG_SIZE_MAX_VAL);;
-	hildon_number_editor_set_value (HILDON_NUMBER_EDITOR (ppriv->size_limit), MSG_SIZE_DEF_VAL);;
+	ppriv->size_limit = hildon_number_editor_new (MSG_SIZE_MIN_VAL, MSG_SIZE_MAX_VAL);
+	hildon_number_editor_set_value (HILDON_NUMBER_EDITOR (ppriv->size_limit), MSG_SIZE_DEF_VAL);
 	g_signal_connect (ppriv->size_limit, "range_error", G_CALLBACK (on_range_error), self);
 	caption = hildon_caption_new (size_group, 
 				      _("mcen_fi_advsetup_sizelimit"), 
@@ -256,6 +290,9 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self)
 	/* Add to vbox */
 	gtk_box_pack_start (GTK_BOX (vbox), vbox_limit, FALSE, FALSE, MODEST_MARGIN_HALF);
 
+	/* set the special magic default widget as the DEFAULT_FOCUS_WIDGET gobject property */
+	g_object_set_data (G_OBJECT(vbox), DEFAULT_FOCUS_WIDGET, (gpointer)ppriv->auto_update);
+	
 	return vbox;
 }
 
@@ -268,7 +305,6 @@ create_composing_page (ModestMaemoGlobalSettingsDialog *self)
 	GtkWidget *vbox;
 	GtkSizeGroup *size_group;
 	ModestGlobalSettingsDialogPrivate *ppriv;
-	ModestPairList *list;
 	GtkWidget *caption;
 
 	ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self);
@@ -276,9 +312,13 @@ create_composing_page (ModestMaemoGlobalSettingsDialog *self)
 	vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
 
 	/* Update interval */
-	list = _modest_global_settings_dialog_get_msg_formats ();
-	ppriv->msg_format = modest_combo_box_new (list, g_int_equal);
-	modest_pair_list_free (list);
+
+	/* Note: This ModestPairList* must exist for as long as the combo
+	 * that uses it, because the ModestComboBox uses the ID opaquely, 
+	 * so it can't know how to manage its memory. */ 
+	ppriv->msg_format_list = _modest_global_settings_dialog_get_msg_formats ();
+	ppriv->msg_format = modest_combo_box_new (ppriv->msg_format_list, g_int_equal);
+
 	caption = hildon_caption_new (size_group, 
 				      _("mcen_fi_options_messageformat"),
 				      ppriv->msg_format, 
@@ -295,6 +335,9 @@ create_composing_page (ModestMaemoGlobalSettingsDialog *self)
 				      HILDON_CAPTION_MANDATORY);
 	gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
 
+	/* set the special magic default widget as the DEFAULT_FOCUS_WIDGET gobject property */
+	g_object_set_data (G_OBJECT(vbox), DEFAULT_FOCUS_WIDGET, (gpointer)ppriv->msg_format);
+
 	return vbox;
 }
 
@@ -375,11 +418,14 @@ current_connection (void)
 {
 	TnyAccountStore *account_store;
 	TnyDevice *device;
-	gboolean retval = FALSE;
+	ModestConnectedVia retval = MODEST_CONNECTED_VIA_ANY;
 	
 	account_store = TNY_ACCOUNT_STORE (modest_runtime_get_account_store ());
 	device = tny_account_store_get_device (account_store);
 
+	if (!tny_device_is_online (device))
+		return MODEST_CONNECTED_VIA_ANY;
+
 	/* Get iap id */
 	const gchar *iap_id = tny_maemo_conic_device_get_current_iap_id (TNY_MAEMO_CONIC_DEVICE (device));
 	if (iap_id) {