X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-platform.c;h=8df3cdad590a44a48f3448fa6d350a4a03e2d5d4;hp=5472fbe97f1a334993c26c5bcc00bedd924b4f7d;hb=059f215cec94c21c941a925b521f6c4bef640550;hpb=d4cf31dfb2ee36ca99ffb1f08ee2ebddf57d81ed

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index 5472fbe..8df3cda 100644
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -37,6 +37,7 @@
 #include "maemo/modest-maemo-global-settings-dialog.h"
 #include "modest-widget-memory.h"
 #include <modest-hildon-includes.h>
+#include <modest-utils.h>
 #include <modest-maemo-utils.h>
 #include <dbus_api/modest-dbus-callbacks.h>
 #include <maemo/modest-osso-autosave-callbacks.h>
@@ -102,7 +103,7 @@ on_modest_conf_update_interval_changed (ModestConf* self,
 static gboolean
 check_required_files (void)
 {
-	FILE *mcc_file = modest_maemo_open_mcc_mapping_file ();
+	FILE *mcc_file = modest_utils_open_mcc_mapping_file (NULL);
 	if (!mcc_file) {
 		g_printerr ("modest: check for mcc file failed\n");
 		return FALSE;
@@ -110,7 +111,7 @@ check_required_files (void)
 		fclose (mcc_file);
 	
 	if (access(MODEST_PROVIDER_DATA_FILE, R_OK) != 0 &&
-	    access(MODEST_MAEMO_PROVIDER_DATA_FILE, R_OK) != 0) {
+	    access(MODEST_FALLBACK_PROVIDER_DATA_FILE, R_OK) != 0) {
 		g_printerr ("modest: cannot find providers data\n");
 		return FALSE;
 	}
@@ -1214,16 +1215,12 @@ modest_platform_push_email_notification(void)
 }
 
 void 
-modest_platform_on_new_headers_received (TnyList *header_list,
+modest_platform_on_new_headers_received (GList *URI_list,
 					 gboolean show_visual)
 {
-	g_return_if_fail (TNY_IS_LIST(header_list));
-
-	if (tny_list_get_length(header_list) == 0) {
-		g_warning ("%s: header list is empty", __FUNCTION__);
+	if (g_list_length (URI_list) == 0)
 		return;
-	}
-	
+
 	if (!show_visual) {
                 modest_platform_push_email_notification ();
 		/* We do a return here to avoid indentation with an else */
@@ -1239,7 +1236,7 @@ modest_platform_on_new_headers_received (TnyList *header_list,
 					   NULL);
 
 	HildonNotification *notification;
-	TnyIterator *iter;
+	GList *iter;
 	GSList *notifications_list = NULL;
 
 	/* Get previous notifications ids */
@@ -1247,35 +1244,29 @@ modest_platform_on_new_headers_received (TnyList *header_list,
 						   MODEST_CONF_NOTIFICATION_IDS, 
 						   MODEST_CONF_VALUE_INT, NULL);
 
-	iter = tny_list_create_iterator (header_list);
-	while (!tny_iterator_is_done (iter)) {
-		gchar *url = NULL, *display_address = NULL,  *summary = NULL;
+	iter = header_list;
+	while (iter) {
+		gchar *display_address = NULL,  *summary = NULL;
 		const gchar *display_date;
-		TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
-		TnyFolder *folder = tny_header_get_folder (header);
 		gboolean first_notification = TRUE;
 		gint notif_id;
 		gchar *str;
+		ModestMsgNotificationData *data;
+
+		data = (ModestMsgNotificationData *) iter->data;
 
 		/* constant string, don't free */
 		display_date = modest_text_utils_get_display_date (tny_header_get_date_received (header));
 
-		display_address = tny_header_dup_from (header);
+		display_address = g_strdup (data->from);
 		modest_text_utils_get_display_address (display_address); /* string is changed in-place */
-		
+
 		summary = g_strdup_printf ("%s - %s", display_date, display_address);
-		str = tny_header_dup_subject (header);
 		notification = hildon_notification_new (summary,
-							str,
+							data->subject,
 							"qgn_list_messagin",
 							"email.arrive");
-		g_free (str);
-		/* Create the message URL */
-		str = tny_header_dup_uid (header);
-		url = g_strdup_printf ("%s/%s", tny_folder_get_url_string (folder), 
-				       str);
-		g_free (str);
-
+		/* Add DBus action */
 		hildon_notification_add_dbus_action(notification,
 						    "default",
 						    "Cancel",
@@ -1283,7 +1274,7 @@ modest_platform_on_new_headers_received (TnyList *header_list,
 						    MODEST_DBUS_OBJECT,
 						    MODEST_DBUS_IFACE,
 						    MODEST_DBUS_METHOD_OPEN_MESSAGE,
-						    G_TYPE_STRING, url,
+						    G_TYPE_STRING, data->url,
 						    -1);
 
 		/* Play sound if the user wants. Show the LED
@@ -1300,7 +1291,7 @@ modest_platform_on_new_headers_received (TnyList *header_list,
 							    "dialog-type", 4);
 			notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification),
 							    "led-pattern",
-							    MODEST_NEW_MAIL_LIGHTING_PATTERN);			
+							    MODEST_NEW_MAIL_LIGHTING_PATTERN);
 		}
 
 		/* Notify. We need to do this in an idle because this function
@@ -1313,23 +1304,20 @@ modest_platform_on_new_headers_received (TnyList *header_list,
 		/* We don't listen for the "closed" signal, because we
 		   don't care about if the notification was removed or
 		   not to store the list in gconf */
-	
+
 		/* Free & carry on */
 		g_free (display_address);
 		g_free (summary);
-		g_free (url);
-		g_object_unref (folder);
-		g_object_unref (header);
-		tny_iterator_next (iter);
+
+		iter = g_list_next (iter);
 	}
-	g_object_unref (iter);
 
 	/* Save the ids */
 	modest_conf_set_list (modest_runtime_get_conf (), MODEST_CONF_NOTIFICATION_IDS, 
 			      notifications_list, MODEST_CONF_VALUE_INT, NULL);
 
 	g_slist_free (notifications_list);
-	
+
 #endif /*MODEST_HAVE_HILDON_NOTIFY*/
 }
 
@@ -2147,12 +2135,14 @@ modest_platform_run_folder_details_dialog (GtkWindow *parent_window,
 
 void
 modest_platform_run_header_details_dialog (GtkWindow *parent_window,
-					   TnyHeader *header)
+					   TnyHeader *header,
+					   gboolean async_get_size,
+					   TnyMsg *msg)
 {
 	GtkWidget *dialog;
 	
 	/* Create dialog */
-	dialog = modest_details_dialog_new_with_header (parent_window, header);
+	dialog = modest_details_dialog_new_with_header (parent_window, header, TRUE);
 
 	/* Run dialog */
 	modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),