X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-platform.c;h=8df3cdad590a44a48f3448fa6d350a4a03e2d5d4;hp=b438d0b3d37e4450b92f77e6fbb1463042e9cf68;hb=059f215cec94c21c941a925b521f6c4bef640550;hpb=627c4af6ac85444cc3256fa568baf4a8d62178ae diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c index b438d0b..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 @@ -58,6 +62,7 @@ #include "modest-hildon-sort-dialog.h" #include #include +#include "widgets/modest-details-dialog.h" #ifdef MODEST_HAVE_MCE #include @@ -98,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; @@ -106,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; } @@ -531,6 +536,7 @@ entry_insert_text (GtkEditable *editable, chars = gtk_editable_get_chars (editable, 0, -1); chars_length = g_utf8_strlen (chars, -1); + g_free (chars); /* Show WID-INF036 */ if (chars_length >= 20) { @@ -716,7 +722,7 @@ modest_platform_run_folder_name_dialog (GtkWindow *parent_window, gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0); modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), - GTK_WINDOW (dialog)); + GTK_WINDOW (dialog), GTK_WINDOW (parent_window)); gtk_widget_show_all (GTK_WIDGET(dialog)); result = gtk_dialog_run (GTK_DIALOG(dialog)); @@ -733,9 +739,10 @@ modest_platform_run_folder_name_dialog (GtkWindow *parent_window, gint modest_platform_run_new_folder_dialog (GtkWindow *parent_window, - TnyFolderStore *parent_folder, + TnyFolderStore *suggested_parent, gchar *suggested_name, - gchar **folder_name) + gchar **folder_name, + TnyFolderStore **parent_folder) { gchar *real_suggested_name = NULL, *tmp = NULL; gint result; @@ -756,7 +763,7 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, else real_suggested_name = g_strdup_printf (_("mcen_ia_default_folder_name_s"), num_str); - exists = modest_tny_folder_has_subfolder_with_name (parent_folder, + exists = modest_tny_folder_has_subfolder_with_name (suggested_parent, real_suggested_name, TRUE); @@ -775,7 +782,7 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, tmp = g_strconcat (_("mcen_fi_new_folder_name"), ":", NULL); result = modest_platform_run_folder_name_dialog (parent_window, - parent_folder, + suggested_parent, _("mcen_ti_new_folder"), tmp, real_suggested_name, @@ -785,6 +792,10 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, if (suggested_name == NULL) g_free(real_suggested_name); + if (parent_folder != NULL) { + *parent_folder = suggested_parent?g_object_ref (suggested_parent): NULL; + } + return result; } @@ -830,7 +841,7 @@ modest_platform_run_confirmation_dialog (GtkWindow *parent_window, dialog = hildon_note_new_confirmation (parent_window, message); modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), - GTK_WINDOW (dialog)); + GTK_WINDOW (dialog), GTK_WINDOW (parent_window)); response = gtk_dialog_run (GTK_DIALOG (dialog)); @@ -853,7 +864,7 @@ modest_platform_run_confirmation_dialog_with_buttons (GtkWindow *parent_window, button_cancel, GTK_RESPONSE_CANCEL, NULL); modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), - GTK_WINDOW (dialog)); + GTK_WINDOW (dialog), GTK_WINDOW (parent_window)); response = gtk_dialog_run (GTK_DIALOG (dialog)); @@ -862,27 +873,6 @@ modest_platform_run_confirmation_dialog_with_buttons (GtkWindow *parent_window, return response; } -gint -modest_platform_run_yes_no_dialog (GtkWindow *parent_window, - const gchar *message) -{ - GtkWidget *dialog; - gint response; - - dialog = hildon_note_new_confirmation_add_buttons (parent_window, message, - _("mcen_bd_yes"), GTK_RESPONSE_YES, - _("mcen_bd_no"), GTK_RESPONSE_NO, - NULL); - modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog)); - response = gtk_dialog_run (GTK_DIALOG (dialog)); - - on_destroy_dialog (dialog); - - return response; -} - - - void modest_platform_run_information_dialog (GtkWindow *parent_window, const gchar *message, @@ -893,7 +883,7 @@ modest_platform_run_information_dialog (GtkWindow *parent_window, note = hildon_note_new_information (parent_window, message); if (block) modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), - GTK_WINDOW (note)); + GTK_WINDOW (note), GTK_WINDOW (parent_window)); if (block) { gtk_dialog_run (GTK_DIALOG (note)); @@ -1225,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 */ @@ -1250,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 */ @@ -1258,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", @@ -1294,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 @@ -1311,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 @@ -1324,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*/ } @@ -1479,7 +1456,7 @@ banner_finish (gpointer data, GObject *object) g_object_unref (mgr); } -void +void modest_platform_information_banner (GtkWidget *parent, const gchar *icon_name, const gchar *text) @@ -1487,7 +1464,7 @@ modest_platform_information_banner (GtkWidget *parent, GtkWidget *banner, *banner_parent = NULL; ModestWindowMgr *mgr = modest_runtime_get_window_mgr (); - if (modest_window_mgr_num_windows (mgr) == 0) + if (modest_window_mgr_get_num_windows (mgr) == 0) return; if (parent && GTK_IS_WINDOW (parent)) { @@ -1497,7 +1474,7 @@ modest_platform_information_banner (GtkWidget *parent, banner_parent = parent; /* If the window is not the topmost but it's visible (it's minimized for example) then show the banner - with no parent */ + with no parent */ else if (GTK_WIDGET_VISIBLE (parent)) banner_parent = NULL; /* If the window is hidden (like the main window when @@ -1523,7 +1500,7 @@ modest_platform_information_banner_with_timeout (GtkWidget *parent, { GtkWidget *banner; - if (modest_window_mgr_num_windows (modest_runtime_get_window_mgr ()) == 0) + if (modest_window_mgr_get_num_windows (modest_runtime_get_window_mgr ()) == 0) return; banner = hildon_banner_show_information (parent, icon_name, text); @@ -1539,7 +1516,7 @@ modest_platform_animation_banner (GtkWidget *parent, g_return_val_if_fail (text != NULL, NULL); - if (modest_window_mgr_num_windows (modest_runtime_get_window_mgr ()) == 0) + if (modest_window_mgr_get_num_windows (modest_runtime_get_window_mgr ()) == 0) return NULL; /* If the parent is not visible then do not show */ @@ -1614,6 +1591,8 @@ on_timeout_check_account_is_online(CheckAccountIdleData* data) gboolean modest_platform_check_and_wait_for_account_is_online(TnyAccount *account) { + gboolean is_online; + g_return_val_if_fail (account, FALSE); printf ("DEBUG: %s: account id=%s\n", __FUNCTION__, tny_account_get_id (account)); @@ -1657,9 +1636,10 @@ modest_platform_check_and_wait_for_account_is_online(TnyAccount *account) g_main_loop_unref (data->loop); /* g_main_context_unref (context); */ + is_online = data->is_online; g_slice_free (CheckAccountIdleData, data); - return data->is_online; + return is_online; } @@ -1722,7 +1702,7 @@ modest_platform_run_certificate_confirmation_dialog (const gchar* server_name, (gpointer) certificate); modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), - GTK_WINDOW (note)); + GTK_WINDOW (note), (GtkWindow *) main_win); response = gtk_dialog_run(GTK_DIALOG(note)); on_destroy_dialog (note); @@ -1755,7 +1735,7 @@ modest_platform_run_alert_dialog (const gchar* prompt, GtkWidget *dialog = GTK_WIDGET (hildon_note_new_confirmation (GTK_WINDOW (main_win), prompt)); modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), - GTK_WINDOW (dialog)); + GTK_WINDOW (dialog), (GtkWindow *) main_win); const int response = gtk_dialog_run (GTK_DIALOG (dialog)); retval = (response == GTK_RESPONSE_YES) || (response == GTK_RESPONSE_OK); @@ -1989,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)); @@ -2107,8 +2091,6 @@ modest_platform_get_current_connection (void) return retval; } - - gboolean modest_platform_check_memory_low (ModestWindow *win, gboolean visuals) @@ -2121,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) @@ -2130,3 +2112,135 @@ modest_platform_check_memory_low (ModestWindow *win, return lowmem; } + +void +modest_platform_run_folder_details_dialog (GtkWindow *parent_window, + TnyFolder *folder) +{ + GtkWidget *dialog; + + /* Create dialog */ + dialog = modest_details_dialog_new_with_folder (parent_window, folder); + + /* Run dialog */ + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + GTK_WINDOW (dialog), + parent_window); + gtk_widget_show_all (dialog); + + g_signal_connect_swapped (dialog, "response", + G_CALLBACK (gtk_widget_destroy), + dialog); +} + +void +modest_platform_run_header_details_dialog (GtkWindow *parent_window, + TnyHeader *header, + gboolean async_get_size, + TnyMsg *msg) +{ + GtkWidget *dialog; + + /* Create dialog */ + dialog = modest_details_dialog_new_with_header (parent_window, header, TRUE); + + /* Run dialog */ + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + GTK_WINDOW (dialog), + parent_window); + gtk_widget_show_all (dialog); + + g_signal_connect_swapped (dialog, "response", + G_CALLBACK (gtk_widget_destroy), + dialog); +} + +osso_context_t * +modest_platform_get_osso_context (void) +{ + return modest_maemo_utils_get_osso_context (); +} + +GtkWidget* +modest_platform_create_move_to_dialog (GtkWindow *parent_window, + GtkWidget **folder_view) +{ + GtkWidget *dialog, *folder_view_container; + + dialog = gtk_dialog_new_with_buttons (_("mcen_ti_moveto_folders_title"), + GTK_WINDOW (parent_window), + GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | + GTK_DIALOG_DESTROY_WITH_PARENT, + _("mcen_bd_dialog_ok"), GTK_RESPONSE_OK, + _("mcen_bd_new"), MODEST_GTK_RESPONSE_NEW_FOLDER, + _("mcen_bd_dialog_cancel"), GTK_RESPONSE_CANCEL, + NULL); + + /* Create folder view */ + *folder_view = modest_platform_create_folder_view (NULL); + + /* Create pannable and add it to the dialog */ + folder_view_container = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (folder_view_container), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), folder_view_container); + gtk_container_add (GTK_CONTAINER (folder_view_container), *folder_view); + + gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 300); + + gtk_widget_show (GTK_DIALOG (dialog)->vbox); + gtk_widget_show (folder_view_container); + gtk_widget_show (*folder_view); + + return dialog; +} + + +TnyList * +modest_platform_get_list_to_move (ModestWindow *window) +{ + TnyList *list = NULL; + + /* If it's a main window then it could be that we're moving a + folder or a set of messages */ + if (MODEST_IS_MAIN_WINDOW (window)) { + ModestHeaderView *header_view = NULL; + ModestFolderView *folder_view = NULL; + + folder_view = (ModestFolderView *) + modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + header_view = (ModestHeaderView *) + modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window), + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); + + /* Get folder or messages to transfer */ + if (gtk_widget_is_focus (GTK_WIDGET (folder_view))) { + TnyFolderStore *src_folder; + + src_folder = modest_folder_view_get_selected (folder_view); + if (src_folder) { + list = tny_simple_list_new (); + tny_list_prepend (list, G_OBJECT (src_folder)); + g_object_unref (src_folder); + } + } else if (gtk_widget_is_focus (GTK_WIDGET(header_view))) { + list = modest_header_view_get_selected_headers(header_view); + } + } else if (MODEST_IS_MSG_VIEW_WINDOW (window)) { + TnyHeader *header = NULL; + + /* We simply return the currently viewed message */ + header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (window)); + if (header) { + list = tny_simple_list_new (); + tny_list_prepend (list, G_OBJECT (header)); + g_object_unref (header); + } + } else { + g_return_val_if_reached (NULL); + } + + return list; +}