X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-platform.c;h=24cd4bb6929dd8c0cf884d0260c56564ee5462a6;hp=a13b8e3b0710f7902da0341891843aafac12ebab;hb=564a7388a2f74368147b0a241ca4a0b65c68167f;hpb=092fe34f03c3165f87be7e09877bb614c468590f diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c index a13b8e3..24cd4bb 100644 --- a/src/maemo/modest-platform.c +++ b/src/maemo/modest-platform.c @@ -58,6 +58,7 @@ #include "modest-hildon-sort-dialog.h" #include #include +#include "widgets/modest-details-dialog.h" #ifdef MODEST_HAVE_MCE #include @@ -531,6 +532,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 +718,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)); @@ -830,7 +832,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 +855,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 +864,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 +874,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)); @@ -1614,6 +1595,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 +1640,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 +1706,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 +1739,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); @@ -2065,15 +2049,6 @@ modest_platform_double_connect_and_perform (GtkWindow *parent_window, } GtkWidget * -modest_platform_get_account_settings_dialog (ModestAccountSettings *settings) -{ - ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new (); - - modest_account_settings_dialog_set_account (dialog, settings); - return GTK_WIDGET (dialog); -} - -GtkWidget * modest_platform_get_account_settings_wizard (void) { ModestEasysetupWizardDialog *dialog = modest_easysetup_wizard_dialog_new (); @@ -2116,8 +2091,6 @@ modest_platform_get_current_connection (void) return retval; } - - gboolean modest_platform_check_memory_low (ModestWindow *win, gboolean visuals) @@ -2139,3 +2112,43 @@ 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) +{ + GtkWidget *dialog; + + /* Create dialog */ + dialog = modest_details_dialog_new_with_header (parent_window, header); + + /* 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); +}