[nautilus-actions] Force toolbar label to be the same that action one if flag is set to true

[Pierre Wieser <pwieser src gnome org>]

commit 715a160a85ffabf5d5945989aed8013e5d653743
Author: pierre <pierre vfedora10 virtuals pwi>
Date:   Mon Mar 1 13:00:19 2010 +0100

    Force toolbar label to be the same that action one if flag is set to true
    
    This is done after the object properties have been readen, and
    after the defaults have been set ; we so do not rely of having
    a 'toolbar_same_label' flag in the I/O provider.

 ChangeLog                   |    3 +++
 src/core/na-object-action.c |   11 +++++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1d0627b..bcc4b2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-03-01 Pierre Wieser <pwieser trychlos org>
 
+	* src/core/na-object-action.c (ifactory_object_read_done):
+	Force toolbar label to be the same that action one if flag is set to true.
+
 	* src/api/na-object-api.h: Fix minor typo.
 
 2009-02-28 Pierre Wieser <pwieser trychlos org>
diff --git a/src/core/na-object-action.c b/src/core/na-object-action.c
index 3ff3b20..86aa3b7 100644
--- a/src/core/na-object-action.c
+++ b/src/core/na-object-action.c
@@ -321,6 +321,7 @@ ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider
 {
 	IterForObsoletedParms parms;
 	GList *ibox;
+	gchar *label;
 
 	g_debug( "na_object_action_ifactory_object_read_done: instance=%p", ( void * ) instance );
 
@@ -346,7 +347,17 @@ ifactory_object_read_done( NAIFactoryObject *instance, const NAIFactoryProvider
 		g_object_unref( parms.profile );
 	}
 
+	/* set action defaults
+	 */
 	na_factory_object_set_defaults( instance );
+
+	/* if toolbar-same-label is true, then ensure that this is actually true
+	 */
+	if( na_object_is_toolbar_same_label( instance )){
+		label = na_object_get_label( instance );
+		na_object_set_toolbar_label( instance, label );
+		g_free( label );
+	}
 }
 
 static guint