#include "modest-tny-platform-factory.h"
#include "maemo/easysetup/modest-easysetup-wizard.h"
#include "maemo/modest-account-settings-dialog.h"
-#include <maemo/modest-maemo-utils.h>
+#include <modest-utils.h>
#include "widgets/modest-ui-constants.h"
/* 'private'/'protected' functions */
if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED ||
transport_conn_status == TNY_CONNECTION_STATUS_CONNECTED) {
- GtkWidget *note = NULL;
gint response;
- note = hildon_note_new_confirmation (GTK_WINDOW (self),
- _("emev_nc_disconnect_account"));
- response = gtk_dialog_run (GTK_DIALOG(note));
-
- gtk_widget_destroy (note);
+ response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self),
+ _("emev_nc_disconnect_account"));
if (response == GTK_RESPONSE_OK) {
/* FIXME: We should only cancel those of this account */
modest_mail_operation_queue_cancel_all (queue);
account_title);
}
- GtkDialog *dialog = GTK_DIALOG (hildon_note_new_confirmation (GTK_WINDOW (self),
- txt));
- gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
- gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self));
+ response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), txt);
g_free (txt);
txt = NULL;
-
- response = gtk_dialog_run (dialog);
- gtk_widget_destroy (GTK_WIDGET (dialog));
- while (gtk_events_pending ())
- gtk_main_iteration ();
if (response == GTK_RESPONSE_OK) {
/* Remove account. If it succeeds then it also removes
* the user wishes.
*/
if (check_for_active_account (self, account_name)) {
+ GtkWidget *dialog = modest_tny_account_store_show_account_settings_dialog (modest_runtime_get_account_store (), account_name);
- /* Show the Account Settings window: */
- ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
-
- modest_account_settings_dialog_set_account_name (dialog, account_name);
- modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog));
-
/* When the dialog is closed, reconnect */
g_signal_connect (dialog, "response",
G_CALLBACK (on_account_settings_dialog_response),
self);
-
- modest_maemo_show_dialog_and_forget (GTK_WINDOW (self), GTK_DIALOG (dialog));
}
g_free (account_name);
priv->account_view = modest_account_view_new (modest_runtime_get_account_mgr());
- gtk_widget_set_size_request (GTK_WIDGET(priv->account_view), 300, 400);
+ /* Only force the height, the width of the widget will depend
+ on the size of the column titles */
+ gtk_widget_set_size_request (GTK_WIDGET(priv->account_view), -1, 400);
gtk_widget_show (GTK_WIDGET (priv->account_view));
GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(priv->account_view));
{
GObject *obj = g_object_new(MODEST_TYPE_ACCOUNT_VIEW_WINDOW, NULL);
- /* Attach dialog help */
- modest_platform_set_dialog_help (GTK_DIALOG (obj), "applications_email_accountsettings");
-
return GTK_WIDGET(obj);
}