[nautilus-actions] Renamed nact_window_xxx functions

[Pierre Wieser <pwieser src gnome org>]

commit af1a41b599bffde5837e74901a876d0e1a2e2ad0
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sat Sep 19 19:31:28 2009 +0200

    Renamed nact_window_xxx functions
    
    nact_window_save_object_item() is renamed as nact_window_save_item().
    nact_window_delete_object_item() is renamed as nact_window_delete_item().

 ChangeLog                    |    4 ++++
 src/nact/nact-main-menubar.c |    2 +-
 src/nact/nact-main-window.c  |    7 +++----
 src/nact/nact-window.c       |   25 ++++++-------------------
 src/nact/nact-window.h       |   13 ++-----------
 5 files changed, 16 insertions(+), 35 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 19640a2..c818959 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,12 +47,14 @@
 
 	* src/nact/nact-main-menubar.c:
 	Update conditions of sensitivity of menu items.
+	Use nact_window_save_item() new function name.
 
 	* src/nact/nact-main-window.c:
 	Emits "item-updated" to IActionsList in response to "item-updated"
 	from notebook's tabs.
 	nact_main_window_get_modified_items_count(): Replaced with
 	nact_main_window_has_modified_items().
+	Use nact_window_delete_item() new function name.
 
 	* src/nact/nact-tree-model.c:
 	* src/nact/nact-tree-model.h (nact_tree_model_display): New function.
@@ -60,6 +62,8 @@
 	* src/nact/nact-window.c:
 	* src/nact/nact-window.h (nact_window_warn_count_modified):
 	Renamed as nact_window_warn_modified() with string change.
+	nact_window_save_object_item() renamed ad nact_window_save_item().
+	nact_window_delete_object_item() renamed ad nact_window_delete_item().
 
 	* po/POTFILES.in: Update list of files.
 
diff --git a/src/nact/nact-main-menubar.c b/src/nact/nact-main-menubar.c
index 7af1d8b..284dfb1 100644
--- a/src/nact/nact-main-menubar.c
+++ b/src/nact/nact-main-menubar.c
@@ -383,7 +383,7 @@ save_object_item( NactMainWindow *window, NAPivot *pivot, NAObjectItem *object )
 
 	if( na_object_is_modified( NA_OBJECT( object )) &&
 		na_object_is_valid( NA_OBJECT( object )) &&
-		nact_window_save_object_item( NACT_WINDOW( window ), object )){
+		nact_window_save_item( NACT_WINDOW( window ), object )){
 
 			NAObjectItem *origin = NA_OBJECT_ITEM( na_object_get_origin( NA_OBJECT( object )));
 
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index bf62060..79749df 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -651,9 +651,8 @@ nact_main_window_remove_deleted( NactMainWindow *window )
 	window->private->deleted = NULL;
 }
 
-/**
- * nact_main_window_remove_deleted:
- *
+/*
+ * from nact_main_window_remove_deleted:
  * Removes the deleted items from the underlying I/O storage subsystem.
  */
 static void
@@ -662,7 +661,7 @@ actually_delete_item( NactMainWindow *window, NAObject *item, NAPivot *pivot )
 	GList *items, *it;
 
 	g_debug( "actually_delete_item %p", ( void * ) item );
