#include <modest-account-mgr.h>
#include <modest-account-mgr-helpers.h>
+#include <modest-tny-account.h>
#include <modest-text-utils.h>
#include <modest-runtime.h>
ModestAccountMgr *account_mgr;
/* Signal handlers */
- gulong acc_inserted_handler;
- gulong acc_removed_handler;
- gulong sig3;
+ gulong acc_inserted_handler, acc_removed_handler,
+ acc_busy_changed_handler, acc_changed_handler;
};
#define MODEST_ACCOUNT_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_ACCOUNT_VIEW, \
modest_account_view_init (ModestAccountView *obj)
{
ModestAccountViewPrivate *priv;
-
+
priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
priv->account_mgr = NULL;
priv->acc_inserted_handler = 0;
priv->acc_removed_handler = 0;
- priv->sig3 = 0;
+ priv->acc_busy_changed_handler = 0;
+ priv->acc_changed_handler = 0;
}
static void
priv->acc_removed_handler))
g_signal_handler_disconnect (modest_runtime_get_account_store (),
priv->acc_removed_handler);
+
+ if (g_signal_handler_is_connected (modest_runtime_get_account_store (),
+ priv->acc_changed_handler))
+ g_signal_handler_disconnect (modest_runtime_get_account_store (),
+ priv->acc_changed_handler);
+
+ if (priv->acc_busy_changed_handler)
+ g_signal_handler_disconnect (priv->account_mgr, priv->acc_busy_changed_handler);
- if (priv->sig3)
- g_signal_handler_disconnect (priv->account_mgr, priv->sig3);
g_object_unref (G_OBJECT(priv->account_mgr));
priv->account_mgr = NULL;
/* FIXME: let's assume that 'last update' applies to the store account... */
gchar* last_updated_string;
time_t last_updated = account_data->store_account->last_updated;
- if (!modest_account_mgr_account_is_busy(account_mgr, account_data->account_name))
- {
+ if (!modest_account_mgr_account_is_busy(account_mgr, account_data->account_name)) {
if (last_updated > 0)
- last_updated_string = modest_text_utils_get_display_date(last_updated);
+ last_updated_string = modest_text_utils_get_display_date(last_updated);
else
- last_updated_string = g_strdup (_("mcen_va_never"));
- }
- else
- {
+ last_updated_string = g_strdup (_("mcen_va_never"));
+ } else {
/* FIXME: There should be a logical name in the UI specs */
- last_updated_string = g_strdup(_("Refreshing..."));
+ last_updated_string = g_strdup(_("..."));
}
return last_updated_string;
}
static void
on_account_busy_changed(ModestAccountMgr *account_mgr,
- const gchar *account_name,
- gboolean busy,
- ModestAccountView *self)
+ const gchar *account_name,
+ gboolean busy,
+ ModestAccountView *self)
{
GtkListStore *model = GTK_LIST_STORE(gtk_tree_view_get_model (GTK_TREE_VIEW(self)));
GtkTreeIter iter;
ModestAccountView *self;
ModestAccountViewPrivate *priv;
+ g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (user_data));
+
self = MODEST_ACCOUNT_VIEW (user_data);
priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self);
ModestAccountView *self;
ModestAccountViewPrivate *priv;
+ g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (user_data));
+
self = MODEST_ACCOUNT_VIEW (user_data);
priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self);
}
-/* currently unused */
-#if 0
static void
-on_account_enable_toggled (GtkCellRendererToggle *cell_renderer, gchar *path,
- ModestAccountView *self)
+on_account_changed (TnyAccountStore *account_store,
+ TnyAccount *account,
+ gpointer user_data)
{
- GtkTreeIter iter;
- ModestAccountViewPrivate *priv;
- GtkTreeModel *model;
- gchar *account_name;
- gboolean enabled;
+ ModestAccountView *self = NULL;
+ ModestAccountViewPrivate *priv = NULL;
+ TnyTransportAccount *transport_account = NULL;
+ ModestTnySendQueue *send_queue = NULL;
+
+ g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (user_data));
+ g_return_if_fail (account);
+ g_return_if_fail (TNY_IS_ACCOUNT (account));
+
+ self = MODEST_ACCOUNT_VIEW (user_data);
+ priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self);
- priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
- model = gtk_tree_view_get_model (GTK_TREE_VIEW(self));
+ g_warning ("account changed: %s", tny_account_get_id(account));
- if (!gtk_tree_model_get_iter_from_string (model, &iter, path)) {
- g_printerr ("modest: cannot find iterator\n");
- return;
+ /* Update account view */
+ update_account_view (priv->account_mgr, self);
+
+ /* Get transport account */
+ const gchar *modest_account_name =
+ modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+ g_return_if_fail (modest_account_name);
+
+ transport_account = (TnyTransportAccount*)
+ modest_tny_account_store_get_transport_account_for_open_connection (modest_runtime_get_account_store(),
+ modest_account_name);
+
+ /* Restart send queue */
+ if (transport_account) {
+ g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT(transport_account));
+ send_queue = modest_runtime_get_send_queue (transport_account);
+ g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE(send_queue));
+ modest_tny_send_queue_try_to_send (send_queue);
+
+ g_object_unref (transport_account);
}
- gtk_tree_model_get (model, &iter, MODEST_ACCOUNT_VIEW_IS_ENABLED_COLUMN, &enabled,
- MODEST_ACCOUNT_VIEW_NAME_COLUMN, &account_name,
- -1);
-
- /* toggle enabled / disabled */
- modest_account_mgr_set_enabled (priv->account_mgr, account_name, !enabled);
- g_free (account_name);
}
-#endif
+
+
static gboolean
find_default_account(ModestAccountView *self, GtkTreeIter *iter)
on_account_default_toggled (GtkCellRendererToggle *cell_renderer, gchar *path,
ModestAccountView *self)
{
+
+ g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (self));
+
gboolean is_default = gtk_cell_renderer_toggle_get_active (cell_renderer);
if (is_default) {
/* Do not allow an account to be marked non-default.
GtkListStore *model;
GtkTreeViewColumn *column;
+ g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (self));
priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
model = gtk_list_store_new (6,
*
* djcb: indeed, they have been removed for post-bora, i added the ifdefs...
*/
-#ifdef MODEST_HILDON_VERSION_0
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
g_object_set(G_OBJECT(self), "allow-checkbox-mode", FALSE, NULL);
g_object_set(G_OBJECT(toggle_renderer), "checkbox-mode", FALSE, NULL);
-#endif /*MODEST_HILDON_VERSION_0 */
+#endif /* MODEST_HAVE_HILDON0_WIDGETS */
+
g_signal_connect (G_OBJECT(toggle_renderer), "toggled", G_CALLBACK(on_account_default_toggled),
self);
priv->acc_inserted_handler = g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
"account_inserted",
G_CALLBACK(on_account_inserted), self);
-
- priv->sig3 = g_signal_connect (G_OBJECT(priv->account_mgr), "account_busy_changed",
- G_CALLBACK(on_account_busy_changed), self);
-}
+ priv->acc_inserted_handler = g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
+ "account_changed",
+ G_CALLBACK(on_account_changed), self);
+
+ priv->acc_busy_changed_handler = g_signal_connect (G_OBJECT(priv->account_mgr),
+ "account_busy_changed",
+ G_CALLBACK(on_account_busy_changed), self);
+}
ModestAccountView*
projects / modest / blobdiff