[nautilus-actions] Always write 'toolbar-label' key in GConf

[Pierre Wieser <pwieser src gnome org>]

commit de2ed60a751fc1eaf196e6fd1cd4a18998b02ed7
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sun Jan 31 10:24:59 2010 +0100

    Always write 'toolbar-label' key in GConf

 ChangeLog                                       |    5 +++++
 nautilus-actions/io-provider-gconf/nagp-write.c |   10 +---------
 2 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c98cdea..0ac2d76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-31 Pierre Wieser <pwieser trychlos org>
+
+	* nautilus-actions/io-provider-gconf/nagp-write.c (write_item_action):
+	Always writes the 'OBJECT_ITEM_TOOLBAR_LABEL_ENTRY' key.
+
 2009-01-30 Pierre Wieser <pwieser trychlos org>
 
 	No more record the toolbar_same_label indicator.
diff --git a/nautilus-actions/io-provider-gconf/nagp-write.c b/nautilus-actions/io-provider-gconf/nagp-write.c
index 5a9a9fb..d9390c5 100644
--- a/nautilus-actions/io-provider-gconf/nagp-write.c
+++ b/nautilus-actions/io-provider-gconf/nagp-write.c
@@ -168,20 +168,12 @@ write_item_action( NagpGConfProvider *provider, const NAObjectAction *action, GS
 		write_bool( provider, uuid, NULL, OBJECT_ITEM_TARGET_SELECTION_ENTRY, na_object_action_is_target_selection( action ), messages ) &&
 		write_bool( provider, uuid, NULL, OBJECT_ITEM_TARGET_BACKGROUND_ENTRY, na_object_action_is_target_background( action ), messages ) &&
 		write_bool( provider, uuid, NULL, OBJECT_ITEM_TARGET_TOOLBAR_ENTRY, na_object_action_is_target_toolbar( action ), messages ) &&
+		write_str( provider, uuid, NULL, OBJECT_ITEM_TOOLBAR_LABEL_ENTRY, na_object_action_toolbar_get_label( action ), messages ) &&
 		write_str( provider, uuid, NULL, OBJECT_ITEM_TYPE_ENTRY, g_strdup( OBJECT_ITEM_TYPE_ACTION ), messages );
 
 	/* key was used between 2.29.1 and 2.29.4, but is removed since 2.29.5 */
 	remove_key( provider, uuid, OBJECT_ITEM_TOOLBAR_SAME_LABEL_ENTRY, messages );
 
-	/* only write toolbar_label if not same label than action itself */
-	if( ret ){
-		if( na_object_action_toolbar_use_same_label( action )){
-			remove_key( provider, uuid, OBJECT_ITEM_TOOLBAR_LABEL_ENTRY, messages );
-		} else {
-			ret = write_str( provider, uuid, NULL, OBJECT_ITEM_TOOLBAR_LABEL_ENTRY, na_object_action_toolbar_get_label( action ), messages );
-		}
-	}
-
 	profiles = na_object_get_items_list( action );
 
 	for( ip = profiles ; ip && ret ; ip = ip->next ){