* Exchanged two dimming rules associations

[modest] / src / hildon2 / modest-header-window.c

diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c
index aec3079..26c51f8 100644 (file)
--- a/src/hildon2/modest-header-window.c
+++ b/src/hildon2/modest-header-window.c
@@ -130,6 +130,9 @@ static void set_moveto_edit_mode (GtkButton *button,
 static gboolean on_expose_event(GtkTreeView *header_view,
                                GdkEventExpose *event,
                                gpointer user_data);
+static gboolean on_map_event (GtkWidget *widget,
+                             GdkEvent *event,
+                             gpointer userdata);
 static void on_vertical_movement (HildonPannableArea *area,
                                  HildonMovementDirection direction,
                                  gdouble x, gdouble y, gpointer user_data);
@@ -305,6 +308,13 @@ connect_signals (ModestHeaderWindow *self)
 
        priv->sighandlers =
                modest_signal_mgr_connect (priv->sighandlers,
+                                          G_OBJECT (self),
+                                          "map-event",
+                                          G_CALLBACK (on_map_event),
+                                          self);
+
+       priv->sighandlers =
+               modest_signal_mgr_connect (priv->sighandlers,
                                           G_OBJECT (priv->contents_view), 
                                           "vertical-movement", 
                                           G_CALLBACK (on_vertical_movement), 
@@ -436,7 +446,7 @@ modest_header_window_new (TnyFolder *folder)
                                                  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"),
+                                                 _("mcen_ti_edit_move"), _HL("wdgt_bd_move"),
                                                  GTK_TREE_VIEW (priv->header_view),
                                                  GTK_SELECTION_MULTIPLE,
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to));
@@ -462,10 +472,10 @@ static void setup_menu (ModestHeaderWindow *self)
 
        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_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to));
        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_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete));
        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));
@@ -690,6 +700,22 @@ on_expose_event(GtkTreeView *header_view,
        return FALSE;
 }
 
+static gboolean 
+on_map_event(GtkWidget *widget,
+            GdkEvent *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->progress_hint) {
+               hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), TRUE);
+       }
+       return FALSE;
+}
+
 static gboolean
 set_toolbar_transfer_mode (ModestHeaderWindow *self)
 {