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);
+static void
+modest_main_window_on_send_queue_status_canged (ModestTnySendQueue *send_queue,
+ gchar *msg_id,
+ guint status,
+ gpointer user_data);
+
/* list my signals */
enum {
/* MY_SIGNAL_1, */
MODEST_CONF_FOLDER_VIEW_KEY);
}
+static gint
+compare_display_names (ModestAccountData *a,
+ ModestAccountData *b)
+{
+ 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;
+
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
+
+ /* Get enabled account IDs */
+ mgr = modest_runtime_get_account_mgr ();
+ account_names = modest_account_mgr_account_names (mgr, TRUE);
+ iter = account_names;
+ accounts = NULL;
+
+ while (iter) {
+ ModestAccountData *account_data =
+ modest_account_mgr_get_account_data (mgr, (gchar*) iter->data);
+ accounts = g_slist_prepend (accounts, account_data);
+
+ iter = iter->next;
+ }
+ modest_account_mgr_free_account_names (account_names);
+ account_names = NULL;
+
+ /* Order the list of accounts by its display name */
+ accounts = g_slist_sort (accounts, (GCompareFunc) compare_display_names);
+ num_accounts = g_slist_length (accounts);
+
+ 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);
+
+ /* 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);
+
+ /* 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);
+
+ /* Get send receive button */
+ send_receive_button = gtk_ui_manager_get_widget (parent_priv->ui_manager,
+ "/ToolBar/ToolbarSendReceive");
+
+ /* 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));
+ }
+
+ /* 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);
+
+ /* 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)
{
/* Track account changes. We need to refresh the toolbar */
priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_account_store ()),
- "account_inserted", G_CALLBACK (account_number_changed),
+ "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 (account_number_changed),
+ "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 */
priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_account_store()),
"password_requested",
action = gtk_ui_manager_get_action (parent_priv->ui_manager,
"/MenuBar/ViewMenu/ViewShowToolbarMainMenu/ViewShowToolbarNormalScreenMenu");
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
- modest_conf_get_bool (conf, MODEST_CONF_SHOW_TOOLBAR, NULL));
+ modest_conf_get_bool (conf, MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR, NULL));
action = gtk_ui_manager_get_action (parent_priv->ui_manager,
"/MenuBar/ViewMenu/ViewShowToolbarMainMenu/ViewShowToolbarFullScreenMenu");
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
- modest_conf_get_bool (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, NULL));
+ modest_conf_get_bool (conf, MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR_FULLSCREEN, NULL));
hildon_window_set_menu (HILDON_WINDOW (self), GTK_MENU (parent_priv->menubar));
gtk_widget_show (parent_priv->menubar);
/* 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 */
{
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);
-
- 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);
-
- /* 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);
-
- /* Add to window */
- hildon_window_add_toolbar (HILDON_WINDOW (self),
- GTK_TOOLBAR (parent_priv->toolbar));
-
- /* 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 */
- account_number_changed (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()),
- NULL, self);
- }
-
- 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));
-
-}
-
-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;
- 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);
-
- /* Get enabled account IDs */
- mgr = modest_runtime_get_account_mgr ();
- account_names = modest_account_mgr_account_names (mgr, TRUE);
- iter = account_names;
- accounts = NULL;
-
- while (iter) {
- ModestAccountData *account_data =
- modest_account_mgr_get_account_data (mgr, (gchar*) iter->data);
- accounts = g_slist_prepend (accounts, account_data);
-
- iter = iter->next;
- }
- modest_account_mgr_free_account_names (account_names);
- account_names = NULL;
-
- /* Order the list of accounts by its display name */
- accounts = g_slist_sort (accounts, (GCompareFunc) compare_display_names);
- num_accounts = g_slist_length (accounts);
-
- 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);
-
- /* 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);
-
- /* 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);
-
- /* Get send receive button */
- send_receive_button = gtk_ui_manager_get_widget (parent_priv->ui_manager,
- "/ToolBar/ToolbarSendReceive");
-
- /* 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));
- }
-
- /* 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);
+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;
+ ModestAccountMgr *mgr = NULL;
+ TnyTransportAccount *transport_account = NULL;
+ ModestTnySendQueue *send_queue = NULL;
+ gint insert_index;
+ GSList *iter = NULL;
+ GSList *account_names = NULL;
+ const gchar *action_name;
+ GtkAction *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);
+ g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
- /* Connect the action signal "activate" */
- g_signal_connect (G_OBJECT (view_account_action),
- "activate",
- G_CALLBACK (on_show_account_action_activated),
- self);
+ /* Set optimized view status */
+ priv->optimized_view = !show_toolbar;
- /* 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);
+ if (!parent_priv->toolbar) {
+ parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager,
+ "/ToolBar");
+ gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE);
- 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);
+ /* 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);
- 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);
+ /* 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);
- /* 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);
- }
+ /* Add to window */
+ hildon_window_add_toolbar (HILDON_WINDOW (self),
+ GTK_TOOLBAR (parent_priv->toolbar));
- item = gtk_menu_item_new ();
- gtk_container_add (GTK_CONTAINER (item), label);
+ /* 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);
- 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);
+ /* Set send & receive button tap and hold menu */
+ update_menus (MODEST_MAIN_WINDOW (self));
+
+ /* Create send queue for all defined accounts */
+ mgr = modest_runtime_get_account_mgr ();
+ account_names = modest_account_mgr_account_names (mgr, TRUE);
+ iter = account_names;
+ while (iter) {
+ transport_account =
+ TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account
+ (modest_runtime_get_account_store(),
+ iter->data,
+ TNY_ACCOUNT_TYPE_TRANSPORT));
+
+ /* Create new send queue for this new account */
+ send_queue = modest_runtime_get_send_queue (transport_account);
+ if (MODEST_IS_TNY_SEND_QUEUE(send_queue)) {
+
+ /* Connect 'status_changed' signal of this new send-queue */
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, G_OBJECT (send_queue), "status_changed",
+ G_CALLBACK (modest_main_window_on_send_queue_status_canged),
+ self);
}
- g_free (item_name);
+
+ iter = iter->next;
+
+ /* free */
+ if (send_queue != NULL)
+ g_object_unref (send_queue);
+ if (transport_account != NULL)
+ g_object_unref (transport_account);
+
}
+ modest_account_mgr_free_account_names (account_names);
+ }
+
+ 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));
- /* Frees */
- g_free (display_name);
}
- gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 1);
+ /* Update also the actions (to update the toggles in the
+ menus), we have to do it manually because some other window
+ of the same time could have changed it (remember that the
+ toolbar fullscreen mode is shared by all the windows of the
+ same type */
+ if (modest_window_mgr_get_fullscreen_mode (modest_runtime_get_window_mgr ()))
+ action_name = "/MenuBar/ViewMenu/ViewShowToolbarMenu/ViewShowToolbarFullScreenMenu";
+ else
+ action_name = "/MenuBar/ViewMenu/ViewShowToolbarMenu/ViewShowToolbarNormalScreenMenu";
- /* 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);
+ action = gtk_ui_manager_get_action (parent_priv->ui_manager, action_name);
+ modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action),
+ show_toolbar);
+}
- 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
+modest_main_window_on_send_queue_status_canged (ModestTnySendQueue *send_queue,
+ gchar *msg_id,
+ guint status,
+ gpointer user_data)
+{
+ ModestMainWindowPrivate *priv = NULL;
+ TnyFolderStore *selected_folder = NULL;
+ TnyFolderType folder_type;
- 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);
+ g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE (send_queue));
+ g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data));
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(user_data);
+
+ /* Check if selected folder is OUTBOX */
+ selected_folder = modest_folder_view_get_selected (priv->folder_view);
+ if (!TNY_IS_FOLDER (selected_folder)) goto frees;
+ folder_type = modest_tny_folder_guess_folder_type (TNY_FOLDER (selected_folder));
+#if GTK_CHECK_VERSION(2, 8, 0) /* gtk_tree_view_column_queue_resize is only available in GTK+ 2.8 */
+ if (folder_type == TNY_FOLDER_TYPE_OUTBOX) {
+ GtkTreeViewColumn * tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (priv->header_view),
+ TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN);
+ gtk_tree_view_column_queue_resize (tree_column);
+#endif
+ }
+
+ /* Free */
+ frees:
+ if (selected_folder != NULL)
+ g_object_unref (selected_folder);
+}
- 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);
- }
- }
+static void
+on_account_inserted (TnyAccountStore *accoust_store,
+ TnyAccount *account,
+ gpointer user_data)
+{
+ TnyTransportAccount *transport_account = NULL;
+ ModestTnySendQueue *send_queue = NULL;
+ ModestMainWindowPrivate *priv;
+ const gchar *account_name = NULL;
- path = g_strconcat("/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions/", item_name, NULL);
- item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path);
- g_free (path);
+ g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data));
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE (user_data);
- 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);
- }
- }
+ update_menus (MODEST_MAIN_WINDOW (user_data));
- g_free(item_name);
- }
+ /* Get transport account */
+ account_name = tny_account_get_name (TNY_ACCOUNT (account));
+ transport_account =
+ TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account
+ (modest_runtime_get_account_store(),
+ account_name,
+ TNY_ACCOUNT_TYPE_TRANSPORT));
- modest_account_mgr_free_account_data (mgr, account_data);
- }
+ /* Create new send queue for this new account */
+ send_queue = modest_runtime_get_send_queue (transport_account);
+ if (!MODEST_IS_TNY_SEND_QUEUE(send_queue)) goto frees;
+
+ /* Connect 'status_changed' signal of this new send-queue */
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (send_queue), "status_changed",
+ G_CALLBACK (modest_main_window_on_send_queue_status_canged),
+ user_data);
+
+ /* Free */
+ frees:
+ if (transport_account != NULL)
+ g_object_unref (G_OBJECT (transport_account));
+ if (send_queue != NULL)
+ g_object_unref (send_queue);
+}
- if (priv->accounts_popup) {
- /* Mandatory in order to view the menu contents */
- gtk_widget_show_all (priv->accounts_popup);
+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 ());
- /* 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);
- }
+ /* 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));
- /* 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
+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;
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,
break;
case MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS:
{
- TnyFolderStore *selected_folderstore =
- modest_folder_view_get_selected (priv->folder_view);
- if (TNY_IS_ACCOUNT (selected_folderstore)) {
- priv->details_widget = create_details_widget (GTK_WIDGET (self),
+ /* if we're started without main win, there may not be a folder
+ * view. this fixes a GLib-Critical */
+ if (priv->folder_view) {
+ TnyFolderStore *selected_folderstore =
+ modest_folder_view_get_selected (priv->folder_view);
+ if (TNY_IS_ACCOUNT (selected_folderstore)) {
+ priv->details_widget = create_details_widget (GTK_WIDGET (self),
TNY_ACCOUNT (selected_folderstore));
-
- wrap_in_scrolled_window (priv->contents_widget,
- priv->details_widget);
+
+ wrap_in_scrolled_window (priv->contents_widget,
+ priv->details_widget);
+ }
+ g_object_unref (selected_folderstore);
+ modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->contents_widget),
+ FALSE);
}
- g_object_unref (selected_folderstore);
- modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->contents_widget),
- FALSE);
-
-
break;
}
case MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY:
ModestMainWindow *self)
{
ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- TnyAccount *account;
+ TnyAccount *account = NULL;
if (!key ||
priv->notification_id != id ||
if (priv->contents_style != MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS)
return;
-
- account = (TnyAccount *) modest_folder_view_get_selected (priv->folder_view);
- if (TNY_IS_ACCOUNT (account) &&
- !strcmp (tny_account_get_id (account), MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
+ if (priv->folder_view)
+ account = (TnyAccount *) modest_folder_view_get_selected (priv->folder_view);
+ if (account && TNY_IS_ACCOUNT (account) &&
+ strcmp (tny_account_get_id (account), MODEST_LOCAL_FOLDERS_ACCOUNT_ID) == 0) {
GList *children;
GtkLabel *label;
const gchar *device_name;
/* 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