[nautilus-actions] Pass the BaseWindow when creating a NactClipboard

[Pierre Wieser <pwieser src gnome org>]

commit 0d32333a79a229ab26d00589064e315d981a4c93
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sat Oct 17 15:19:49 2009 +0200

    Pass the BaseWindow when creating a NactClipboard

 ChangeLog                   |   11 +++++++++++
 src/nact/nact-clipboard.c   |    2 +-
 src/nact/nact-clipboard.h   |    4 +++-
 src/nact/nact-main-window.c |    4 ++--
 src/nact/nact-tree-model.c  |    2 +-
 5 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3b405ac..2bb618f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-17 Pierre Wieser <pwieser trychlos org>
+
+	Make clipboard have an access to preferences.
+
+	* src/nact/nact-clipboard.c:
+	* src/nact/nact-clipboard.h (nact_clipboard_new):
+	Now pass the BaseWindow as an argument.
+
+	* src/nact/nact-main-window.c:
+	* src/nact/nact-tree-model.c: Updated accordingly.
+
 2009-10-16 Pierre Wieser <pwieser trychlos org>
 
 	Let the user be asked when exporting actions.
diff --git a/src/nact/nact-clipboard.c b/src/nact/nact-clipboard.c
index 9efdf96..3c0fd6f 100644
--- a/src/nact/nact-clipboard.c
+++ b/src/nact/nact-clipboard.c
@@ -237,7 +237,7 @@ instance_finalize( GObject *window )
  * Returns: a new #NactClipboard object.
  */
 NactClipboard *
-nact_clipboard_new( void )
+nact_clipboard_new( BaseWindow *window )
 {
 	NactClipboard *clipboard;
 
diff --git a/src/nact/nact-clipboard.h b/src/nact/nact-clipboard.h
index 4119bdd..c816e1b 100644
--- a/src/nact/nact-clipboard.h
+++ b/src/nact/nact-clipboard.h
@@ -43,6 +43,8 @@
 
 #include <gtk/gtk.h>
 
+#include "base-window.h"
+
 G_BEGIN_DECLS
 
 #define NACT_CLIPBOARD_TYPE					( nact_clipboard_get_type())
@@ -87,7 +89,7 @@ enum {
 
 GType          nact_clipboard_get_type( void );
 
-NactClipboard *nact_clipboard_new( void );
+NactClipboard *nact_clipboard_new( BaseWindow *window );
 
 void           nact_clipboard_dnd_set( NactClipboard *clipboard, guint target, GList *rows, const gchar *folder, gboolean copy );
 GList         *nact_clipboard_dnd_get_data( NactClipboard *clipboard, gboolean *copy );
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index 99ab361..fe1fd96 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -894,8 +894,6 @@ on_base_initial_load_toplevel( NactMainWindow *window, gpointer user_data )
 
 	if( !window->private->dispose_has_run ){
 
-		window->private->clipboard = nact_clipboard_new();
-
 		pos = base_iprefs_get_int( BASE_WINDOW( window ), "main-paned" );
 		if( pos ){
 			pane = base_window_get_widget( BASE_WINDOW( window ), "MainPaned" );
@@ -926,6 +924,8 @@ on_base_runtime_init_toplevel( NactMainWindow *window, gpointer user_data )
 
 	if( !window->private->dispose_has_run ){
 
+		window->private->clipboard = nact_clipboard_new( BASE_WINDOW( window ));
+
 		base_window_signal_connect(
 				BASE_WINDOW( window ),
 				G_OBJECT( window ),
diff --git a/src/nact/nact-tree-model.c b/src/nact/nact-tree-model.c
index 646f9b2..8804e95 100644
--- a/src/nact/nact-tree-model.c
+++ b/src/nact/nact-tree-model.c
@@ -403,7 +403,7 @@ tree_model_new( BaseWindow *window, GtkTreeView *treeview )
 
 	model->private->window = window;
 	model->private->treeview = treeview;
-	model->private->clipboard = nact_clipboard_new();
+	model->private->clipboard = nact_clipboard_new( window );
 
 	return( model );
 }