#include <libosso.h>
#include <hildon/hildon-pannable-area.h>
#include <modest-window-mgr.h>
+#include <modest-window-priv.h>
#include <modest-signal-mgr.h>
#include <modest-runtime.h>
#include <modest-platform.h>
#include <hildon/hildon-button.h>
#include <hildon/hildon-program.h>
#include <hildon/hildon-banner.h>
+#include <modest-ui-dimming-rules.h>
+#include <modest-tny-folder.h>
typedef enum {
CONTENTS_STATE_NONE = 0,
CONTENTS_STATE_HEADERS = 2
} ContentsState;
+typedef enum {
+ EDIT_MODE_COMMAND_MOVE = 1,
+ EDIT_MODE_COMMAND_DELETE = 2,
+} EditModeCommand;
+
typedef struct _ModestHeaderWindowPrivate ModestHeaderWindowPrivate;
struct _ModestHeaderWindowPrivate {
GtkWidget *header_view;
GtkWidget *empty_view;
GtkWidget *contents_view;
- GtkWidget *new_message_button;
+ GtkWidget *top_vbox;
+ /* state bar */
ContentsState contents_state;
TnyFolder *folder;
+ /* autoscroll */
+ gboolean autoscroll;
+
/* banners */
GtkWidget *updating_banner;
guint updating_banner_timeout;
/* signals */
GSList *sighandlers;
+ gulong queue_change_handler;
- /* Display state */
- osso_display_state_t display_state;
+ /* progress hint */
+ gboolean progress_hint;
};
#define MODEST_HEADER_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_HEADER_WINDOW, \
static void connect_signals (ModestHeaderWindow *self);
static void modest_header_window_disconnect_signals (ModestWindow *self);
-static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window);
-static void add_to_menu (ModestHeaderWindow *self,
- HildonAppMenu *menu,
- gchar *label,
- GCallback callback);
static void setup_menu (ModestHeaderWindow *self);
static GtkWidget *create_empty_view (void);
-static GtkWidget *create_header_view (TnyFolder *folder);
+static GtkWidget *create_header_view (ModestWindow *progress_window,
+ TnyFolder *folder);
static void update_view (ModestHeaderWindow *self,
TnyFolderChange *change);
static void on_updating_msg_list (ModestHeaderView *header_view,
gboolean starting,
gpointer user_data);
+static void set_delete_edit_mode (GtkButton *button,
+ ModestHeaderWindow *self);
+static void set_moveto_edit_mode (GtkButton *button,
+ ModestHeaderWindow *self);
+static gboolean on_expose_event(GtkTreeView *header_view,
+ GdkEventExpose *event,
+ gpointer user_data);
+static void on_vertical_movement (HildonPannableArea *area,
+ HildonMovementDirection direction,
+ gdouble x, gdouble y, gpointer user_data);
+static void set_progress_hint (ModestHeaderWindow *self,
+ gboolean enabled);
+static void on_queue_changed (ModestMailOperationQueue *queue,
+ ModestMailOperation *mail_op,
+ ModestMailOperationQueueNotification type,
+ ModestHeaderWindow *self);
+static void modest_header_window_show_toolbar (ModestWindow *window,
+ gboolean show_toolbar);
+static void modest_header_window_pack_toolbar (ModestHildon2Window *self,
+ GtkPackType pack_type,
+ GtkWidget *toolbar);
/* globals */
(GInstanceInitFunc) modest_header_window_init,
NULL
};
- my_type = g_type_register_static (MODEST_TYPE_WINDOW,
+ my_type = g_type_register_static (MODEST_TYPE_HILDON2_WINDOW,
"ModestHeaderWindow",
&my_info, 0);
}
GObjectClass *gobject_class;
gobject_class = (GObjectClass*) klass;
ModestWindowClass *modest_window_class = (ModestWindowClass *) klass;
+ ModestHildon2WindowClass *modest_hildon2_window_class = (ModestHildon2WindowClass *) klass;
parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = modest_header_window_finalize;
g_type_class_add_private (gobject_class, sizeof(ModestHeaderWindowPrivate));
- modest_window_class->zoom_minus_func = on_zoom_minus_plus_not_implemented;
- modest_window_class->zoom_plus_func = on_zoom_minus_plus_not_implemented;
+ modest_window_class->show_toolbar_func = modest_header_window_show_toolbar;
modest_window_class->disconnect_signals_func = modest_header_window_disconnect_signals;
+ modest_hildon2_window_class->pack_toolbar_func = modest_header_window_pack_toolbar;
}
static void
priv = MODEST_HEADER_WINDOW_GET_PRIVATE(obj);
priv->sighandlers = NULL;
- priv->display_state = OSSO_DISPLAY_ON;
priv->header_view = NULL;
priv->empty_view = NULL;
+ priv->top_vbox = NULL;
priv->contents_view = NULL;
priv->contents_state = CONTENTS_STATE_NONE;
priv->folder = NULL;
priv->updating_banner = NULL;
priv->updating_banner_timeout = 0;
+ priv->autoscroll = TRUE;
+ priv->progress_hint = FALSE;
+ priv->queue_change_handler = 0;
modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
GTK_WINDOW(obj),
ModestHeaderWindowPrivate *priv;
priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
+ if (g_signal_handler_is_connected (G_OBJECT (modest_runtime_get_mail_operation_queue ()),
+ priv->queue_change_handler))
+ g_signal_handler_disconnect (G_OBJECT (modest_runtime_get_mail_operation_queue ()),
+ priv->queue_change_handler);
+
modest_signal_mgr_disconnect_all_and_destroy (priv->sighandlers);
- priv->sighandlers = NULL;
+ priv->sighandlers = NULL;
+
}
static void
"updating-msg-list",
G_CALLBACK (on_updating_msg_list),
self);
-
- /* TODO: connect header view activate */
-
- /* new message button */
-
- g_signal_connect (G_OBJECT (priv->new_message_button), "clicked",
- G_CALLBACK (modest_ui_actions_on_new_msg), (gpointer) self);
-
- /* window */
-
- /* we don't register this in sighandlers, as it should be run after disconnecting all signals,
- * in destroy stage */
-
-
-}
-
-static void
-osso_display_event_cb (osso_display_state_t state,
- gpointer data)
-{
- ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (data);
+ priv->sighandlers =
+ modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (priv->header_view),
+ "expose-event",
+ G_CALLBACK (on_expose_event),
+ self);
- priv->display_state = state;
+ priv->sighandlers =
+ modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (priv->contents_view),
+ "vertical-movement",
+ G_CALLBACK (on_vertical_movement),
+ self);
- /* Stop blinking if the screen becomes on */
- if (priv->display_state == OSSO_DISPLAY_ON)
- modest_platform_remove_new_mail_notifications (TRUE);
+ /* Mail Operation Queue */
+ priv->queue_change_handler =
+ g_signal_connect (G_OBJECT (modest_runtime_get_mail_operation_queue ()),
+ "queue-changed",
+ G_CALLBACK (on_queue_changed),
+ self);
}
static GtkWidget *
-create_header_view (TnyFolder *folder)
+create_header_view (ModestWindow *progress_window, TnyFolder *folder)
{
GtkWidget *header_view;
header_view = modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_TWOLINES);
modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), folder,
- TRUE, NULL, NULL);
+ TRUE, progress_window, NULL, NULL);
modest_widget_memory_restore (modest_runtime_get_conf (), G_OBJECT(header_view),
MODEST_CONF_HEADER_VIEW_KEY);
static GtkWidget *
create_empty_view (void)
{
- GtkLabel *label = NULL;
+ GtkWidget *label = NULL;
GtkWidget *align = NULL;
align = gtk_alignment_new(EMPTYVIEW_XALIGN, EMPTYVIEW_YALIGN, EMPTYVIEW_XSPACE, EMPTYVIEW_YSPACE);
- label = GTK_LABEL(gtk_label_new (_("mcen_ia_nomessages")));
- gtk_label_set_justify (label, GTK_JUSTIFY_CENTER);
- gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET(label));
+ label = gtk_label_new (_("mcen_ia_nomessages"));
+ gtk_widget_show (label);
+ gtk_widget_show (align);
+ gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
+ gtk_container_add (GTK_CONTAINER (align), label);
+
+ return align;
+}
- return GTK_WIDGET(align);
+static void
+on_vertical_movement (HildonPannableArea *area,
+ HildonMovementDirection direction,
+ gdouble x, gdouble y, gpointer user_data)
+{
+ ModestHeaderWindow *self = (ModestHeaderWindow *) user_data;
+ ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+
+ priv->autoscroll = FALSE;
}
ModestHeaderWindowPrivate *priv = NULL;
HildonProgram *app;
GdkPixbuf *window_icon;
- GtkWidget *pannable;
self = MODEST_HEADER_WINDOW(g_object_new(MODEST_TYPE_HEADER_WINDOW, NULL));
priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
priv->folder = g_object_ref (folder);
- pannable = hildon_pannable_area_new ();
+ priv->contents_view = hildon_pannable_area_new ();
- priv->header_view = create_header_view (folder);
+ priv->header_view = create_header_view (MODEST_WINDOW (self), folder);
priv->empty_view = create_empty_view ();
g_object_ref (priv->header_view);
g_object_ref (priv->empty_view);
- priv->contents_view = gtk_vbox_new (FALSE, 0);
- priv->new_message_button = hildon_button_new (MODEST_EDITABLE_SIZE,
- HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
- hildon_button_set_title (HILDON_BUTTON (priv->new_message_button), _("mcen_me_viewer_newemail"));
- hildon_button_set_image (HILDON_BUTTON (priv->new_message_button),
- gtk_image_new_from_stock (MODEST_STOCK_NEW_MAIL, GTK_ICON_SIZE_DIALOG));
- hildon_button_set_title_alignment (HILDON_BUTTON (priv->new_message_button), 0.0, 0.5);
- hildon_button_set_image_alignment (HILDON_BUTTON (priv->new_message_button), 0.0, 0.5);
- hildon_button_set_alignment (HILDON_BUTTON (priv->new_message_button), 0.0, 0.5, 1.0, 0.0);
- hildon_button_set_image_position (HILDON_BUTTON (priv->new_message_button), GTK_POS_LEFT);
-
setup_menu (self);
- gtk_box_pack_start (GTK_BOX (priv->contents_view), priv->new_message_button, FALSE, FALSE, 0);
- hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), priv->contents_view);
- gtk_container_add (GTK_CONTAINER (self), pannable);
+ priv->top_vbox = gtk_vbox_new (FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (priv->top_vbox), priv->contents_view, TRUE, TRUE, 0);
+
+ gtk_container_add (GTK_CONTAINER (self), priv->top_vbox);
gtk_widget_show (priv->contents_view);
- gtk_widget_show (pannable);
- gtk_widget_show (priv->new_message_button);
+ gtk_widget_show (priv->top_vbox);
connect_signals (MODEST_HEADER_WINDOW (self));
g_object_unref (window_icon);
}
- /* Listen for changes in the screen, we don't want to show a
- led pattern when the display is on for example */
- osso_hw_set_display_event_cb (modest_maemo_utils_get_osso_context (),
- osso_display_event_cb,
- self);
+ /* Set window title */
+ if (TNY_IS_FOLDER (folder)) {
+ gchar *folder_name;
+
+ folder_name = modest_tny_folder_get_display_name (folder);
+ gtk_window_set_title (GTK_WINDOW (self), folder_name);
+ g_free (folder_name);
+ }
/* Dont't restore settings here,
* because it requires a gtk_widget_show(),
* so that the UI is not visible for non-menu D-Bus activation.
*/
- return MODEST_WINDOW(self);
-}
-
-static gboolean
-on_zoom_minus_plus_not_implemented (ModestWindow *window)
-{
- g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (window), FALSE);
-
- hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here"));
- return FALSE;
-
-}
-
-gboolean
-modest_header_window_screen_is_on (ModestHeaderWindow *self)
-{
- ModestHeaderWindowPrivate *priv = NULL;
-
- g_return_val_if_fail (MODEST_IS_HEADER_WINDOW(self), FALSE);
+ /* setup edit modes */
+ modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_DELETE,
+ _("mcen_ti_edit_delete"), _HL("wdgt_bd_delete"),
+ GTK_TREE_VIEW (priv->header_view),
+ GTK_SELECTION_MULTIPLE,
+ EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_delete_message));
+ modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE,
+ _("mcen_ti_edit_move"), _("mcen_me_move"),
+ GTK_TREE_VIEW (priv->header_view),
+ GTK_SELECTION_MULTIPLE,
+ EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to));
- priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
-
- return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE;
+ return MODEST_WINDOW(self);
}
ModestHeaderView *
return MODEST_HEADER_VIEW (priv->header_view);
}
-static void add_to_menu (ModestHeaderWindow *self,
- HildonAppMenu *menu,
- gchar *label,
- GCallback callback)
-{
- GtkWidget *button;
-
- button = gtk_button_new_with_label (label);
- g_signal_connect_after (G_OBJECT (button), "clicked",
- callback, (gpointer) self);
- hildon_app_menu_append (menu, GTK_BUTTON (button));
-}
-
static void setup_menu (ModestHeaderWindow *self)
{
- ModestHeaderWindowPrivate *priv = NULL;
- GtkWidget *app_menu;
-
g_return_if_fail (MODEST_IS_HEADER_WINDOW(self));
- priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
-
- app_menu = hildon_app_menu_new ();
-
- add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_viewer_newemail"),
- G_CALLBACK (modest_ui_actions_on_new_msg));
- add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_sendandreceive"),
- G_CALLBACK (modest_ui_actions_on_send_receive));
- add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_messagedetails"),
- G_CALLBACK (modest_ui_actions_on_details));
-
- hildon_stackable_window_set_main_menu (HILDON_STACKABLE_WINDOW (self),
- HILDON_APP_MENU (app_menu));
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_move_messages"), NULL,
+ APP_MENU_CALLBACK (set_moveto_edit_mode),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete));
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_delete_messages"), NULL,
+ APP_MENU_CALLBACK (set_delete_edit_mode),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to));
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_folder details"), NULL,
+ APP_MENU_CALLBACK (modest_ui_actions_on_details),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_details));
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_sort"), NULL,
+ APP_MENU_CALLBACK (modest_ui_actions_on_sort),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_sort));
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "<Control>n",
+ APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
+ APP_MENU_CALLBACK (modest_ui_actions_on_send_receive),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive));
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL,
+ APP_MENU_CALLBACK (modest_ui_actions_cancel_send),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
}
static void
/* Add the new content */
switch (state) {
case CONTENTS_STATE_EMPTY:
- gtk_box_pack_start (GTK_BOX (priv->contents_view), priv->empty_view, TRUE, TRUE, 0);
+ gtk_container_add (GTK_CONTAINER (priv->contents_view), priv->empty_view);
gtk_widget_show (priv->empty_view);
break;
case CONTENTS_STATE_HEADERS:
- gtk_box_pack_start (GTK_BOX (priv->contents_view), priv->header_view, TRUE, TRUE, 0);
+ gtk_container_add (GTK_CONTAINER (priv->contents_view), priv->header_view);
gtk_widget_show (priv->header_view);
break;
case CONTENTS_STATE_NONE:
}
}
}
+
+static void
+set_delete_edit_mode (GtkButton *button,
+ ModestHeaderWindow *self)
+{
+ modest_hildon2_window_set_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_DELETE);
+}
+
+static void
+set_moveto_edit_mode (GtkButton *button,
+ ModestHeaderWindow *self)
+{
+ modest_hildon2_window_set_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE);
+}
+
+static gboolean
+on_expose_event(GtkTreeView *header_view,
+ GdkEventExpose *event,
+ gpointer user_data)
+{
+ ModestHeaderWindow *self = (ModestHeaderWindow *) user_data;
+ ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+
+ g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (self), FALSE);
+
+ if (priv->autoscroll)
+ hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (priv->contents_view), 0.0, 0.0);
+
+ return FALSE;
+}
+
+static gboolean
+set_toolbar_transfer_mode (ModestHeaderWindow *self)
+{
+ ModestHeaderWindowPrivate *priv = NULL;
+
+ g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (self), FALSE);
+
+ priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
+
+ set_progress_hint (self, TRUE);
+
+ return FALSE;
+}
+
+static void
+set_progress_hint (ModestHeaderWindow *self,
+ gboolean enabled)
+{
+ ModestWindowPrivate *parent_priv;
+ ModestHeaderWindowPrivate *priv;
+
+ g_return_if_fail (MODEST_IS_HEADER_WINDOW (self));
+
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+ priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
+
+ /* Sets current progress hint */
+ priv->progress_hint = enabled;
+
+ if (GTK_WIDGET_VISIBLE (self)) {
+ hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), enabled?1:0);
+ }
+
+}
+
+gboolean
+modest_header_window_toolbar_on_transfer_mode (ModestHeaderWindow *self)
+{
+ ModestHeaderWindowPrivate *priv= NULL;
+
+ g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (self), FALSE);
+ priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+
+ return priv->progress_hint;
+}
+
+static void
+modest_header_window_show_toolbar (ModestWindow *self,
+ gboolean show_toolbar)
+{
+ ModestHeaderWindowPrivate *priv = NULL;
+ ModestWindowPrivate *parent_priv;
+
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+ priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
+
+ if (modest_header_window_transfer_mode_enabled (MODEST_HEADER_WINDOW (self)))
+ set_progress_hint (MODEST_HEADER_WINDOW (self), TRUE);
+ else
+ set_progress_hint (MODEST_HEADER_WINDOW (self), FALSE);
+}
+
+gboolean
+modest_header_window_transfer_mode_enabled (ModestHeaderWindow *self)
+{
+ ModestHeaderWindowPrivate *priv;
+
+ g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (self), FALSE);
+ priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
+
+ return priv->progress_hint;
+}
+
+static void
+on_mail_operation_started (ModestMailOperation *mail_op,
+ gpointer user_data)
+{
+ ModestHeaderWindow *self;
+ ModestMailOperationTypeOperation op_type;
+ GObject *source = NULL;
+
+ self = MODEST_HEADER_WINDOW (user_data);
+ op_type = modest_mail_operation_get_type_operation (mail_op);
+ source = modest_mail_operation_get_source(mail_op);
+ if (G_OBJECT (self) == source) {
+ set_toolbar_transfer_mode(self);
+ }
+ g_object_unref (source);
+}
+
+static void
+on_mail_operation_finished (ModestMailOperation *mail_op,
+ gpointer user_data)
+{
+ ModestHeaderWindow *self;
+ ModestMailOperationTypeOperation op_type;
+ GSList *operations = NULL;
+ ModestMailOperationQueue *queue;
+
+ self = MODEST_HEADER_WINDOW (user_data);
+ op_type = modest_mail_operation_get_type_operation (mail_op);
+
+ queue = modest_runtime_get_mail_operation_queue ();
+ operations = modest_mail_operation_queue_get_by_source (queue, user_data);
+
+ /* There should be at least the current one */
+ if (!operations)
+ g_return_if_reached ();
+
+ /* Don't disable the progress hint if there are more pending
+ operations from this window */
+ if (g_slist_length (operations) == 1)
+ set_progress_hint (self, FALSE);
+
+ g_slist_free (operations);
+ modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self));
+}
+
+static void
+on_queue_changed (ModestMailOperationQueue *queue,
+ ModestMailOperation *mail_op,
+ ModestMailOperationQueueNotification type,
+ ModestHeaderWindow *self)
+{
+ ModestHeaderWindowPrivate *priv;
+
+ priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+
+ /* If this operations was created by another window, do nothing */
+ if (!modest_mail_operation_is_mine (mail_op, G_OBJECT(self)))
+ return;
+
+ if (type == MODEST_MAIL_OPERATION_QUEUE_OPERATION_ADDED) {
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (mail_op),
+ "operation-started",
+ G_CALLBACK (on_mail_operation_started),
+ self);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (mail_op),
+ "operation-finished",
+ G_CALLBACK (on_mail_operation_finished),
+ self);
+ } else if (type == MODEST_MAIL_OPERATION_QUEUE_OPERATION_REMOVED) {
+ priv->sighandlers = modest_signal_mgr_disconnect (priv->sighandlers,
+ G_OBJECT (mail_op),
+ "operation-started");
+ priv->sighandlers = modest_signal_mgr_disconnect (priv->sighandlers,
+ G_OBJECT (mail_op),
+ "operation-finished");
+ }
+}
+
+static void
+modest_header_window_pack_toolbar (ModestHildon2Window *self,
+ GtkPackType pack_type,
+ GtkWidget *toolbar)
+{
+ ModestHeaderWindowPrivate *priv;
+
+ g_return_if_fail (MODEST_IS_HEADER_WINDOW (self));
+ priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+
+ if (pack_type == GTK_PACK_START) {
+ gtk_box_pack_start (GTK_BOX (priv->top_vbox), toolbar, FALSE, FALSE, 0);
+ } else {
+ gtk_box_pack_end (GTK_BOX (priv->top_vbox), toolbar, FALSE, FALSE, 0);
+ }
+}