X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-hildon2-window.c;h=0882876326871b65fa383198319a9e6655366d85;hb=b7d5f8edfdea8bb98e89aab8dbe607106e26a074;hp=015dedc04b9a904c3e7f87dba7e9d6b3fed5c66f;hpb=789c4eee0ba2641502781c4163b82669d2846a3f;p=modest

diff --git a/src/hildon2/modest-hildon2-window.c b/src/hildon2/modest-hildon2-window.c
index 015dedc..0882876 100644
--- a/src/hildon2/modest-hildon2-window.c
+++ b/src/hildon2/modest-hildon2-window.c
@@ -232,7 +232,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 +256,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 
@@ -496,15 +500,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
@@ -512,7 +517,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);
 }