X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-platform.c;h=8df3cdad590a44a48f3448fa6d350a4a03e2d5d4;hp=28fc3ab872f39e9f8bd231fe572e94466ed8ca1a;hb=059f215cec94c21c941a925b521f6c4bef640550;hpb=5f5323696e86d16211b17965dbbc12dcc4ddeaeb diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c index 28fc3ab..8df3cda 100644 --- a/src/maemo/modest-platform.c +++ b/src/maemo/modest-platform.c @@ -29,6 +29,7 @@ #include #include +#include #include #include #include @@ -36,6 +37,7 @@ #include "maemo/modest-maemo-global-settings-dialog.h" #include "modest-widget-memory.h" #include +#include #include #include #include @@ -43,6 +45,8 @@ #include #include #include +#include +#include #include #include #include @@ -99,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; @@ -107,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; } @@ -789,7 +793,7 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, g_free(real_suggested_name); if (parent_folder != NULL) { - parent_folder = suggested_parent?g_object_ref (suggested_parent): NULL; + *parent_folder = suggested_parent?g_object_ref (suggested_parent): NULL; } return result; @@ -1211,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 */ @@ -1236,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 */ @@ -1244,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", @@ -1280,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 @@ -1297,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 @@ -1310,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*/ } @@ -1978,17 +1969,21 @@ modest_platform_connect_if_remote_and_perform (GtkWindow *parent_window, gpointer user_data) { TnyAccount *account = NULL; - - if (!folder_store) { + + if (!folder_store || + (TNY_IS_MERGE_FOLDER (folder_store) && + (tny_folder_get_folder_type (TNY_FOLDER(folder_store)) == TNY_FOLDER_TYPE_OUTBOX))) { + /* We promise to instantly perform the callback, so ... */ if (callback) { - callback (FALSE, NULL, parent_window, NULL, user_data); - } - return; - - /* Original comment: Maybe it is something local. */ - /* PVH's comment: maybe we should KNOW this in stead of assuming? */ - + GError *error = NULL; + g_set_error (&error, TNY_ERROR_DOMAIN, TNY_SERVICE_ERROR_UNKNOWN, + "Unable to move or not found folder"); + callback (FALSE, error, parent_window, NULL, user_data); + g_error_free (error); + } + return; + } else if (TNY_IS_FOLDER (folder_store)) { /* Get the folder's parent account: */ account = tny_folder_get_account (TNY_FOLDER (folder_store)); @@ -2108,7 +2103,7 @@ modest_platform_check_memory_low (ModestWindow *win, if (win && lowmem && visuals) modest_platform_run_information_dialog ( GTK_WINDOW(win), - dgettext("ke-recv","memr_ib_operation_disabled"), + _KR("memr_ib_operation_disabled"), TRUE); if (lowmem) @@ -2140,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 (), @@ -2241,6 +2238,9 @@ modest_platform_get_list_to_move (ModestWindow *window) tny_list_prepend (list, G_OBJECT (header)); g_object_unref (header); } + } else { + g_return_val_if_reached (NULL); } + return list; }