[nautilus-actions] Rename v1 action data group



commit 01334b6357ab9c47bfee4530802d124fa8a47903
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Mar 10 18:37:12 2010 +0100

    Rename v1 action data group

 ChangeLog                           |    6 ++++++
 src/api/na-ifactory-object-data.h   |    2 +-
 src/core/na-object-action-factory.c |    9 ++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1df2274..d6f0a31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-03-10 Pierre Wieser <pwieser trychlos org>
 
+	* src/api/na-ifactory-object-data.h:
+	Rename v1 action data group to NA_FACTORY_ACTION_V1_GROUP.
+
+	* src/core/na-object-action-factory.c:
+	No more try to read obsolete NAFO_DATA_TARGET_BACKGROUND data.
+
 	* src/plugin-tracker/na-tracker.c
 	(menu_provider_get_background_items):
 	Implement Nautilus get_background_items() interface.
diff --git a/src/api/na-ifactory-object-data.h b/src/api/na-ifactory-object-data.h
index 521a101..02c5d22 100644
--- a/src/api/na-ifactory-object-data.h
+++ b/src/api/na-ifactory-object-data.h
@@ -68,7 +68,7 @@ G_BEGIN_DECLS
 #define NAFO_DATA_TOOLBAR_SAME_LABEL		"na-factory-data-toolbar-same-label"
 #define NAFO_DATA_LAST_ALLOCATED			"na-factory-data-last-allocated"
 
-#define NA_FACTORY_OBSOLETED_ACTION_GROUP	"na-factory-group-action-obsoleted"
+#define NA_FACTORY_ACTION_V1_GROUP			"na-factory-group-action-v1"
 
 #define NA_FACTORY_OBJECT_MENU_GROUP		"na-factory-group-menu"
 
diff --git a/src/core/na-object-action-factory.c b/src/core/na-object-action-factory.c
index 1f0c561..5408465 100644
--- a/src/core/na-object-action-factory.c
+++ b/src/core/na-object-action-factory.c
@@ -80,12 +80,11 @@ static NADataDef data_def_action [] = {
 	 * it is so no more readable (it doesn't take anymore any useful information)
 	 * nor writable (obsolete)
 	 *
-	 * we now consider that folders condition is to be met when the target is
-	 * is only one folder, whether this is a selected item, or the current
-	 * folder when there is no selection
+	 * we now consider that the folders condition is to be met every time
+	 * a selection contains folders
 	 */
 	{ NAFO_DATA_TARGET_BACKGROUND,
-				TRUE,
+				FALSE,
 				FALSE,
 				FALSE,
 				"Target the folder context menu",
@@ -307,7 +306,7 @@ NADataGroup action_data_groups [] = {
 	{ NA_FACTORY_OBJECT_ID_GROUP,         data_def_id },
 	{ NA_FACTORY_OBJECT_ITEM_GROUP,       data_def_item },
 	{ NA_FACTORY_OBJECT_ACTION_GROUP,     data_def_action },
-	{ NA_FACTORY_OBSOLETED_ACTION_GROUP,  data_def_action_v1 },
+	{ NA_FACTORY_ACTION_V1_GROUP,         data_def_action_v1 },
 	{ NA_FACTORY_OBJECT_CONDITIONS_GROUP, NULL },
 	{ NULL }
 };



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]