static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window);
-static void on_account_update (TnyAccountStore *account_store,
+static void account_number_changed (TnyAccountStore *account_store,
const gchar *account_name,
gpointer user_data);
/* return FALSE; */
/* } */
-static void
-on_sendqueue_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, ModestMainWindow *user_data)
-{
- if (err) {
- printf ("DEBUG: %s: err->code=%d, err->message=%s\n", __FUNCTION__, err->code, err->message);
+/* static void */
+/* on_sendqueue_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, ModestMainWindow *user_data) */
+/* { */
+/* if (err) { */
+/* printf ("DEBUG: %s: err->code=%d, err->message=%s\n", __FUNCTION__, err->code, err->message); */
- if (err->code == TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL)
- /* Don't show waste the user's time by showing him a dialog telling him
- * that he has just cancelled something: */
- return;
- }
+/* if (err->code == TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL) */
+/* /\* Don't show waste the user's time by showing him a dialog telling him */
+/* * that he has just cancelled something: *\/ */
+/* return; */
+/* } */
- /* Get the server name: */
- const gchar* server_name = NULL;
+/* /\* Get the server name: *\/ */
+/* const gchar* server_name = NULL; */
- TnyCamelTransportAccount* server_account = tny_camel_send_queue_get_transport_account (
- TNY_CAMEL_SEND_QUEUE (self));
- if (server_account) {
- server_name = tny_account_get_hostname (TNY_ACCOUNT (server_account));
+/* TnyCamelTransportAccount* server_account = tny_camel_send_queue_get_transport_account ( */
+/* TNY_CAMEL_SEND_QUEUE (self)); */
+/* if (server_account) { */
+/* server_name = tny_account_get_hostname (TNY_ACCOUNT (server_account)); */
- g_object_unref (server_account);
- server_account = NULL;
- }
+/* g_object_unref (server_account); */
+/* server_account = NULL; */
+/* } */
- if (!server_name)
- server_name = _("Unknown Server");
-
- /* Show the appropriate message text for the GError: */
- gchar *message = NULL;
- if (err) {
- switch (err->code) {
- case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_HOST_LOOKUP_FAILED:
- message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name);
- break;
- case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_SERVICE_UNAVAILABLE:
- message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name);
- break;
- case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_AUTHENTICATION_NOT_SUPPORTED:
- /* TODO: This logical ID seems more suitable for a wrong username or password than for a
- * wrong authentication method. The user is unlikely to guess at the real cause.
- */
- message = g_strdup_printf (_("eemev_ni_ui_smtp_authentication_fail_error"), server_name);
- break;
- case TNY_TRANSPORT_ACCOUNT_ERROR_SEND:
- /* TODO: Tinymail is still sending this sometimes when it should
- * send TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL. */
- default:
- message = g_strdup (_("emev_ib_ui_smtp_send_error"));
- break;
- }
- } else {
- message = g_strdup (_("emev_ib_ui_smtp_send_error"));
- }
+/* if (!server_name) */
+/* server_name = _("Unknown Server"); */
+
+/* /\* Show the appropriate message text for the GError: *\/ */
+/* gchar *message = NULL; */
+/* if (err) { */
+/* switch (err->code) { */
+/* case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_HOST_LOOKUP_FAILED: */
+/* message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); */
+/* break; */
+/* case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_SERVICE_UNAVAILABLE: */
+/* message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); */
+/* break; */
+/* case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_AUTHENTICATION_NOT_SUPPORTED: */
+/* /\* TODO: This logical ID seems more suitable for a wrong username or password than for a */
+/* * wrong authentication method. The user is unlikely to guess at the real cause. */
+/* *\/ */
+/* message = g_strdup_printf (_("eemev_ni_ui_smtp_authentication_fail_error"), server_name); */
+/* break; */
+/* case TNY_TRANSPORT_ACCOUNT_ERROR_SEND: */
+/* /\* TODO: Tinymail is still sending this sometimes when it should */
+/* * send TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL. *\/ */
+/* default: */
+/* message = g_strdup (_("emev_ib_ui_smtp_send_error")); */
+/* break; */
+/* } */
+/* } else { */
+/* message = g_strdup (_("emev_ib_ui_smtp_send_error")); */
+/* } */
- modest_maemo_show_information_note_and_forget (GTK_WINDOW (user_data), message);
- g_free (message);
+/* modest_maemo_show_information_note_and_forget (GTK_WINDOW (user_data), message); */
+/* g_free (message); */
- /* TODO: Offer to remove the message, to avoid messages in future? */
- /*
- TnyFolder *outbox = tny_send_queue_get_outbox (queue);
- tny_folder_remove_msg (outbox, header, NULL);
- tny_folder_sync (outbox, TRUE, NULL);
- g_object_unref (outbox);
- */
-}
+/* /\* TODO: Offer to remove the message, to avoid messages in future? *\/ */
+/* /\* */
+/* TnyFolder *outbox = tny_send_queue_get_outbox (queue); */
+/* tny_folder_remove_msg (outbox, header, NULL); */
+/* tny_folder_sync (outbox, TRUE, NULL); */
+/* g_object_unref (outbox); */
+/* *\/ */
+/* } */
typedef struct {
TnySendQueue *queue;
priv->queue_err_signals = NULL;
}
-static void
-on_account_store_connecting_finished (TnyAccountStore *store, ModestMainWindow *self)
-{
- ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
+/* static void */
+/* on_account_store_connecting_finished (TnyAccountStore *store, ModestMainWindow *self) */
+/* { */
+/* ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); */
- /* When going online, do the equivalent of pressing the send/receive button,
- * as per the specification:
- * (without the check for >0 accounts, though that is not specified): */
+/* /\* When going online, do the equivalent of pressing the send/receive button, */
+/* * as per the specification: */
+/* * (without the check for >0 accounts, though that is not specified): *\/ */
- TnyDevice *device = tny_account_store_get_device (store);
+/* TnyDevice *device = tny_account_store_get_device (store); */
- /* modest_folder_view_update_model (MODEST_FOLDER_VIEW (priv->folder_view), store); */
+/* /\* modest_folder_view_update_model (MODEST_FOLDER_VIEW (priv->folder_view), store); *\/ */
- /* Check that we are really online.
- * This signal should not be emitted when we are not connected,
- * but it seems to happen sometimes: */
- if (!tny_device_is_online (device))
- return;
+/* /\* Check that we are really online. */
+/* * This signal should not be emitted when we are not connected, */
+/* * but it seems to happen sometimes: *\/ */
+/* if (!tny_device_is_online (device)) */
+/* return; */
- const gchar *iap_id = tny_maemo_conic_device_get_current_iap_id (TNY_MAEMO_CONIC_DEVICE (device));
- printf ("DEBUG: %s: connection id=%s\n", __FUNCTION__, iap_id);
+/* const gchar *iap_id = tny_maemo_conic_device_get_current_iap_id (TNY_MAEMO_CONIC_DEVICE (device)); */
+/* printf ("DEBUG: %s: connection id=%s\n", __FUNCTION__, iap_id); */
- /* Stop the existing send queues: */
- modest_runtime_remove_all_send_queues ();
+/* /\* Stop the existing send queues: *\/ */
+/* modest_runtime_remove_all_send_queues (); */
- /* Create the send queues again, using the appropriate transport accounts
- * for this new connection.
- * This could be the first time that they are created if this is the first
- * connection. */
- /* TODO: Does this really destroy the TnySendQueues and their threads
- * We do not want 2 TnySendQueues to exist with the same underlying
- * outbox directory. */
-
- modest_main_window_cleanup_queue_error_signals (self);
-
- GSList *account_names = modest_account_mgr_account_names (
- modest_runtime_get_account_mgr(),
- TRUE /* enabled accounts only */);
- GSList *iter = account_names;
- while (iter) {
- const gchar *account_name = (const gchar*)(iter->data);
- if (account_name) {
- TnyTransportAccount *account = TNY_TRANSPORT_ACCOUNT (
- modest_tny_account_store_get_transport_account_for_open_connection
- (modest_runtime_get_account_store(), account_name));
- if (account) {
- /* Q: Is this the first location where the send-queues are requested? */
- QueueErrorSignal *esignal = g_slice_new (QueueErrorSignal);
- printf ("debug: %s:\n Transport account for %s: %s\n", __FUNCTION__, account_name,
- tny_account_get_id(TNY_ACCOUNT(account)));
- esignal->queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (account));
- esignal->signal = g_signal_connect (G_OBJECT (esignal->queue), "error-happened",
- G_CALLBACK (on_sendqueue_error_happened), self);
- priv->queue_err_signals = g_list_prepend (priv->queue_err_signals, esignal);
- }
- }
+/* /\* Create the send queues again, using the appropriate transport accounts */
+/* * for this new connection. */
+/* * This could be the first time that they are created if this is the first */
+/* * connection. *\/ */
+/* /\* TODO: Does this really destroy the TnySendQueues and their threads */
+/* * We do not want 2 TnySendQueues to exist with the same underlying */
+/* * outbox directory. *\/ */
+
+/* modest_main_window_cleanup_queue_error_signals (self); */
+
+/* GSList *account_names = modest_account_mgr_account_names ( */
+/* modest_runtime_get_account_mgr(), */
+/* TRUE /\* enabled accounts only *\/); */
+/* GSList *iter = account_names; */
+/* while (iter) { */
+/* const gchar *account_name = (const gchar*)(iter->data); */
+/* if (account_name) { */
+/* TnyTransportAccount *account = TNY_TRANSPORT_ACCOUNT ( */
+/* modest_tny_account_store_get_transport_account_for_open_connection */
+/* (modest_runtime_get_account_store(), account_name)); */
+/* if (account) { */
+/* /\* Q: Is this the first location where the send-queues are requested? *\/ */
+/* QueueErrorSignal *esignal = g_slice_new (QueueErrorSignal); */
+/* printf ("debug: %s:\n Transport account for %s: %s\n", __FUNCTION__, account_name, */
+/* tny_account_get_id(TNY_ACCOUNT(account))); */
+/* esignal->queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (account)); */
+/* esignal->signal = g_signal_connect (G_OBJECT (esignal->queue), "error-happened", */
+/* G_CALLBACK (on_sendqueue_error_happened), self); */
+/* priv->queue_err_signals = g_list_prepend (priv->queue_err_signals, esignal); */
+/* } */
+/* } */
- iter = g_slist_next (iter);
- }
+/* iter = g_slist_next (iter); */
+/* } */
- modest_account_mgr_free_account_names (account_names);
- account_names = NULL;
+/* modest_account_mgr_free_account_names (account_names); */
+/* account_names = NULL; */
- modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self));
-}
+/* modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self)); */
+/* } */
static void
_folder_view_csm_menu_activated (GtkWidget *widget, gpointer user_data)
/* Track account changes. We need to refresh the toolbar */
g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
- "account_update", G_CALLBACK (on_account_update),
+ "account_inserted", G_CALLBACK (account_number_changed),
+ self);
+ g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
+ "account_removed", G_CALLBACK (account_number_changed),
self);
/* Account store */
"password_requested",
G_CALLBACK (modest_ui_actions_on_password_requested), self);
- /* Device */
- g_signal_connect (G_OBJECT(modest_runtime_get_account_store()),
- "connecting-finished",
- G_CALLBACK(on_account_store_connecting_finished), self);
+/* /\* Device *\/ */
+/* g_signal_connect (G_OBJECT(modest_runtime_get_account_store()), */
+/* "connecting-finished", */
+/* G_CALLBACK(on_account_store_connecting_finished), self); */
}
#if 0
gtk_widget_tap_and_hold_setup (GTK_WIDGET (reply_button), menu, NULL, 0);
/* Set send & receive button tap and hold menu */
- on_account_update (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()),
+ account_number_changed (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()),
NULL, self);
}
}
static void
-on_account_update (TnyAccountStore *account_store,
- const gchar *account_name,
- gpointer user_data)
+account_number_changed (TnyAccountStore *account_store,
+ const gchar *account_name,
+ gpointer user_data)
{
GSList *account_names, *iter, *accounts;
ModestMainWindow *self;
for (i = 0; i < num_accounts; i++) {
ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i);
- if(account_data->account_name &&
+ if(account_data->account_name && default_account &&
strcmp (account_data->account_name, default_account) == 0) {
gchar *item_name = g_strconcat (account_data->account_name, "Menu", NULL);