#include <widgets/modest-account-view.h>
#include <modest-runtime.h>
+#include "modest-ui-actions.h"
#include "modest-platform.h"
#include "modest-text-utils.h"
#include "modest-account-protocol.h"
#include "modest-account-settings-dialog.h"
#include <modest-utils.h>
#include "widgets/modest-ui-constants.h"
-#include <hildon/hildon-pannable-area.h>
+#include <hildon/hildon.h>
/* 'private'/'protected' functions */
static void modest_account_view_window_class_init (ModestAccountViewWindowClass *klass);
G_OBJECT_CLASS(parent_class)->finalize (self);
}
-
-/** Check whether any connections are active, and cancel them if
- * the user wishes.
- * Returns TRUE is there was no problem,
- * or if an operation was cancelled so we can continue.
- * Returns FALSE if the user chose to cancel his request instead.
- */
-static gboolean
-check_for_active_account (ModestAccountViewWindow *self, const gchar* account_name)
-{
- ModestTnySendQueue *send_queue;
- ModestTnyAccountStore *acc_store;
- ModestMailOperationQueue* queue;
- TnyConnectionStatus store_conn_status;
- TnyAccount *store_account = NULL, *transport_account = NULL;
- gboolean retval = TRUE, sending = FALSE;
-
- acc_store = modest_runtime_get_account_store ();
- queue = modest_runtime_get_mail_operation_queue ();
-
- store_account =
- modest_tny_account_store_get_server_account (acc_store,
- account_name,
- TNY_ACCOUNT_TYPE_STORE);
-
- /* This could happen if the account was deleted before the
- call to this function */
- if (!store_account)
- return FALSE;
-
- transport_account =
- modest_tny_account_store_get_server_account (acc_store,
- account_name,
- TNY_ACCOUNT_TYPE_TRANSPORT);
-
- /* This could happen if the account was deleted before the
- call to this function */
- if (!transport_account) {
- g_object_unref (store_account);
- return FALSE;
- }
-
- /* If the transport account was not used yet, then the send
- queue could not exist (it's created on demand) */
- send_queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT (transport_account), FALSE);
- if (TNY_IS_SEND_QUEUE (send_queue))
- sending = modest_tny_send_queue_sending_in_progress (send_queue);
-
- store_conn_status = tny_account_get_connection_status (store_account);
- if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED || sending) {
- gint response;
-
- response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self),
- _("emev_nc_disconnect_account"));
- if (response == GTK_RESPONSE_OK) {
- retval = TRUE;
- } else {
- retval = FALSE;
- }
- }
-
- if (retval) {
-
- /* FIXME: We should only cancel those of this account */
- modest_mail_operation_queue_cancel_all (queue);
-
- /* Also disconnect the account */
- if ((tny_account_get_connection_status (store_account) != TNY_CONNECTION_STATUS_DISCONNECTED) &&
- (tny_account_get_connection_status (store_account) != TNY_CONNECTION_STATUS_DISCONNECTED_BROKEN)) {
- tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account),
- FALSE, NULL, NULL);
- }
- if (sending) {
- tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account),
- FALSE, NULL, NULL);
- }
- }
-
- /* Frees */
- g_object_unref (store_account);
- g_object_unref (transport_account);
-
- return retval;
-}
-
static void
on_account_settings_dialog_response (GtkDialog *dialog,
gint response,
store_account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store (),
account_name,
TNY_ACCOUNT_TYPE_STORE);
-
- /* Reconnect the store account, no need to reconnect the
- transport account because it will connect when needed */
- if (tny_account_get_connection_status (store_account) ==
- TNY_CONNECTION_STATUS_DISCONNECTED)
- tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account),
- TRUE, NULL, NULL);
-
+ if (store_account) {
+ /* Reconnect the store account, no need to reconnect the
+ transport account because it will connect when needed */
+ if (tny_account_get_connection_status (store_account) ==
+ TNY_CONNECTION_STATUS_DISCONNECTED)
+ tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account),
+ TRUE, NULL, NULL);
+ g_object_unref (store_account);
+ }
/* Disconnect this handler */
g_signal_handlers_disconnect_by_func (dialog, on_account_settings_dialog_response, user_data);
/* Free */
g_free (account_name);
- g_object_unref (store_account);
}
static void
ModestAccountViewWindow *self)
{
ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (self);
-
+
gchar* account_name = modest_account_view_get_path_account (priv->account_view, path);
if (!account_name)
return;
-
- /* Check whether any connections are active, and cancel them if
+
+ /* Check whether any connections are active, and cancel them if
* the user wishes.
*/
- if (check_for_active_account (self, account_name)) {
+ if (modest_ui_actions_check_for_active_account ((ModestWindow *) self, account_name)) {
ModestAccountProtocol *proto;
ModestProtocolType proto_type;
/* Get proto */
- proto_type = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (),
+ proto_type = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (),
account_name);
proto = (ModestAccountProtocol *)
- modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (),
+ modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (),
proto_type);
/* Create and show the dialog */
if (proto && MODEST_IS_ACCOUNT_PROTOCOL (proto)) {
ModestAccountSettingsDialog *dialog =
modest_account_protocol_get_account_settings_dialog (proto, account_name);
- modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), GTK_WINDOW (self));
- gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), FALSE);
- gtk_widget_show (GTK_WIDGET (dialog));
+
+ if (dialog) {
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
+ (GtkWindow *) dialog,
+ (GtkWindow *) self);
+ gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), FALSE);
+ gtk_widget_show (GTK_WIDGET (dialog));
+ }
}
}
g_free (account_name);
{
ModestAccountViewWindowPrivate *priv;
GtkWidget *main_vbox, *pannable;
-
+ GtkWidget *align;
+#ifdef MODEST_TOOLKIT_HILDON2
+ GtkWidget *live_search;
+#endif
/* Specify a default size */
gtk_window_set_default_size (GTK_WINDOW (self), -1, MODEST_DIALOG_WINDOW_MAX_HEIGHT);
+ gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);
+ gtk_widget_hide (GTK_DIALOG (self)->action_area);
+
/* This seems to be necessary to make the window show at the front with decoration.
* If we use property type=GTK_WINDOW_TOPLEVEL instead of the default GTK_WINDOW_POPUP+decoration,
priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
priv->acc_removed_handler = 0;
priv->account_view = modest_account_view_new (modest_runtime_get_account_mgr());
+
+#ifdef MODEST_TOOLKIT_HILDON2
+ live_search = modest_account_view_setup_live_search (MODEST_ACCOUNT_VIEW (priv->account_view));
+ hildon_live_search_widget_hook (HILDON_LIVE_SEARCH (live_search), GTK_WIDGET (self), GTK_WIDGET (priv->account_view));
+#endif
+
modest_account_view_set_picker_mode (MODEST_ACCOUNT_VIEW (priv->account_view), TRUE);
main_vbox = GTK_DIALOG (self)->vbox;
+#ifdef MODEST_TOOLKIT_HILDON2
+ gtk_box_pack_end (GTK_BOX (main_vbox), live_search, FALSE, FALSE, 0);
+#endif
pannable = hildon_pannable_area_new ();
- g_object_set (G_OBJECT (pannable), "initial-hint", TRUE, NULL);
gtk_widget_show (pannable);
gtk_container_add (GTK_CONTAINER (pannable),
GTK_WIDGET (priv->account_view));
g_signal_connect (G_OBJECT (priv->account_view), "row-activated",
G_CALLBACK (on_account_activated), self);
- gtk_box_pack_start (GTK_BOX(main_vbox), pannable, TRUE, TRUE, MODEST_MARGIN_DEFAULT);
+ align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DEFAULT, MODEST_MARGIN_DEFAULT);
+ gtk_widget_show (align);
+
+ gtk_container_add (GTK_CONTAINER (align), pannable);
+
+ gtk_box_pack_start (GTK_BOX(main_vbox), align, TRUE, TRUE, 0);
}
projects / modest / blobdiff