#include "modest-ui-dimming-manager.h"
#include "maemo/modest-osso-state-saving.h"
#include "modest-text-utils.h"
+#include "modest-signal-mgr.h"
#ifdef MODEST_HAVE_HILDON0_WIDGETS
#include <hildon-widgets/hildon-program.h>
static void save_state (ModestWindow *self);
+static void
+update_menus (ModestMainWindow* self);
+
static void modest_main_window_show_toolbar (ModestWindow *window,
gboolean show_toolbar);
static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window);
-static void account_number_changed (TnyAccountStore *account_store,
- const gchar *account_name,
- gpointer user_data);
+static void
+on_account_inserted (TnyAccountStore *accoust_store,
+ TnyAccount *account,
+ gpointer user_data);
+
+static void
+on_account_removed (TnyAccountStore *accoust_store,
+ TnyAccount *account,
+ gpointer user_data);
+
+static void
+on_account_changed (ModestAccountMgr* mgr,
+ const gchar* account,
+ gpointer user_data);
static gboolean on_inner_widgets_key_pressed (GtkWidget *widget,
GdkEventKey *event,
static void
set_at_least_one_account_visible(ModestMainWindow *self);
+
/* list my signals */
enum {
/* MY_SIGNAL_1, */
guint progress_bar_timeout;
/* Signal handler UIDs */
- gint queue_changed_handler_uid;
GList *queue_err_signals;
-
+ GSList *sighandlers;
+
ModestConfNotificationId notification_id;
};
#define MODEST_MAIN_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
priv->optimized_view = FALSE;
priv->send_receive_in_progress = FALSE;
priv->progress_bar_timeout = 0;
- priv->queue_changed_handler_uid = 0;
+ priv->sighandlers = NULL;
}
static void
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
+ if (priv->notification_id) {
+ modest_conf_forget_namespace (modest_runtime_get_conf (),
+ MODEST_CONF_NAMESPACE,
+ priv->notification_id);
+ }
+
/* Sanity check: shouldn't be needed, the window mgr should
call this function before */
modest_main_window_disconnect_signals (MODEST_WINDOW (obj));
priv->progress_bar_timeout = 0;
}
- if (priv->notification_id) {
- modest_conf_forget_namespace (modest_runtime_get_conf (),
- MODEST_CONF_NAMESPACE,
- priv->notification_id);
- }
-
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
MODEST_CONF_FOLDER_VIEW_KEY);
}
-static void
-wrap_in_scrolled_window (GtkWidget *win, GtkWidget *widget)
+static gint
+compare_display_names (ModestAccountData *a,
+ ModestAccountData *b)
{
- if (!gtk_widget_set_scroll_adjustments (widget, NULL, NULL))
- gtk_scrolled_window_add_with_viewport
- (GTK_SCROLLED_WINDOW(win), widget);
- else
- gtk_container_add (GTK_CONTAINER(win),
- widget);
+ return strcmp (a->display_name, b->display_name);
}
+static void
+update_menus (ModestMainWindow* self)
+{
+ GSList *account_names, *iter, *accounts;
+ ModestMainWindowPrivate *priv;
+ ModestWindowPrivate *parent_priv;
+ ModestAccountMgr *mgr;
+ gint i, num_accounts;
+ GtkActionGroup *action_group;
+ GList *groups;
+ gchar *default_account;
+ GtkWidget *send_receive_button, *item;
+ GtkAction *send_receive_all = NULL;
-/* static gboolean */
-/* on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMainWindow *self) */
-/* { */
-/* modest_window_save_state (MODEST_WINDOW(self)); */
-/* return FALSE; */
-/* } */
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
-/* 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); */
+ /* Get enabled account IDs */
+ mgr = modest_runtime_get_account_mgr ();
+ account_names = modest_account_mgr_account_names (mgr, TRUE);
+ iter = account_names;
+ accounts = NULL;
-/* 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; */
-/* } */
+ while (iter) {
+ ModestAccountData *account_data =
+ modest_account_mgr_get_account_data (mgr, (gchar*) iter->data);
+ accounts = g_slist_prepend (accounts, account_data);
-/* /\* 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)); */
-
-/* g_object_unref (server_account); */
-/* server_account = NULL; */
-/* } */
-
-/* if (!server_name) */
-/* server_name = _("Unknown Server"); */
+ iter = iter->next;
+ }
+ modest_account_mgr_free_account_names (account_names);
+ account_names = NULL;
-/* /\* 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); */
-
-/* /\* 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); */
-/* *\/ */
-/* } */
+ /* Order the list of accounts by its display name */
+ accounts = g_slist_sort (accounts, (GCompareFunc) compare_display_names);
+ num_accounts = g_slist_length (accounts);
-typedef struct {
- TnySendQueue *queue;
- guint signal;
-} QueueErrorSignal;
+ send_receive_all = gtk_ui_manager_get_action (parent_priv->ui_manager,
+ "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu");
+ gtk_action_set_visible (send_receive_all, num_accounts > 1);
-static void
-modest_main_window_cleanup_queue_error_signals (ModestMainWindow *self)
-{
- ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
+ /* Delete old send&receive popup items. We can not just do a
+ menu_detach because it does not work well with
+ tap_and_hold */
+ if (priv->accounts_popup)
+ gtk_container_foreach (GTK_CONTAINER (priv->accounts_popup),
+ (GtkCallback) gtk_widget_destroy, NULL);
- GList *oerrsignals = priv->queue_err_signals;
- while (oerrsignals) {
- QueueErrorSignal *esignal = (QueueErrorSignal *) oerrsignals->data;
- g_signal_handler_disconnect (esignal->queue, esignal->signal);
- g_slice_free (QueueErrorSignal, esignal);
- oerrsignals = g_list_next (oerrsignals);
+ /* Delete old entries in the View menu. Do not free groups, it
+ belongs to Gtk+ */
+ groups = gtk_ui_manager_get_action_groups (parent_priv->ui_manager);
+ while (groups) {
+ if (!strcmp (MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS,
+ gtk_action_group_get_name (GTK_ACTION_GROUP (groups->data)))) {
+ gtk_ui_manager_remove_action_group (parent_priv->ui_manager,
+ GTK_ACTION_GROUP (groups->data));
+ groups = NULL;
+ /* Remove uis */
+ if (priv->merge_ids) {
+ for (i = 0; i < priv->merge_ids->len; i++)
+ gtk_ui_manager_remove_ui (parent_priv->ui_manager, priv->merge_ids->data[i]);
+ g_byte_array_free (priv->merge_ids, TRUE);
+ }
+ /* We need to call this in order to ensure
+ that the new actions are added in the right
+ order (alphabetical */
+ gtk_ui_manager_ensure_update (parent_priv->ui_manager);
+ } else
+ groups = g_list_next (groups);
}
- g_list_free (priv->queue_err_signals);
- priv->queue_err_signals = NULL;
-}
+ priv->merge_ids = g_byte_array_sized_new (num_accounts);
-/* static void */
-/* on_account_store_connecting_finished (TnyAccountStore *store, ModestMainWindow *self) */
-/* { */
-/* ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); */
+ /* Get send receive button */
+ send_receive_button = gtk_ui_manager_get_widget (parent_priv->ui_manager,
+ "/ToolBar/ToolbarSendReceive");
-/* /\* 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): *\/ */
+ /* Create the menu */
+ if (num_accounts > 1) {
+ if (!priv->accounts_popup)
+ priv->accounts_popup = gtk_menu_new ();
+ item = gtk_menu_item_new_with_label (_("mcen_me_toolbar_sendreceive_all"));
+ gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
+ g_signal_connect (G_OBJECT (item),
+ "activate",
+ G_CALLBACK (on_send_receive_csm_activated),
+ NULL);
+ item = gtk_separator_menu_item_new ();
+ gtk_menu_shell_prepend (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
+ }
-/* TnyDevice *device = tny_account_store_get_device (store); */
+ /* Create a new action group */
+ default_account = modest_account_mgr_get_default_account (mgr);
+ action_group = gtk_action_group_new (MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS);
+ for (i = 0; i < num_accounts; i++) {
+ gchar *display_name = NULL;
+
+ ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i);
-/* /\* 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; */
-
-/* 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 (); */
-
-/* /\* 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. *\/ */
+ /* Create display name. The UI specification specifies a different format string
+ * to use for the default account, though both seem to be "%s", so
+ * I don't see what the point is. murrayc. */
+ if (default_account && account_data->account_name &&
+ !(strcmp (default_account, account_data->account_name) == 0)) {
+ display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"),
+ account_data->display_name);
+ }
+ else {
+ display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_mailbox_n"),
+ account_data->display_name);
+ }
-/* modest_main_window_cleanup_queue_error_signals (self); */
+ /* Create action and add it to the action group. The
+ action name must be the account name, this way we
+ could know in the handlers the account to show */
+ if(account_data && account_data->account_name) {
+ gchar* item_name, *refresh_action_name;
+ guint8 merge_id = 0;
+ GtkAction *view_account_action, *refresh_account_action;
-/* GSList *account_names = modest_account_mgr_account_names ( */
-/* modest_runtime_get_account_mgr(), */
-/* TRUE /\* enabled accounts only *\/); */
-/* GSList *iter = account_names; */
+ view_account_action = gtk_action_new (account_data->account_name,
+ display_name, NULL, NULL);
+ gtk_action_group_add_action (action_group, view_account_action);
+
+ /* Add ui from account data. We allow 2^9-1 account
+ changes in a single execution because we're
+ downcasting the guint to a guint8 in order to use a
+ GByteArray. It should be enough. */
+ item_name = g_strconcat (account_data->account_name, "Menu", NULL);
+ merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager);
+ priv->merge_ids = g_byte_array_append (priv->merge_ids, &merge_id, 1);
+ gtk_ui_manager_add_ui (parent_priv->ui_manager,
+ merge_id,
+ "/MenuBar/ViewMenu/ViewMenuAdditions",
+ item_name,
+ account_data->account_name,
+ GTK_UI_MANAGER_MENUITEM,
+ FALSE);
+
+ /* Connect the action signal "activate" */
+ g_signal_connect (G_OBJECT (view_account_action),
+ "activate",
+ G_CALLBACK (on_show_account_action_activated),
+ self);
+
+ /* Create the items for the Tools->Send&Receive submenu */
+ refresh_action_name = g_strconcat ("SendReceive", account_data->account_name, NULL);
+ refresh_account_action = gtk_action_new ((const gchar*) refresh_action_name,
+ display_name, NULL, NULL);
+ printf("DEBUG: %s: menu display_name=%s\n", __FUNCTION__, display_name);
+ gtk_action_group_add_action (action_group, refresh_account_action);
+
+ merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager);
+ priv->merge_ids = g_byte_array_append (priv->merge_ids, &merge_id, 1);
+ gtk_ui_manager_add_ui (parent_priv->ui_manager,
+ merge_id,
+ "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions",
+ item_name,
+ refresh_action_name,
+ GTK_UI_MANAGER_MENUITEM,
+ FALSE);
+ g_free (refresh_action_name);
+
+ g_signal_connect_data (G_OBJECT (refresh_account_action),
+ "activate",
+ G_CALLBACK (on_refresh_account_action_activated),
+ g_strdup (account_data->account_name),
+ (GClosureNotify) g_free,
+ 0);
+
+ /* Create item and add it to the send&receive
+ CSM. If there is only one account then
+ it'll be no menu */
+ if (priv->accounts_popup) {
+ GtkWidget *label = gtk_label_new(NULL);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ if (default_account && (strcmp(account_data->account_name, default_account) == 0))
+ {
+ gchar *escaped = g_markup_printf_escaped ("<b>%s</b>", display_name);
+ gtk_label_set_markup (GTK_LABEL (label), escaped);
+ g_free (escaped);
+ }
+ else
+ {
+ gtk_label_set_text (GTK_LABEL (label), display_name);
+ }
+
+ item = gtk_menu_item_new ();
+ gtk_container_add (GTK_CONTAINER (item), label);
+
+ gtk_menu_shell_prepend (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
+ g_signal_connect_data (G_OBJECT (item),
+ "activate",
+ G_CALLBACK (on_send_receive_csm_activated),
+ g_strdup (account_data->account_name),
+ (GClosureNotify) g_free,
+ 0);
+ }
+ g_free (item_name);
+ }
+
+ /* Frees */
+ g_free (display_name);
+ }
+
+ gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 1);
+
+ /* We cannot do this in the loop above because this relies on the action
+ * group being inserted. This makes the default account appear in bold.
+ * I agree it is a rather ugly way, but I don't see another possibility. armin. */
+ for (i = 0; i < num_accounts; i++) {
+ ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i);
+
+ 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);
+
+ gchar *path = g_strconcat ("/MenuBar/ViewMenu/ViewMenuAdditions/", item_name, NULL);
+ GtkWidget *item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path);
+ g_free(path);
+
+ if (item) {
+ GtkWidget *child = gtk_bin_get_child (GTK_BIN (item));
+ if (GTK_IS_LABEL (child)) {
+ const gchar *cur_name = gtk_label_get_text (GTK_LABEL (child));
+ gchar *bold_name = g_markup_printf_escaped("<b>%s</b>", cur_name);
+ gtk_label_set_markup (GTK_LABEL (child), bold_name);
+ g_free (bold_name);
+ }
+ }
+
+ path = g_strconcat("/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions/", item_name, NULL);
+ item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path);
+ g_free (path);
+
+ if (item) {
+ GtkWidget *child = gtk_bin_get_child (GTK_BIN (item));
+ if (GTK_IS_LABEL (child)) {
+ const gchar *cur_name = gtk_label_get_text (GTK_LABEL (child));
+ gchar *bold_name = g_markup_printf_escaped("<b>%s</b>", cur_name);
+ gtk_label_set_markup (GTK_LABEL (child), bold_name);
+ g_free (bold_name);
+ }
+ }
+
+ g_free(item_name);
+ }
+
+ modest_account_mgr_free_account_data (mgr, account_data);
+ }
+
+ if (priv->accounts_popup) {
+ /* Mandatory in order to view the menu contents */
+ gtk_widget_show_all (priv->accounts_popup);
+
+ /* Setup tap_and_hold just if was not done before*/
+ if (!gtk_menu_get_attach_widget (GTK_MENU (priv->accounts_popup)))
+ gtk_widget_tap_and_hold_setup (send_receive_button, priv->accounts_popup, NULL, 0);
+ }
+
+ /* Frees */
+ g_slist_free (accounts);
+ g_free (default_account);
+
+
+ /* Make sure that at least one account is viewed if there are any
+ * accounts, for instance when adding the first account: */
+ set_at_least_one_account_visible (self);
+}
+
+static void
+wrap_in_scrolled_window (GtkWidget *win, GtkWidget *widget)
+{
+ if (!gtk_widget_set_scroll_adjustments (widget, NULL, NULL))
+ gtk_scrolled_window_add_with_viewport
+ (GTK_SCROLLED_WINDOW(win), widget);
+ else
+ gtk_container_add (GTK_CONTAINER(win),
+ widget);
+}
+
+
+/* static gboolean */
+/* on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMainWindow *self) */
+/* { */
+/* modest_window_save_state (MODEST_WINDOW(self)); */
+/* 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); */
+
+/* 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; */
+
+/* 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; */
+/* } */
+
+/* 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); */
+
+/* /\* 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;
+ guint signal;
+} QueueErrorSignal;
+
+static void
+modest_main_window_cleanup_queue_error_signals (ModestMainWindow *self)
+{
+ ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
+
+ GList *oerrsignals = priv->queue_err_signals;
+ while (oerrsignals) {
+ QueueErrorSignal *esignal = (QueueErrorSignal *) oerrsignals->data;
+ g_signal_handler_disconnect (esignal->queue, esignal->signal);
+ g_slice_free (QueueErrorSignal, esignal);
+ oerrsignals = g_list_next (oerrsignals);
+ }
+ g_list_free (priv->queue_err_signals);
+ priv->queue_err_signals = NULL;
+}
+
+/* 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): *\/ */
+
+/* TnyDevice *device = tny_account_store_get_device (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; */
+
+/* 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 (); */
+
+/* /\* 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) { */
static void
modest_main_window_disconnect_signals (ModestWindow *self)
{
- ModestMainWindowPrivate *priv;
-
+ ModestMainWindowPrivate *priv;
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- /* Disconnect signal handlers */
- if (g_signal_handler_is_connected (modest_runtime_get_mail_operation_queue (),
- priv->queue_changed_handler_uid))
- g_signal_handler_disconnect (modest_runtime_get_mail_operation_queue (),
- priv->queue_changed_handler_uid);
+ modest_signal_mgr_disconnect_all_and_destroy (priv->sighandlers);
+ priv->sighandlers = NULL;
}
static void
parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
/* folder view */
- g_signal_connect (G_OBJECT(priv->folder_view), "key-press-event",
- G_CALLBACK(on_inner_widgets_key_pressed), self);
- g_signal_connect (G_OBJECT(priv->folder_view), "folder_selection_changed",
- G_CALLBACK(modest_main_window_on_folder_selection_changed), self);
- g_signal_connect (G_OBJECT(priv->folder_view), "folder-display-name-changed",
- G_CALLBACK(modest_ui_actions_on_folder_display_name_changed), self);
- g_signal_connect (G_OBJECT (priv->folder_view), "focus-in-event",
- G_CALLBACK (on_folder_view_focus_in), self);
+
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT(priv->folder_view), "key-press-event",
+ G_CALLBACK(on_inner_widgets_key_pressed), self);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->folder_view), "folder_selection_changed",
+ G_CALLBACK(modest_main_window_on_folder_selection_changed), self);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->folder_view), "folder-display-name-changed",
+ G_CALLBACK(modest_ui_actions_on_folder_display_name_changed), self);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (priv->folder_view), "focus-in-event",
+ G_CALLBACK (on_folder_view_focus_in), self);
/* Folder view CSM */
menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/FolderViewCSM");
gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->folder_view), menu, NULL, 0);
- g_signal_connect (G_OBJECT(priv->folder_view), "tap-and-hold",
- G_CALLBACK(_folder_view_csm_menu_activated),
- self);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, G_OBJECT(priv->folder_view), "tap-and-hold",
+ G_CALLBACK(_folder_view_csm_menu_activated),
+ self);
/* header view */
- g_signal_connect (G_OBJECT(priv->header_view), "header_selected",
- G_CALLBACK(modest_ui_actions_on_header_selected), self);
- g_signal_connect (G_OBJECT(priv->header_view), "header_activated",
- G_CALLBACK(modest_ui_actions_on_header_activated), self);
- g_signal_connect (G_OBJECT(priv->header_view), "item_not_found",
- G_CALLBACK(modest_ui_actions_on_item_not_found), self);
- g_signal_connect (G_OBJECT(priv->header_view), "key-press-event",
- G_CALLBACK(on_inner_widgets_key_pressed), self);
- g_signal_connect (G_OBJECT(priv->header_view), "msg_count_changed",
- G_CALLBACK(_on_msg_count_changed), self);
- g_signal_connect (G_OBJECT (priv->header_view), "focus-in-event",
- G_CALLBACK (on_header_view_focus_in), self);
-
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "header_selected",
+ G_CALLBACK(modest_ui_actions_on_header_selected), self);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "header_activated",
+ G_CALLBACK(modest_ui_actions_on_header_activated), self);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "item_not_found",
+ G_CALLBACK(modest_ui_actions_on_item_not_found), self);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "key-press-event",
+ G_CALLBACK(on_inner_widgets_key_pressed), self);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "msg_count_changed",
+ G_CALLBACK(_on_msg_count_changed), self);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (priv->header_view), "focus-in-event",
+ G_CALLBACK (on_header_view_focus_in), self);
+
/* Header view CSM */
menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/HeaderViewCSM");
gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->header_view), menu, NULL, 0);
- g_signal_connect (G_OBJECT(priv->header_view), "tap-and-hold",
- G_CALLBACK(_header_view_csm_menu_activated),
- self);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "tap-and-hold",
+ G_CALLBACK(_header_view_csm_menu_activated),
+ self);
/* window */
- g_signal_connect (G_OBJECT (self), "window-state-event",
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (self), "window-state-event",
G_CALLBACK (modest_main_window_window_state_event),
NULL);
/* Mail Operation Queue */
- priv->queue_changed_handler_uid =
- g_signal_connect (G_OBJECT (modest_runtime_get_mail_operation_queue ()),
- "queue-changed", G_CALLBACK (on_queue_changed), self);
-
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_mail_operation_queue ()),
+ "queue-changed", G_CALLBACK (on_queue_changed), self);
+
/* Track changes in the device name */
priv->notification_id = modest_conf_listen_to_namespace (modest_runtime_get_conf (),
MODEST_CONF_NAMESPACE);
- g_signal_connect (G_OBJECT(modest_runtime_get_conf ()),
- "key_changed", G_CALLBACK (on_configuration_key_changed),
- self);
-
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(modest_runtime_get_conf ()),
+ "key_changed", G_CALLBACK (on_configuration_key_changed),
+ self);
+
/* Track account changes. We need to refresh the toolbar */
- g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
- "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);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_account_store ()),
+ "account_inserted", G_CALLBACK (on_account_inserted),
+ self);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_account_store ()),
+ "account_removed", G_CALLBACK (on_account_removed),
+ self);
+
+ /* We need to refresh the send & receive menu to change the bold
+ * account when the default account changes. */
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_account_mgr ()),
+ "account_changed", G_CALLBACK (on_account_changed),
+ self);
/* Account store */
- g_signal_connect (G_OBJECT (modest_runtime_get_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); */
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_account_store()),
+ "password_requested",
+ G_CALLBACK (modest_ui_actions_on_password_requested), self);
}
#if 0
/* putting it all together... */
priv->main_vbox = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX(priv->main_vbox), priv->main_paned, TRUE, TRUE,0);
- gtk_widget_show (priv->main_vbox);
-
- gtk_container_add (GTK_CONTAINER(self), priv->main_vbox);
-
- HildonProgram *app = hildon_program_get_instance ();
- hildon_program_add_window (app, HILDON_WINDOW (self));
-
- g_signal_connect (G_OBJECT(app), "notify::is-topmost",
- G_CALLBACK (on_hildon_program_is_topmost_notify), self);
-
- g_signal_connect (G_OBJECT(self), "show",
- G_CALLBACK (modest_main_window_on_show), folder_win);
-
- /* Set window icon */
- window_icon = modest_platform_get_icon (MODEST_APP_ICON);
- if (window_icon) {
- gtk_window_set_icon (GTK_WINDOW (self), window_icon);
- g_object_unref (window_icon);
- }
-
- /* Dont't restore settings here,
- * because it requires a gtk_widget_show(),
- * and we don't want to do that until later,
- * so that the UI is not visible for non-menu D-Bus activation.
- */
- /* restore_settings (MODEST_MAIN_WINDOW(self), FALSE); */
-
- return MODEST_WINDOW(self);
-}
-
-gboolean
-modest_main_window_close_all (ModestMainWindow *self)
-{
- GtkWidget *note;
- GtkResponseType response;
-
- /* Create the confirmation dialog MSG-NOT308 */
- note = hildon_note_new_confirmation_add_buttons (GTK_WINDOW (self),
- _("emev_nc_close_windows"),
- _("mcen_bd_yes"), GTK_RESPONSE_YES,
- _("mcen_bd_no"), GTK_RESPONSE_NO,
- NULL);
-
- response = gtk_dialog_run (GTK_DIALOG (note));
- gtk_widget_destroy (GTK_WIDGET (note));
-
- if (response == GTK_RESPONSE_YES)
- return TRUE;
- else
- return FALSE;
-}
-
-
-void
-modest_main_window_set_style (ModestMainWindow *self,
- ModestMainWindowStyle style)
-{
- ModestMainWindowPrivate *priv;
- ModestWindowPrivate *parent_priv;
- GtkAction *action;
- gboolean active;
-
- g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
-
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
-
- /* no change -> nothing to do */
- if (priv->style == style)
- return;
-
- /* Get toggle button and update the state if needed. This will
- happen only when the set_style is not invoked from the UI,
- for example when it's called from widget memory */
- action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToggleFolders");
- active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
- if ((active && style == MODEST_MAIN_WINDOW_STYLE_SIMPLE) ||
- (!active && style == MODEST_MAIN_WINDOW_STYLE_SPLIT)) {
- g_signal_handlers_block_by_func (action, modest_ui_actions_toggle_folders_view, self);
- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), !active);
- g_signal_handlers_unblock_by_func (action, modest_ui_actions_toggle_folders_view, self);
- }
-
- priv->style = style;
- switch (style) {
- case MODEST_MAIN_WINDOW_STYLE_SIMPLE:
- /* Remove main paned */
- g_object_ref (priv->main_paned);
- gtk_container_remove (GTK_CONTAINER (priv->main_vbox), priv->main_paned);
-
- /* Reparent the contents widget to the main vbox */
- gtk_widget_reparent (priv->contents_widget, priv->main_vbox);
-
- if (modest_header_view_has_selected_headers (MODEST_HEADER_VIEW (priv->header_view))) {
- TnyList *selection = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (priv->header_view));
- TnyIterator *iterator = tny_list_create_iterator (selection);
- TnyHeader *header;
- tny_iterator_first (iterator);
- header = TNY_HEADER (tny_iterator_get_current (iterator));
- if (tny_header_get_subject (header))
- gtk_window_set_title (GTK_WINDOW(self), tny_header_get_subject (header));
- else
- gtk_window_set_title (GTK_WINDOW (self), _("mail_va_no_subject"));
-
- if (header)
- g_object_unref (header);
-
- g_object_unref (iterator);
- g_object_unref (selection);
- }
-
- break;
- case MODEST_MAIN_WINDOW_STYLE_SPLIT:
- /* Remove header view */
- g_object_ref (priv->contents_widget);
- gtk_container_remove (GTK_CONTAINER (priv->main_vbox), priv->contents_widget);
-
- /* Reparent the main paned */
- gtk_paned_add2 (GTK_PANED (priv->main_paned), priv->contents_widget);
- gtk_container_add (GTK_CONTAINER (priv->main_vbox), priv->main_paned);
-
- break;
- default:
- g_return_if_reached ();
- }
-
- /* Let header view grab the focus if it's being shown */
- if (priv->contents_style == MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS)
- gtk_widget_grab_focus (GTK_WIDGET (priv->header_view));
- else
- gtk_widget_grab_focus (GTK_WIDGET (priv->contents_widget));
-
- /* Show changes */
- gtk_widget_show_all (GTK_WIDGET (priv->main_vbox));
-}
-
-ModestMainWindowStyle
-modest_main_window_get_style (ModestMainWindow *self)
-{
- ModestMainWindowPrivate *priv;
-
- g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (self), -1);
-
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- return priv->style;
-}
-
-
-
-static gboolean
-modest_main_window_window_state_event (GtkWidget *widget, GdkEventWindowState *event, gpointer userdata)
-{
- if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {
- ModestWindowPrivate *parent_priv;
- ModestWindowMgr *mgr;
- gboolean is_fullscreen;
- GtkAction *fs_toggle_action;
- gboolean active;
-
- mgr = modest_runtime_get_window_mgr ();
-
- is_fullscreen = modest_window_mgr_get_fullscreen_mode (mgr);
-
- parent_priv = MODEST_WINDOW_GET_PRIVATE (widget);
-
- fs_toggle_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewToggleFullscreenMenu");
- active = (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (fs_toggle_action)))?1:0;
- if (is_fullscreen != active) {
- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (fs_toggle_action), is_fullscreen);
- }
- }
-
- return FALSE;
-
-}
-
-static void
-set_homogeneous (GtkWidget *widget,
- gpointer data)
-{
- gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), TRUE);
- gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), TRUE);
-}
-
-static void
-modest_main_window_show_toolbar (ModestWindow *self,
- gboolean show_toolbar)
-{
- ModestMainWindowPrivate *priv = NULL;
- ModestWindowPrivate *parent_priv = NULL;
- GtkWidget *reply_button = NULL, *menu = NULL;
- GtkWidget *placeholder = NULL;
- gint insert_index;
-
- g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
-
- /* Set optimized view status */
- priv->optimized_view = !show_toolbar;
-
- if (!parent_priv->toolbar) {
- parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager,
- "/ToolBar");
-
- /* Set homogeneous toolbar */
- gtk_container_foreach (GTK_CONTAINER (parent_priv->toolbar),
- set_homogeneous, NULL);
+ gtk_widget_show (priv->main_vbox);
- priv->progress_toolitem = GTK_WIDGET (gtk_tool_item_new ());
- priv->cancel_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarCancel");
- priv->refresh_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSendReceive");
- priv->sort_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSort");
- gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE);
- gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE);
- gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE);
- gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE);
+ gtk_container_add (GTK_CONTAINER(self), priv->main_vbox);
+
+ HildonProgram *app = hildon_program_get_instance ();
+ hildon_program_add_window (app, HILDON_WINDOW (self));
+
+ g_signal_connect (G_OBJECT(app), "notify::is-topmost",
+ G_CALLBACK (on_hildon_program_is_topmost_notify), self);
- /* Add ProgressBar (Transfer toolbar) */
- priv->progress_bar = modest_progress_bar_widget_new ();
- gtk_widget_set_no_show_all (priv->progress_bar, TRUE);
- placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ProgressBarView");
- insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder));
- gtk_container_add (GTK_CONTAINER (priv->progress_toolitem), priv->progress_bar);
- gtk_toolbar_insert(GTK_TOOLBAR(parent_priv->toolbar), GTK_TOOL_ITEM (priv->progress_toolitem), insert_index);
-
- /* Connect cancel 'clicked' signal to abort progress mode */
- g_signal_connect(priv->cancel_toolitem, "clicked",
- G_CALLBACK(cancel_progressbar),
- self);
+ g_signal_connect (G_OBJECT(self), "show",
+ G_CALLBACK (modest_main_window_on_show), folder_win);
- /* Add it to the observers list */
- priv->progress_widgets = g_slist_prepend(priv->progress_widgets, priv->progress_bar);
+ /* Set window icon */
+ window_icon = modest_platform_get_icon (MODEST_APP_ICON);
+ if (window_icon) {
+ gtk_window_set_icon (GTK_WINDOW (self), window_icon);
+ g_object_unref (window_icon);
+ }
- /* Add to window */
- hildon_window_add_toolbar (HILDON_WINDOW (self),
- GTK_TOOLBAR (parent_priv->toolbar));
+ /* Dont't restore settings here,
+ * because it requires a gtk_widget_show(),
+ * and we don't want to do that until later,
+ * so that the UI is not visible for non-menu D-Bus activation.
+ */
+ /* restore_settings (MODEST_MAIN_WINDOW(self), FALSE); */
- /* Set reply button tap and hold menu */
- reply_button = gtk_ui_manager_get_widget (parent_priv->ui_manager,
- "/ToolBar/ToolbarMessageReply");
- menu = gtk_ui_manager_get_widget (parent_priv->ui_manager,
- "/ToolbarReplyCSM");
- gtk_widget_tap_and_hold_setup (GTK_WIDGET (reply_button), menu, NULL, 0);
+ return MODEST_WINDOW(self);
+}
- /* Set send & receive button tap and hold menu */
- account_number_changed (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()),
- NULL, self);
- }
+gboolean
+modest_main_window_close_all (ModestMainWindow *self)
+{
+ GtkWidget *note;
+ GtkResponseType response;
- if (show_toolbar) {
- /* Quick hack: this prevents toolbar icons "dance" when progress bar show status is changed */
- /* TODO: resize mode migth be GTK_RESIZE_QUEUE, in order to avoid unneccesary shows */
- gtk_container_set_resize_mode (GTK_CONTAINER(parent_priv->toolbar), GTK_RESIZE_IMMEDIATE);
+ /* Create the confirmation dialog MSG-NOT308 */
+ note = hildon_note_new_confirmation_add_buttons (GTK_WINDOW (self),
+ _("emev_nc_close_windows"),
+ _("mcen_bd_yes"), GTK_RESPONSE_YES,
+ _("mcen_bd_no"), GTK_RESPONSE_NO,
+ NULL);
- gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
- set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
- } else
- gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
+ response = gtk_dialog_run (GTK_DIALOG (note));
+ gtk_widget_destroy (GTK_WIDGET (note));
+ if (response == GTK_RESPONSE_YES)
+ return TRUE;
+ else
+ return FALSE;
}
-static gint
-compare_display_names (ModestAccountData *a,
- ModestAccountData *b)
-{
- return strcmp (a->display_name, b->display_name);
-}
-static void
-account_number_changed (TnyAccountStore *account_store,
- const gchar *account_name,
- gpointer user_data)
-{
- GSList *account_names, *iter, *accounts;
- ModestMainWindow *self;
+void
+modest_main_window_set_style (ModestMainWindow *self,
+ ModestMainWindowStyle style)
+{
ModestMainWindowPrivate *priv;
ModestWindowPrivate *parent_priv;
- ModestAccountMgr *mgr;
- gint i, num_accounts;
- GtkActionGroup *action_group;
- GList *groups;
- gchar *default_account;
- GtkWidget *send_receive_button, *item;
- GtkAction *send_receive_all = NULL;
-
- self = MODEST_MAIN_WINDOW (user_data);
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
- parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
+ GtkAction *action;
+ gboolean active;
- /* Get enabled account IDs */
- mgr = modest_runtime_get_account_mgr ();
- account_names = modest_account_mgr_account_names (mgr, TRUE);
- iter = account_names;
- accounts = NULL;
+ g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
- while (iter) {
- ModestAccountData *account_data =
- modest_account_mgr_get_account_data (mgr, (gchar*) iter->data);
- accounts = g_slist_prepend (accounts, account_data);
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
- iter = iter->next;
- }
- modest_account_mgr_free_account_names (account_names);
- account_names = NULL;
+ /* no change -> nothing to do */
+ if (priv->style == style)
+ return;
- /* Order the list of accounts by its display name */
- accounts = g_slist_sort (accounts, (GCompareFunc) compare_display_names);
- num_accounts = g_slist_length (accounts);
+ /* Get toggle button and update the state if needed. This will
+ happen only when the set_style is not invoked from the UI,
+ for example when it's called from widget memory */
+ action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToggleFolders");
+ active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+ if ((active && style == MODEST_MAIN_WINDOW_STYLE_SIMPLE) ||
+ (!active && style == MODEST_MAIN_WINDOW_STYLE_SPLIT)) {
+ g_signal_handlers_block_by_func (action, modest_ui_actions_toggle_folders_view, self);
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), !active);
+ g_signal_handlers_unblock_by_func (action, modest_ui_actions_toggle_folders_view, self);
+ }
- send_receive_all = gtk_ui_manager_get_action (parent_priv->ui_manager,
- "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu");
- gtk_action_set_visible (send_receive_all, num_accounts > 1);
+ priv->style = style;
+ switch (style) {
+ case MODEST_MAIN_WINDOW_STYLE_SIMPLE:
+ /* Remove main paned */
+ g_object_ref (priv->main_paned);
+ gtk_container_remove (GTK_CONTAINER (priv->main_vbox), priv->main_paned);
- /* Delete old send&receive popup items. We can not just do a
- menu_detach because it does not work well with
- tap_and_hold */
- if (priv->accounts_popup)
- gtk_container_foreach (GTK_CONTAINER (priv->accounts_popup),
- (GtkCallback) gtk_widget_destroy, NULL);
+ /* Reparent the contents widget to the main vbox */
+ gtk_widget_reparent (priv->contents_widget, priv->main_vbox);
- /* Delete old entries in the View menu. Do not free groups, it
- belongs to Gtk+ */
- groups = gtk_ui_manager_get_action_groups (parent_priv->ui_manager);
- while (groups) {
- if (!strcmp (MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS,
- gtk_action_group_get_name (GTK_ACTION_GROUP (groups->data)))) {
- gtk_ui_manager_remove_action_group (parent_priv->ui_manager,
- GTK_ACTION_GROUP (groups->data));
- groups = NULL;
- /* Remove uis */
- if (priv->merge_ids) {
- for (i = 0; i < priv->merge_ids->len; i++)
- gtk_ui_manager_remove_ui (parent_priv->ui_manager, priv->merge_ids->data[i]);
- g_byte_array_free (priv->merge_ids, TRUE);
- }
- /* We need to call this in order to ensure
- that the new actions are added in the right
- order (alphabetical */
- gtk_ui_manager_ensure_update (parent_priv->ui_manager);
- } else
- groups = g_list_next (groups);
- }
- priv->merge_ids = g_byte_array_sized_new (num_accounts);
+ break;
+ case MODEST_MAIN_WINDOW_STYLE_SPLIT:
+ /* Remove header view */
+ g_object_ref (priv->contents_widget);
+ gtk_container_remove (GTK_CONTAINER (priv->main_vbox), priv->contents_widget);
- /* Get send receive button */
- send_receive_button = gtk_ui_manager_get_widget (parent_priv->ui_manager,
- "/ToolBar/ToolbarSendReceive");
+ /* Reparent the main paned */
+ gtk_paned_add2 (GTK_PANED (priv->main_paned), priv->contents_widget);
+ gtk_container_add (GTK_CONTAINER (priv->main_vbox), priv->main_paned);
- /* Create the menu */
- if (num_accounts > 1) {
- if (!priv->accounts_popup)
- priv->accounts_popup = gtk_menu_new ();
- item = gtk_menu_item_new_with_label (_("mcen_me_toolbar_sendreceive_all"));
- gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
- g_signal_connect (G_OBJECT (item),
- "activate",
- G_CALLBACK (on_send_receive_csm_activated),
- NULL);
- item = gtk_separator_menu_item_new ();
- gtk_menu_shell_prepend (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
+ break;
+ default:
+ g_return_if_reached ();
}
- /* Create a new action group */
- default_account = modest_account_mgr_get_default_account (mgr);
- action_group = gtk_action_group_new (MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS);
- for (i = 0; i < num_accounts; i++) {
- gchar *display_name = NULL;
-
- ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i);
-
- /* Create display name. The UI specification specifies a different format string
- * to use for the default account, though both seem to be "%s", so
- * I don't see what the point is. murrayc. */
- if (default_account && account_data->account_name &&
- !(strcmp (default_account, account_data->account_name) == 0)) {
- display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"),
- account_data->display_name);
- }
- else {
- display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_mailbox_n"),
- account_data->display_name);
- }
-
- /* Create action and add it to the action group. The
- action name must be the account name, this way we
- could know in the handlers the account to show */
- if(account_data && account_data->account_name) {
- gchar* item_name, *refresh_action_name;
- guint8 merge_id = 0;
- GtkAction *view_account_action, *refresh_account_action;
-
- view_account_action = gtk_action_new (account_data->account_name,
- display_name, NULL, NULL);
- gtk_action_group_add_action (action_group, view_account_action);
-
- /* Add ui from account data. We allow 2^9-1 account
- changes in a single execution because we're
- downcasting the guint to a guint8 in order to use a
- GByteArray. It should be enough. */
- item_name = g_strconcat (account_data->account_name, "Menu", NULL);
- merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager);
- priv->merge_ids = g_byte_array_append (priv->merge_ids, &merge_id, 1);
- gtk_ui_manager_add_ui (parent_priv->ui_manager,
- merge_id,
- "/MenuBar/ViewMenu/ViewMenuAdditions",
- item_name,
- account_data->account_name,
- GTK_UI_MANAGER_MENUITEM,
- FALSE);
+ /* Let header view grab the focus if it's being shown */
+ if (priv->contents_style == MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS)
+ gtk_widget_grab_focus (GTK_WIDGET (priv->header_view));
+ else
+ gtk_widget_grab_focus (GTK_WIDGET (priv->contents_widget));
- /* Connect the action signal "activate" */
- g_signal_connect (G_OBJECT (view_account_action),
- "activate",
- G_CALLBACK (on_show_account_action_activated),
- self);
+ /* Show changes */
+ gtk_widget_show_all (GTK_WIDGET (priv->main_vbox));
+}
- /* Create the items for the Tools->Send&Receive submenu */
- refresh_action_name = g_strconcat ("SendReceive", account_data->account_name, NULL);
- refresh_account_action = gtk_action_new ((const gchar*) refresh_action_name,
- display_name, NULL, NULL);
- printf("DEBUG: %s: menu display_name=%s\n", __FUNCTION__, display_name);
- gtk_action_group_add_action (action_group, refresh_account_action);
+ModestMainWindowStyle
+modest_main_window_get_style (ModestMainWindow *self)
+{
+ ModestMainWindowPrivate *priv;
- merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager);
- priv->merge_ids = g_byte_array_append (priv->merge_ids, &merge_id, 1);
- gtk_ui_manager_add_ui (parent_priv->ui_manager,
- merge_id,
- "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions",
- item_name,
- refresh_action_name,
- GTK_UI_MANAGER_MENUITEM,
- FALSE);
- g_free (refresh_action_name);
+ g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (self), -1);
- g_signal_connect_data (G_OBJECT (refresh_account_action),
- "activate",
- G_CALLBACK (on_refresh_account_action_activated),
- g_strdup (account_data->account_name),
- (GClosureNotify) g_free,
- 0);
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+ return priv->style;
+}
- /* Create item and add it to the send&receive
- CSM. If there is only one account then
- it'll be no menu */
- if (priv->accounts_popup) {
- GtkWidget *label = gtk_label_new(NULL);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- if (default_account && (strcmp(account_data->account_name, default_account) == 0))
- {
- gchar *escaped = g_markup_printf_escaped ("<b>%s</b>", display_name);
- gtk_label_set_markup (GTK_LABEL (label), escaped);
- g_free (escaped);
- }
- else
- {
- gtk_label_set_text (GTK_LABEL (label), display_name);
- }
- item = gtk_menu_item_new ();
- gtk_container_add (GTK_CONTAINER (item), label);
- gtk_menu_shell_prepend (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
- g_signal_connect_data (G_OBJECT (item),
- "activate",
- G_CALLBACK (on_send_receive_csm_activated),
- g_strdup (account_data->account_name),
- (GClosureNotify) g_free,
- 0);
- }
- g_free (item_name);
- }
+static gboolean
+modest_main_window_window_state_event (GtkWidget *widget, GdkEventWindowState *event, gpointer userdata)
+{
+ if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {
+ ModestWindowPrivate *parent_priv;
+ ModestWindowMgr *mgr;
+ gboolean is_fullscreen;
+ GtkAction *fs_toggle_action;
+ gboolean active;
+
+ mgr = modest_runtime_get_window_mgr ();
+
+ is_fullscreen = modest_window_mgr_get_fullscreen_mode (mgr);
- /* Frees */
- g_free (display_name);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE (widget);
+
+ fs_toggle_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewToggleFullscreenMenu");
+ active = (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (fs_toggle_action)))?1:0;
+ if (is_fullscreen != active) {
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (fs_toggle_action), is_fullscreen);
+ }
}
- gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 1);
+ return FALSE;
- /* We cannot do this in the loop above because this relies on the action
- * group being inserted. This makes the default account appear in bold.
- * I agree it is a rather ugly way, but I don't see another possibility. armin. */
- for (i = 0; i < num_accounts; i++) {
- ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i);
+}
- 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);
+static void
+set_homogeneous (GtkWidget *widget,
+ gpointer data)
+{
+ gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), TRUE);
+ gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), TRUE);
+}
- gchar *path = g_strconcat ("/MenuBar/ViewMenu/ViewMenuAdditions/", item_name, NULL);
- GtkWidget *item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path);
- g_free(path);
+static void
+modest_main_window_show_toolbar (ModestWindow *self,
+ gboolean show_toolbar)
+{
+ ModestMainWindowPrivate *priv = NULL;
+ ModestWindowPrivate *parent_priv = NULL;
+ GtkWidget *reply_button = NULL, *menu = NULL;
+ GtkWidget *placeholder = NULL;
+ gint insert_index;
- if (item) {
- GtkWidget *child = gtk_bin_get_child (GTK_BIN (item));
- if (GTK_IS_LABEL (child)) {
- const gchar *cur_name = gtk_label_get_text (GTK_LABEL (child));
- gchar *bold_name = g_markup_printf_escaped("<b>%s</b>", cur_name);
- gtk_label_set_markup (GTK_LABEL (child), bold_name);
- g_free (bold_name);
- }
- }
+ g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
- path = g_strconcat("/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions/", item_name, NULL);
- item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path);
- g_free (path);
+ /* Set optimized view status */
+ priv->optimized_view = !show_toolbar;
- if (item) {
- GtkWidget *child = gtk_bin_get_child (GTK_BIN (item));
- if (GTK_IS_LABEL (child)) {
- const gchar *cur_name = gtk_label_get_text (GTK_LABEL (child));
- gchar *bold_name = g_markup_printf_escaped("<b>%s</b>", cur_name);
- gtk_label_set_markup (GTK_LABEL (child), bold_name);
- g_free (bold_name);
- }
- }
+ if (!parent_priv->toolbar) {
+ parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager,
+ "/ToolBar");
- g_free(item_name);
- }
+ /* Set homogeneous toolbar */
+ gtk_container_foreach (GTK_CONTAINER (parent_priv->toolbar),
+ set_homogeneous, NULL);
+
+ priv->progress_toolitem = GTK_WIDGET (gtk_tool_item_new ());
+ priv->cancel_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarCancel");
+ priv->refresh_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSendReceive");
+ priv->sort_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSort");
+ gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE);
+ gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE);
+ gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE);
+ gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE);
- modest_account_mgr_free_account_data (mgr, account_data);
- }
+ /* Add ProgressBar (Transfer toolbar) */
+ priv->progress_bar = modest_progress_bar_widget_new ();
+ gtk_widget_set_no_show_all (priv->progress_bar, TRUE);
+ placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ProgressBarView");
+ insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder));
+ gtk_container_add (GTK_CONTAINER (priv->progress_toolitem), priv->progress_bar);
+ gtk_toolbar_insert(GTK_TOOLBAR(parent_priv->toolbar), GTK_TOOL_ITEM (priv->progress_toolitem), insert_index);
+
+ /* Connect cancel 'clicked' signal to abort progress mode */
+ g_signal_connect(priv->cancel_toolitem, "clicked",
+ G_CALLBACK(cancel_progressbar),
+ self);
+
+ /* Add it to the observers list */
+ priv->progress_widgets = g_slist_prepend(priv->progress_widgets, priv->progress_bar);
- if (priv->accounts_popup) {
- /* Mandatory in order to view the menu contents */
- gtk_widget_show_all (priv->accounts_popup);
+ /* Add to window */
+ hildon_window_add_toolbar (HILDON_WINDOW (self),
+ GTK_TOOLBAR (parent_priv->toolbar));
- /* Setup tap_and_hold just if was not done before*/
- if (!gtk_menu_get_attach_widget (GTK_MENU (priv->accounts_popup)))
- gtk_widget_tap_and_hold_setup (send_receive_button, priv->accounts_popup, NULL, 0);
+ /* Set reply button tap and hold menu */
+ reply_button = gtk_ui_manager_get_widget (parent_priv->ui_manager,
+ "/ToolBar/ToolbarMessageReply");
+ menu = gtk_ui_manager_get_widget (parent_priv->ui_manager,
+ "/ToolbarReplyCSM");
+ gtk_widget_tap_and_hold_setup (GTK_WIDGET (reply_button), menu, NULL, 0);
+
+ /* Set send & receive button tap and hold menu */
+ update_menus (MODEST_MAIN_WINDOW (self));
}
- /* Frees */
- g_slist_free (accounts);
- g_free (default_account);
+ if (show_toolbar) {
+ /* Quick hack: this prevents toolbar icons "dance" when progress bar show status is changed */
+ /* TODO: resize mode migth be GTK_RESIZE_QUEUE, in order to avoid unneccesary shows */
+ gtk_container_set_resize_mode (GTK_CONTAINER(parent_priv->toolbar), GTK_RESIZE_IMMEDIATE);
+ gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
+ set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
+ } else
+ gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
- /* Make sure that at least one account is viewed if there are any
- * accounts, for instance when adding the first account: */
- set_at_least_one_account_visible (self);
+}
+
+static void
+on_account_inserted (TnyAccountStore *accoust_store,
+ TnyAccount *account,
+ gpointer user_data)
+{
+ update_menus (MODEST_MAIN_WINDOW (user_data));
+}
+
+static void
+on_account_changed (ModestAccountMgr* mgr,
+ const gchar* account,
+ gpointer user_data)
+{
+ gchar *default_account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ());
+
+ /* Actually, we only want to know when another account has become
+ * the default account, but there is no default_account_changed
+ * signal in ModestAccountMgr. */
+ if(strcmp(account, default_account) == 0)
+ update_menus (MODEST_MAIN_WINDOW (user_data));
+
+ g_free (default_account);
+}
+
+static void
+on_account_removed (TnyAccountStore *accoust_store,
+ TnyAccount *account,
+ gpointer user_data)
+{
+ update_menus (MODEST_MAIN_WINDOW (user_data));
}
/*
{
printf ("DEBUG: %s\n", __FUNCTION__);
gboolean folder_empty = FALSE;
+ gboolean all_marked_as_deleted = FALSE;
TnyFolderChangeChanged changed;
ModestMainWindowPrivate *priv;
printf ("DEBUG: %s: folder_empty=%d\n", __FUNCTION__, folder_empty);
+/* Check header removed (hide marked as DELETED headers) */
+ if (changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS) {
+ modest_header_view_refilter (MODEST_HEADER_VIEW(priv->header_view));
+ }
+
+ /* Check if all messages are marked to be deleted */
+ all_marked_as_deleted = modest_header_view_is_empty (header_view);
+ folder_empty = folder_empty || all_marked_as_deleted ;
+
/* Set contents style of headers view */
if (folder_empty) {
modest_main_window_set_contents_style (main_window,
/* Sets current toolbar mode */
priv->current_toolbar_mode = mode;
+ /* Checks the dimming rules */
+ modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self));
+
/* Show and hide toolbar items */
switch (mode) {
case TOOLBAR_MODE_NORMAL:
if (cancel_action)
gtk_action_set_visible (cancel_action, FALSE);
-/* if (priv->sort_toolitem) */
-/* gtk_widget_show (priv->sort_toolitem); */
-
-/* if (priv->refresh_toolitem) */
-/* gtk_widget_show (priv->refresh_toolitem); */
-
-/* if (priv->progress_toolitem) */
-/* gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), FALSE); */
-/* if (priv->progress_bar) */
-/* gtk_widget_hide (priv->progress_bar); */
-
-/* if (priv->cancel_toolitem) */
-/* gtk_widget_hide (priv->cancel_toolitem); */
/* Hide toolbar if optimized view is enabled */
if (priv->optimized_view)
if (priv->progress_bar)
gtk_widget_show (priv->progress_bar);
-/* if (priv->sort_toolitem) */
-/* gtk_widget_hide (priv->sort_toolitem); */
-
-/* if (priv->refresh_toolitem) */
-/* gtk_widget_hide (priv->refresh_toolitem); */
-
-/* if (priv->progress_toolitem) */
-/* gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE); */
-/* if (priv->progress_bar) */
-/* gtk_widget_show (priv->progress_bar); */
-
-/* if (priv->cancel_toolitem) */
-/* gtk_widget_show (priv->cancel_toolitem); */
-
/* Show toolbar if it's hiden (optimized view ) */
if (priv->optimized_view)
gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
}
}
+gboolean
+modest_main_window_transfer_mode_enabled (ModestMainWindow *self)
+{
+ ModestMainWindowPrivate *priv;
+
+ g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (self), FALSE);
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+
+ return priv->current_toolbar_mode == TOOLBAR_MODE_TRANSFER;
+}
+
static void
cancel_progressbar (GtkToolButton *toolbutton,
ModestMainWindow *self)
ModestToolBarModes mode;
GSList *tmp;
gboolean mode_changed = FALSE;
-/* ModestMailOperationStatus status; */
g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
/* Get toolbar mode from operation id*/
op_type = modest_mail_operation_get_type_operation (mail_op);
switch (op_type) {
-/* case MODEST_MAIL_OPERATION_TYPE_SEND: */
case MODEST_MAIL_OPERATION_TYPE_RECEIVE:
case MODEST_MAIL_OPERATION_TYPE_OPEN:
mode = TOOLBAR_MODE_TRANSFER;
switch (type) {
case MODEST_MAIL_OPERATION_QUEUE_OPERATION_ADDED:
if (mode == TOOLBAR_MODE_TRANSFER) {
- if (mode_changed)
+ if (mode_changed) {
set_toolbar_transfer_mode(self);
+ }
while (tmp) {
modest_progress_object_add_operation (MODEST_PROGRESS_OBJECT (tmp->data),
mail_op);
/* If no more operations are being observed, NORMAL mode is enabled again */
if (observers_empty (self)) {
- set_toolbar_mode (self, TOOLBAR_MODE_NORMAL);
-
+ set_toolbar_mode (self, TOOLBAR_MODE_NORMAL);
}
}
main_window = MODEST_MAIN_WINDOW (userdata);
priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
- if (modest_header_view_has_selected_headers (MODEST_HEADER_VIEW (priv->header_view))) {
- TnyList *selection = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (priv->header_view));
- TnyIterator *iterator = tny_list_create_iterator (selection);
- TnyHeader *header;
-
- tny_iterator_first (iterator);
- header = TNY_HEADER (tny_iterator_get_current (iterator));
-
- if (tny_header_get_subject (header))
- gtk_window_set_title (GTK_WINDOW(main_window), tny_header_get_subject (header));
- else
- gtk_window_set_title (GTK_WINDOW (main_window), _("mail_va_no_subject"));
-
- if (header)
- g_object_unref (header);
-
- g_object_unref (iterator);
- g_object_unref (selection);
- }
-
-
/* Update toolbar dimming state */
modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
GtkTreeModel *header_model = NULL;
GtkTreePath *path = NULL;
- g_return_val_if_fail (MODEST_MSG_VIEW_WINDOW (view_window), FALSE);
- g_return_val_if_fail (MODEST_MAIN_WINDOW (self), FALSE);
+ g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (view_window), FALSE);
+ g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (self), FALSE);
g_return_val_if_fail (gtk_tree_row_reference_valid (row_reference), FALSE);
priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
return TRUE;
}
+
projects / modest / blobdiff