general: merge libnautilus-private to srcwip/csoriano/private-to-src

And fix make distcheck.

Although libnautilus-private seem self contained, it was actually
depending on the files on src/ for dnd.
Not only that, but files in libnautilus-private also were depending on
dnd files, which you can guess it's wrong.

Before the desktop split, this was working because the files were
distributed, but now was a problem since we reestructured the code, and
now nautilus being a library make distcheck stop working.

First solution was try to fix this inter dependency of files, but at
some point I realized that there was no real point on splitting some of
those files, because for example, is perfectly fine for dnd to need to
access the window functions, and it's perfectly fine for the widgets
in the private library to need to access to all dnd functions.

So seems to me the private library of nautilus is somehow an artificial
split, which provides more problems than solutions.

We needed libnautilus-private to have a private library that we could
isolate from extensions, but I don't think it worth given the problems
it provides, and also, this not so good logical split.
Right now, since with the desktop split we created a libnautilus to be
used by the desktop part of nautilus, extensions have access to all
the API of nautilus. We will think in future how this can be handled if
we want.

So for now, merge the libnautilus-private into src, and let's rethink
a better logic to split the code and the private parts of nautilus than
what we had.

Thanks a lot to Rafael Fonseca for helping in get this done.

https://bugzilla.gnome.org/show_bug.cgi?id=765543

1 files changed, 272 insertions, 0 deletions

