X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-hildon2-window.c;h=944173859923a39a896ca5f3e2e8fdae4b213dbb;hp=995eeb9353d7457fd877aa2aafd4ce7a5c7d7343;hb=22a2aa923978b9bdcdb9d1fb6eebc08729a7a0e9;hpb=83cfbd96aa351d1ffc91d409cacb26ad1ec7df2d

diff --git a/src/hildon2/modest-hildon2-window.c b/src/hildon2/modest-hildon2-window.c
index 995eeb9..9441738 100644
--- a/src/hildon2/modest-hildon2-window.c
+++ b/src/hildon2/modest-hildon2-window.c
@@ -52,7 +52,7 @@ typedef struct _EditModeRegister {
 /* 'private'/'protected' functions */
 static void modest_hildon2_window_class_init  (gpointer klass, gpointer class_data);
 static void modest_hildon2_window_instance_init (GTypeInstance *instance, gpointer g_class);
-static void modest_hildon2_window_finalize    (GObject *obj);
+static void modest_hildon2_window_dispose     (GObject *obj);
 
 static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window);
 static void setup_menu (ModestHildon2Window *self);
@@ -142,7 +142,7 @@ modest_hildon2_window_class_init (gpointer klass, gpointer class_data)
 	ModestHildon2WindowClass *modest_hildon2_window_class = (ModestHildon2WindowClass *) klass;
 
 	parent_class            = g_type_class_peek_parent (klass);
-	gobject_class->finalize = modest_hildon2_window_finalize;
+	gobject_class->dispose  = modest_hildon2_window_dispose;
 
 	signals[EDIT_MODE_CHANGED_SIGNAL] =
 		g_signal_new ("edit-mode-changed",
@@ -165,19 +165,23 @@ modest_hildon2_window_class_init (gpointer klass, gpointer class_data)
 }
 
 static void
-modest_hildon2_window_finalize (GObject *obj)
+modest_hildon2_window_dispose (GObject *obj)
 {
 	ModestHildon2WindowPrivate *priv;
 
 	priv = MODEST_HILDON2_WINDOW_GET_PRIVATE(obj);
 
-	g_object_unref (priv->app_menu_dimming_group);
-	priv->app_menu_dimming_group = NULL;
+	if (priv->app_menu_dimming_group) {
+		g_object_unref (priv->app_menu_dimming_group);
+		priv->app_menu_dimming_group = NULL;
+	}
 
-	g_hash_table_destroy (priv->edit_mode_registry);
-	priv->edit_mode_registry = NULL;
+	if (priv->edit_mode_registry) {
+		g_hash_table_unref (priv->edit_mode_registry);
+		priv->edit_mode_registry = NULL;
+	}
 
-	G_OBJECT_CLASS(parent_class)->finalize (obj);
+	G_OBJECT_CLASS(parent_class)->dispose (obj);
 }
 
 static void
@@ -232,7 +236,7 @@ modest_hildon2_window_pack_toolbar_not_implemented (ModestHildon2Window *self,
 {
 	g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self));
 
-	g_warning ("%s not implemented", __FUNCTION__);
+	g_debug ("%s not implemented", __FUNCTION__);
 }
 
 void
@@ -256,12 +260,16 @@ modest_hildon2_window_add_button_to_menu (ModestHildon2Window *self,
 	g_return_if_fail (GTK_IS_BUTTON (button));
 	priv = MODEST_HILDON2_WINDOW_GET_PRIVATE (self);
 
+	modest_ui_dimming_manager_set_widget_dimming_mode (GTK_WIDGET (button),
+							   MODEST_UI_DIMMING_MODE_HIDE);
+
 	if (dimming_callback)
 		modest_dimming_rules_group_add_widget_rule (priv->app_menu_dimming_group,
 							    GTK_WIDGET (button),
 							    (GCallback) dimming_callback,
 							    MODEST_WINDOW (self));
 	hildon_app_menu_append (HILDON_APP_MENU (priv->app_menu), GTK_BUTTON (button));
+	gtk_widget_show (GTK_WIDGET (button));
 }
 
 void 
@@ -393,7 +401,18 @@ modest_hildon2_window_set_edit_mode (ModestHildon2Window *self,
 
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->current_edit_tree_view));
 	gtk_tree_selection_set_mode (selection, reg->mode);
-	gtk_tree_selection_unselect_all (selection);
+	if (reg->mode == GTK_SELECTION_SINGLE || reg->mode == GTK_SELECTION_BROWSE) {
+		GtkTreeModel *model;
+		GtkTreeIter iter;
+
+		model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->current_edit_tree_view));
+		if (gtk_tree_model_get_iter_first (model, &iter)) {
+			gtk_tree_view_scroll_to_point (GTK_TREE_VIEW (priv->current_edit_tree_view), 0, 0);
+			gtk_tree_selection_select_iter (selection, &iter);
+		}
+	} else {
+		gtk_tree_selection_unselect_all (selection);
+	}
 
 	priv->edit_toolbar = hildon_edit_toolbar_new ();
 	hildon_edit_toolbar_set_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar),
@@ -485,15 +504,16 @@ edit_toolbar_button_clicked (HildonEditToolbar *toolbar,
 	EditModeRegister *reg;
 
 	g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self));
-	
+
 	reg = (EditModeRegister *) g_hash_table_lookup (priv->edit_mode_registry, 
 							GINT_TO_POINTER (priv->edit_command));
-	if (reg == NULL)
-		modest_hildon2_window_unset_edit_mode (self);
 
-	if ((reg->action == NULL) || reg->action (self))
+	if (reg) {
+		if ((reg->action == NULL) || reg->action (self))
+			modest_hildon2_window_unset_edit_mode (self);
+	} else {
 		modest_hildon2_window_unset_edit_mode (self);
-
+	}
 }
 
 static void
@@ -501,7 +521,7 @@ edit_toolbar_arrow_clicked (HildonEditToolbar *toolbar,
 			    ModestHildon2Window *self)
 {
 	g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self));
-	
+
 	modest_hildon2_window_unset_edit_mode (self);
 }