-	if( nact_window_delete_object_item( NACT_WINDOW( window ), NA_OBJECT_ITEM( item ))){
+	if( nact_window_delete_item( NACT_WINDOW( window ), NA_OBJECT_ITEM( item ))){
 
 		NAObject *origin = na_object_get_origin( item );
 		if( origin ){
diff --git a/src/nact/nact-window.c b/src/nact/nact-window.c
index 8c47614..e43b0c7 100644
--- a/src/nact/nact-window.c
+++ b/src/nact/nact-window.c
@@ -63,8 +63,6 @@ static void   instance_init( GTypeInstance *instance, gpointer klass );
 static void   instance_dispose( GObject *application );
 static void   instance_finalize( GObject *application );
 
-static void   do_edition_field_modified( NactWindow *window, gpointer user_data );
-
 GType
 nact_window_get_type( void )
 {
@@ -117,8 +115,6 @@ class_init( NactWindowClass *klass )
 	object_class->finalize = instance_finalize;
 
 	klass->private = g_new0( NactWindowClassPrivate, 1 );
-
-	klass->edition_field_modified = do_edition_field_modified;
 }
 
 static void
@@ -197,7 +193,7 @@ nact_window_get_pivot( NactWindow *window )
 }
 
 /**
- * nact_window_save_object_item:
+ * nact_window_save_item:
  * @window: this #NactWindow instance.
  * @item: the #NAObjectItem to be saved.
  *
@@ -209,9 +205,9 @@ nact_window_get_pivot( NactWindow *window )
  * along with the list and the order of its subitems.
  */
 gboolean
-nact_window_save_object_item( NactWindow *window, NAObjectItem *item )
+nact_window_save_item( NactWindow *window, NAObjectItem *item )
 {
-	static const gchar *thisfn = "nact_window_save_action";
+	static const gchar *thisfn = "nact_window_save_item";
 	NAPivot *pivot;
 	gchar *msg = NULL;
 	guint ret;
@@ -236,16 +232,16 @@ nact_window_save_object_item( NactWindow *window, NAObjectItem *item )
 }
 
 /**
- * nact_window_delete_object_item:
+ * nact_window_delete_item:
  * @window: this #NactWindow object.
  * @item: the item (action or menu) to delete.
  *
  * Deleted an item from the I/O storage subsystem.
  */
 gboolean
-nact_window_delete_object_item( NactWindow *window, NAObjectItem *item )
+nact_window_delete_item( NactWindow *window, NAObjectItem *item )
 {
-	static const gchar *thisfn = "nact_window_delete_object_item";
+	static const gchar *thisfn = "nact_window_delete_item";
 	NAPivot *pivot;
 	gchar *msg = NULL;
 	guint ret;
@@ -355,12 +351,3 @@ nact_window_warn_modified( NactWindow *window )
 
 	return( ok );
 }
-
-/*
- * default implementation of "nact-signal-edition-field-modified" signal
- * does nothing here
- */
-static void
-do_edition_field_modified( NactWindow *window, gpointer user_data )
-{
-}
diff --git a/src/nact/nact-window.h b/src/nact/nact-window.h
index 2d403d1..21f2818 100644
--- a/src/nact/nact-window.h
+++ b/src/nact/nact-window.h
@@ -67,14 +67,6 @@ typedef struct NactWindowClassPrivate NactWindowClassPrivate;
 typedef struct {
 	BaseWindowClass         parent;
 	NactWindowClassPrivate *private;
-
-	/**
-	 * edition_field_modified
-	 *
-	 * virtual handler for "nact-signal-edition-field-modified" signal
-	 * default implementation does nothing
-	 */
-	void    ( *edition_field_modified )( NactWindow *window, gpointer user_data );
 }
 	NactWindowClass;
 
@@ -82,9 +74,8 @@ GType    nact_window_get_type( void );
 
 NAPivot *nact_window_get_pivot( NactWindow *window );
 
-/*void     nact_window_set_current_action( NactWindow *window, const NAAction *action );*/
-gboolean nact_window_save_object_item( NactWindow *window, NAObjectItem *item );
-gboolean nact_window_delete_object_item( NactWindow *window, NAObjectItem *item );
+gboolean nact_window_save_item( NactWindow *window, NAObjectItem *item );
+gboolean nact_window_delete_item( NactWindow *window, NAObjectItem *item );
 
 void     nact_window_write_level_zero( NactWindow *window, GList *items );
 void     nact_window_count_level_zero_items( GList *items, guint *actions, guint *profiles, guint *menus );