diff --git a/src/nautilus-file-undo-manager.c b/src/nautilus-file-undo-manager.c
new file mode 100644
index 000000000..e3e915fbd
--- /dev/null
+++ b/src/nautilus-file-undo-manager.c
@@ -0,0 +1,272 @@
+
+/* nautilus-file-undo-manager.c - Manages the undo/redo stack
+ *
+ * Copyright (C) 2007-2011 Amos Brocco
+ * Copyright (C) 2010, 2012 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Amos Brocco <amos.brocco@gmail.com>
+ *          Cosimo Cecchi <cosimoc@redhat.com>
+ *
+ */
+
+#include <config.h>
+
+#include "nautilus-file-undo-manager.h"
+
+#include "nautilus-file-operations.h"
+#include "nautilus-file.h"
+#include "nautilus-trash-monitor.h"
+
+#include <glib/gi18n.h>
+
+#define DEBUG_FLAG NAUTILUS_DEBUG_UNDO
+#include "nautilus-debug.h"
+
+enum {
+	SIGNAL_UNDO_CHANGED,
+	NUM_SIGNALS,
+};
+
+static guint signals[NUM_SIGNALS] = { 0, };
+
+G_DEFINE_TYPE (NautilusFileUndoManager, nautilus_file_undo_manager, G_TYPE_OBJECT)
+
+struct _NautilusFileUndoManagerPrivate
+{
+	NautilusFileUndoInfo *info;
+	NautilusFileUndoManagerState state;
+	NautilusFileUndoManagerState last_state;
+
+	guint is_operating : 1;
+
+	gulong trash_signal_id;
+};
+
+static NautilusFileUndoManager *undo_singleton = NULL;
+
+static NautilusFileUndoManager *
+get_singleton (void)
+{
+	if (undo_singleton == NULL) {
+		undo_singleton = g_object_new (NAUTILUS_TYPE_FILE_UNDO_MANAGER, NULL);
+		g_object_add_weak_pointer (G_OBJECT (undo_singleton), (gpointer) &undo_singleton);
+	}
+
+	return undo_singleton;
+}
+
+static void
+file_undo_manager_clear (NautilusFileUndoManager *self)
+{
+	g_clear_object (&self->priv->info);
+	self->priv->state = NAUTILUS_FILE_UNDO_MANAGER_STATE_NONE;
+}
+
+static void
+trash_state_changed_cb (NautilusTrashMonitor *monitor,
+			gboolean is_empty,
+			gpointer user_data)
+{
+	NautilusFileUndoManager *self = user_data;
+
+	/* A trash operation cannot be undone if the trash is empty */
+	if (is_empty &&
+	    self->priv->state == NAUTILUS_FILE_UNDO_MANAGER_STATE_UNDO &&
+	    NAUTILUS_IS_FILE_UNDO_INFO_TRASH (self->priv->info)) {
+		file_undo_manager_clear (self);
+		g_signal_emit (self, signals[SIGNAL_UNDO_CHANGED], 0);
+	}
+}
+
+static void
+nautilus_file_undo_manager_init (NautilusFileUndoManager * self)
+{
+	NautilusFileUndoManagerPrivate *priv = self->priv = 
+		G_TYPE_INSTANCE_GET_PRIVATE (self, 
+					     NAUTILUS_TYPE_FILE_UNDO_MANAGER, 
+					     NautilusFileUndoManagerPrivate);
+
+	priv->trash_signal_id = g_signal_connect (nautilus_trash_monitor_get (),
+						  "trash-state-changed",
+						  G_CALLBACK (trash_state_changed_cb), self);
+}
+
+static void
+nautilus_file_undo_manager_finalize (GObject * object)
+{
+	NautilusFileUndoManager *self = NAUTILUS_FILE_UNDO_MANAGER (object);
+	NautilusFileUndoManagerPrivate *priv = self->priv;
+
+	if (priv->trash_signal_id != 0) {
+		g_signal_handler_disconnect (nautilus_trash_monitor_get (),
+					     priv->trash_signal_id);
+		priv->trash_signal_id = 0;
+	}
+
+	file_undo_manager_clear (self);
+
+	G_OBJECT_CLASS (nautilus_file_undo_manager_parent_class)->finalize (object);
+}
+
+static void
+nautilus_file_undo_manager_class_init (NautilusFileUndoManagerClass *klass)
+{
+	GObjectClass *oclass;
+
+	oclass = G_OBJECT_CLASS (klass);
+
+	oclass->finalize = nautilus_file_undo_manager_finalize;
+
+	signals[SIGNAL_UNDO_CHANGED] =
+		g_signal_new ("undo-changed",
+			      G_TYPE_FROM_CLASS (klass),
+			      G_SIGNAL_RUN_LAST,
+			      0, NULL, NULL,
+			      g_cclosure_marshal_VOID__VOID,
+			      G_TYPE_NONE, 0);
+
+	g_type_class_add_private (klass, sizeof (NautilusFileUndoManagerPrivate));
+}
+
+static void
+undo_info_apply_ready (GObject *source,
+		       GAsyncResult *res,
+		       gpointer user_data)
+{
+	NautilusFileUndoManager *self = user_data;
+	NautilusFileUndoInfo *info = NAUTILUS_FILE_UNDO_INFO (source);
+	gboolean success, user_cancel;
+
+	success = nautilus_file_undo_info_apply_finish (info, res, &user_cancel, NULL);
+
+	self->priv->is_operating = FALSE;
+
+	/* just return in case we got another another operation set */
+	if ((self->priv->info != NULL) &&
+	    (self->priv->info != info)) {
+		return;
+	}
+
+	if (success) {
+		if (self->priv->last_state == NAUTILUS_FILE_UNDO_MANAGER_STATE_UNDO) {
+			self->priv->state = NAUTILUS_FILE_UNDO_MANAGER_STATE_REDO;
+		} else if (self->priv->last_state == NAUTILUS_FILE_UNDO_MANAGER_STATE_REDO) {
+			self->priv->state = NAUTILUS_FILE_UNDO_MANAGER_STATE_UNDO;
+		}
+
+		self->priv->info = g_object_ref (info);
+	} else if (user_cancel) {
+		self->priv->state = self->priv->last_state;
+		self->priv->info = g_object_ref (info);
+	} else {
+		file_undo_manager_clear (self);
+	}
+
+	g_signal_emit (self, signals[SIGNAL_UNDO_CHANGED], 0);
+}
+
+static void
+do_undo_redo (NautilusFileUndoManager *self,
+	      GtkWindow *parent_window)
+{
+	gboolean undo = self->priv->state == NAUTILUS_FILE_UNDO_MANAGER_STATE_UNDO;
+
+	self->priv->last_state = self->priv->state;
+
+	self->priv->is_operating = TRUE;
+	nautilus_file_undo_info_apply_async (self->priv->info, undo, parent_window,
+					     undo_info_apply_ready, self);
+
+	/* clear actions while undoing */
+	file_undo_manager_clear (self);
+	g_signal_emit (self, signals[SIGNAL_UNDO_CHANGED], 0);
+}
+
+void
+nautilus_file_undo_manager_redo (GtkWindow *parent_window)
+{
+	NautilusFileUndoManager *self = get_singleton ();
+
+	if (self->priv->state != NAUTILUS_FILE_UNDO_MANAGER_STATE_REDO) {
+		g_warning ("Called redo, but state is %s!", self->priv->state == 0 ?
+			   "none" : "undo");
+		return;
+	}
+
+	do_undo_redo (self, parent_window);
+}
+
+void
+nautilus_file_undo_manager_undo (GtkWindow *parent_window)
+{
+	NautilusFileUndoManager *self = get_singleton ();
+
+	if (self->priv->state != NAUTILUS_FILE_UNDO_MANAGER_STATE_UNDO) {
+		g_warning ("Called undo, but state is %s!", self->priv->state == 0 ?
+			   "none" : "redo");
+		return;
+	}
+
+	do_undo_redo (self, parent_window);
+}
+
+void
+nautilus_file_undo_manager_set_action (NautilusFileUndoInfo *info)
+{
+	NautilusFileUndoManager *self = get_singleton ();
+
+	DEBUG ("Setting undo information %p", info);
+
+	file_undo_manager_clear (self);
+
+	if (info != NULL) {
+		self->priv->info = g_object_ref (info);
+		self->priv->state = NAUTILUS_FILE_UNDO_MANAGER_STATE_UNDO;
+		self->priv->last_state = NAUTILUS_FILE_UNDO_MANAGER_STATE_NONE;
+	}
+
+	g_signal_emit (self, signals[SIGNAL_UNDO_CHANGED], 0);
+}
+
+NautilusFileUndoInfo *
+nautilus_file_undo_manager_get_action (void)
+{
+	NautilusFileUndoManager *self = get_singleton ();
+
+	return self->priv->info;
+}
+
+NautilusFileUndoManagerState 
+nautilus_file_undo_manager_get_state (void)
+{
+	NautilusFileUndoManager *self = get_singleton ();
+
+	return self->priv->state;
+}
+
+
+gboolean
+nautilus_file_undo_manager_is_operating ()
+{
+	NautilusFileUndoManager *self = get_singleton ();
+	return self->priv->is_operating;
+}
+
+NautilusFileUndoManager *
+nautilus_file_undo_manager_get ()
+{
+	return get_singleton ();
+}