X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-global-settings-dialog.c;h=d534a5a7b11a48495c40f79e2baab78bd231773e;hb=c9001bc9a4aa41e6c9a6ff9923e3ed194b02d5ad;hp=c57246d1bf86e0e9b57f907a4aff967392ff6fed;hpb=03a8aca50404d3aedd2f5ae671d39b31f68f347b;p=modest

diff --git a/src/widgets/modest-global-settings-dialog.c b/src/widgets/modest-global-settings-dialog.c
index c57246d..d534a5a 100644
--- a/src/widgets/modest-global-settings-dialog.c
+++ b/src/widgets/modest-global-settings-dialog.c
@@ -42,11 +42,11 @@
 #include "modest-platform.h"
 #include "widgets/modest-combo-box.h"
 #ifdef MODEST_PLATFORM_MAEMO
-#ifdef MODEST_HILDON_VERSION_0
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
 #include <hildon-widgets/hildon-number-editor.h>
 #else
 #include <hildon/hildon-number-editor.h>
-#endif /*MODEST_HILDON_VERSION_0*/
+#endif /*MODEST_HAVE_HILDON0_WIDGETS*/
 #endif
 /* include other impl specific header files */
 
@@ -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);
 }
 
@@ -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);
 }