2007-05-28 Murray Cumming <murrayc@murrayc.com>

[modest] / src / widgets / modest-global-settings-dialog.c

diff --git a/src/widgets/modest-global-settings-dialog.c b/src/widgets/modest-global-settings-dialog.c
index 13114eb..83e221b 100644 (file)
--- a/src/widgets/modest-global-settings-dialog.c
+++ b/src/widgets/modest-global-settings-dialog.c
@@ -140,7 +140,14 @@ modest_global_settings_dialog_init (ModestGlobalSettingsDialog *self)
 static void
 modest_global_settings_dialog_finalize (GObject *obj)
 {
-/*     free/unref instance resources here */
+       ModestGlobalSettingsDialogPrivate *priv = 
+               MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (obj);
+
+       /* These had to stay alive as long as the comboboxes that used them: */
+       modest_pair_list_free (priv->connect_via_list);
+       modest_pair_list_free (priv->update_interval_list);
+       modest_pair_list_free (priv->msg_format_list);
+       
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -284,7 +291,7 @@ _modest_global_settings_dialog_load_conf (ModestGlobalSettingsDialog *self)
 #ifdef MODEST_PLATFORM_MAEMO
        hildon_number_editor_set_value (HILDON_NUMBER_EDITOR (priv->size_limit), value);
 #else
-       gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->size_limit, value));
+       gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->size_limit), value);
 #endif
        priv->initial_state.size_limit = value;
 
@@ -338,7 +345,7 @@ get_current_settings (ModestGlobalSettingsDialogPrivate *priv,
 #ifdef MODEST_PLATFORM_MAEMO
        state->size_limit = hildon_number_editor_get_value (HILDON_NUMBER_EDITOR (priv->size_limit));
 #else
-       state->size_limit = gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->size_limit));
+       state->size_limit = gtk_spin_button_get_value (GTK_SPIN_BUTTON (priv->size_limit));
 #endif
        id = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->update_interval));
        state->update_interval = *id;
@@ -484,5 +491,5 @@ static ModestConnectedVia
 current_connection_default (void)
 {
        g_warning ("You must implement %s", __FUNCTION__);
-       g_return_val_if_reached (-1);
+       g_return_val_if_reached (MODEST_CONNECTED_VIA_ANY);
 }