[nautilus-actions: 18/30] Fix menu label display when widget is disabled

[Pierre Wieser <pwieser src gnome org>]

commit 83227cba070593e9b74d616ee72eeab12771d5eb
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Nov 20 10:00:50 2009 +0100

    Fix menu label display when widget is disabled
    
    When no target was set, the widget was disabled and the label was unfortunately set
    to empty ; the widget set to empty triggered an update of the object and of the
    IActionsList.

 ChangeLog                                  |    7 +++++++
 TODO                                       |   11 ++++-------
 nautilus-actions/nact/nact-iaction-tab.c   |    2 +-
 nautilus-actions/nact/nact-iactions-list.c |    2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8ccc752..75e7872 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,13 @@
 	Update compilation order as io-provider-gconf plugin depends on
 	runtime.
 
+	* nautilus-actions/nact/nact-iaction-tab.c
+	(on_tab_updatable_selection_changed):
+	Fix label display when the widget is disabled.
+
+	* nautilus-actions/nact/nact-iactions-list.c
+	(on_treeview_selection_changed): Fix typo.
+
 2009-11-19 Pierre Wieser <pwieser trychlos org>
 
 	Create GConf IO Provider as a plugin.
diff --git a/TODO b/TODO
index b6dbd44..ae62884 100644
--- a/TODO
+++ b/TODO
@@ -82,13 +82,6 @@
 - na_object_id_get_topmost_parent: should it return a NAObjectItem ?
 
 - nautilus-actions-new:
-  the label disappears when selected in NACT via bottom arrow ??
-  but not when right clicking on the row
-  neither if target selection is set
-  neither when target folder is set
-  but also if target toolbar is set
-
-- nautilus-actions-new:
   give same defaults that when creating an action in NACT
 
 - na_pivot_new: shouldn't take an argument (use add_consumer)
@@ -96,3 +89,7 @@
 - NACT: deleting an action, then saving, doesn't reset modif indicator (*)
 
 - gconf monitor doesn't work when creating with nautilus-actions-new
+
+- in 64bits arch, pkglibdir=/lib ??
+
+- NACT: unable to really delete an action imported with schemas
diff --git a/nautilus-actions/nact/nact-iaction-tab.c b/nautilus-actions/nact/nact-iaction-tab.c
index b2336ad..46fd97d 100644
--- a/nautilus-actions/nact/nact-iaction-tab.c
+++ b/nautilus-actions/nact/nact-iaction-tab.c
@@ -406,7 +406,7 @@ on_tab_updatable_selection_changed( NactIActionTab *instance, gint count_selecte
 
 		enable_label = ( item && ( NA_IS_OBJECT_MENU( item ) || target_selection || target_background ));
 		label_widget = base_window_get_widget( BASE_WINDOW( instance ), "ActionMenuLabelEntry" );
-		label = enable_label ? na_object_get_label( item ) : g_strdup( "" );
+		label = na_object_get_label( item );
 		gtk_entry_set_text( GTK_ENTRY( label_widget ), label );
 		if( item ){
 			check_for_label( instance, GTK_ENTRY( label_widget ), label );
diff --git a/nautilus-actions/nact/nact-iactions-list.c b/nautilus-actions/nact/nact-iactions-list.c
index a9c1b5f..7fe40ac 100644
--- a/nautilus-actions/nact/nact-iactions-list.c
+++ b/nautilus-actions/nact/nact-iactions-list.c
@@ -2213,7 +2213,7 @@ on_treeview_selection_changed( GtkTreeSelection *selection, NactIActionsList *in
 		g_signal_handler_unblock( instance, ialid->tab_updated_handler );
 	}
 
-	/* selection list if free in cleanup handler for the signal */
+	/* selection list is freed in cleanup handler for the signal */
 }
 
 static void