18 files changed, 12 insertions, 75 deletions
diff --git a/Makefile.am b/Makefile.am
index f00647a5..342951f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.shared
 SUBDIRS = \
 	eel \
 	libcaja-extension \
-	cut-n-paste-code \
+	libegg \
 	libcaja-private \
 	src \
 	test \
diff --git a/configure.ac b/configure.ac
index e9dd423d..27ad9e11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -323,8 +323,7 @@ AM_CONDITIONAL([ICON_UPDATE], [test -n "$UPDATE_ICON_CACHE"])
 
 AC_CONFIG_FILES([
 Makefile
-cut-n-paste-code/Makefile
-cut-n-paste-code/libegg/Makefile
+libegg/Makefile
 data/Makefile
 data/icons/Makefile
 data/patterns/Makefile
diff --git a/cut-n-paste-code/Makefile.am b/cut-n-paste-code/Makefile.am
deleted file mode 100644
index 80f6abb0..00000000
--- a/cut-n-paste-code/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = libegg
-
diff --git a/cut-n-paste-code/README b/cut-n-paste-code/README
deleted file mode 100644
index 374b0704..00000000
--- a/cut-n-paste-code/README
+++ /dev/null
@@ -1,21 +0,0 @@
-README for caja/cut-n-paste-code
-
-The code in this directory hierarchy was cut-n-pasted from
-somewhere else.
-
-In the soon to come, Star Trek future, this code will be available
-as part of standard libraries.
-
-For example, the code in libegg will be one day available as part
-of Gtk+.
-
-Until that happens, DON'T HACK the code, unless you are updating
-from the original cut-n-paste source.
-
-Instead of hacking the code in cut-n-paste-code, create subclasses
-and put them in libcaja-extensions.
-
-If you have any specific questions, comments or complaints about this
-setup, open an issue on GitHub at:
-
-https://github.com/mate-desktop/caja/issues
diff --git a/cut-n-paste-code/libegg/update-from-egg.sh b/cut-n-paste-code/libegg/update-from-egg.sh
deleted file mode 100755
index 9be68a9b..00000000
--- a/cut-n-paste-code/libegg/update-from-egg.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-function die() {
-  echo $*
-  exit 1
-}
-
-if test -z "$EGGDIR"; then
-   echo "Must set EGGDIR"
-   exit 1
-fi
-
-if test -z "$EGGFILES"; then
-   echo "Must set EGGFILES"
-   exit 1
-fi
-
-for FILE in $EGGFILES; do
-  if cmp -s $EGGDIR/$FILE $FILE; then
-     echo "File $FILE is unchanged"
-  else
-     cp $EGGDIR/$FILE $FILE || die "Could not move $EGGDIR/$FILE to $FILE"
-     echo "Updated $FILE"
-  fi
-done
diff --git a/libcaja-private/Makefile.am b/libcaja-private/Makefile.am
index c4abbd93..7d724641 100644
--- a/libcaja-private/Makefile.am
+++ b/libcaja-private/Makefile.am
@@ -5,7 +5,6 @@ noinst_LTLIBRARIES=libcaja-private.la
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
-	-I$(top_srcdir)/cut-n-paste-code \
 	$(CORE_CFLAGS) \
 	$(WARNING_CFLAGS) \
 	$(DISABLE_DEPRECATED_CFLAGS) \
@@ -23,7 +22,7 @@ BUILT_SOURCES = \
 	$(NULL)
 
 dependency_static_libs = \
-	$(top_builddir)/cut-n-paste-code/libegg/libegg.la \
+	$(top_builddir)/libegg/libegg.la \
 	$(NULL)
 
 libcaja_private_la_LDFLAGS = \
diff --git a/cut-n-paste-code/libegg/Makefile.am b/libegg/Makefile.am
index 3d6e3977..89e4350a 100644
--- a/cut-n-paste-code/libegg/Makefile.am
+++ b/libegg/Makefile.am
@@ -33,14 +33,3 @@ libegg_la_CFLAGS =				\
 libegg_la_LIBADD = 	\
 	$(LIBEGG_LIBS)	\
 	-lSM -lICE
-
-EXTRA_DIST = 			\
-	update-from-egg.sh	\
-	$(NULL)
-
-EGG_TREE_DND_DIR = $(srcdir)/../../../libegg/libegg/treeviewutils
-EGG_SMCLIENT_DIR = $(srcdir)/../../../libegg/libegg/smclient
-
-regenerate-built-sources:
-	EGGFILES="$(EGG_TREE_DND_FILES)" EGGDIR="$(EGG_TREE_DND_DIR)" $(srcdir)/update-from-egg.sh
-	EGGFILES="$(EGG_SMCLIENT_FILES)" EGGDIR="$(EGG_SMCLIENT_DIR)" $(srcdir)/update-from-egg.sh
diff --git a/cut-n-paste-code/libegg/eggdesktopfile.c b/libegg/eggdesktopfile.c
index eb227b69..eb227b69 100644
--- a/cut-n-paste-code/libegg/eggdesktopfile.c
+++ b/libegg/eggdesktopfile.c
diff --git a/cut-n-paste-code/libegg/eggdesktopfile.h b/libegg/eggdesktopfile.h
index 4a1d4064..4a1d4064 100644
--- a/cut-n-paste-code/libegg/eggdesktopfile.h
+++ b/libegg/eggdesktopfile.h
diff --git a/cut-n-paste-code/libegg/eggsmclient-private.h b/libegg/eggsmclient-private.h
index 3eec5324..3eec5324 100644
--- a/cut-n-paste-code/libegg/eggsmclient-private.h
+++ b/libegg/eggsmclient-private.h
diff --git a/cut-n-paste-code/libegg/eggsmclient-xsmp.c b/libegg/eggsmclient-xsmp.c
index 808fffc0..808fffc0 100644
--- a/cut-n-paste-code/libegg/eggsmclient-xsmp.c
+++ b/libegg/eggsmclient-xsmp.c
diff --git a/cut-n-paste-code/libegg/eggsmclient.c b/libegg/eggsmclient.c
index 4886f147..4886f147 100644
--- a/cut-n-paste-code/libegg/eggsmclient.c
+++ b/libegg/eggsmclient.c
diff --git a/cut-n-paste-code/libegg/eggsmclient.h b/libegg/eggsmclient.h
index 1911b89e..1911b89e 100644
--- a/cut-n-paste-code/libegg/eggsmclient.h
+++ b/libegg/eggsmclient.h
diff --git a/cut-n-paste-code/libegg/eggtreemultidnd.c b/libegg/eggtreemultidnd.c
index 062bb57e..062bb57e 100644
--- a/cut-n-paste-code/libegg/eggtreemultidnd.c
+++ b/libegg/eggtreemultidnd.c
diff --git a/cut-n-paste-code/libegg/eggtreemultidnd.h b/libegg/eggtreemultidnd.h
index 0510e517..0510e517 100644
--- a/cut-n-paste-code/libegg/eggtreemultidnd.h
+++ b/libegg/eggtreemultidnd.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 56a1420c..e29c8e7f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,10 +1,15 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
-cut-n-paste-code/libegg/eggdesktopfile.c
-cut-n-paste-code/libegg/eggsmclient.c
 data/browser.xml
 data/caja.appdata.xml.in
+data/caja-autorun-software.desktop.in.in
+data/caja-browser.desktop.in.in
+data/caja-computer.desktop.in.in
+data/caja.desktop.in.in
+data/caja-file-management-properties.desktop.in.in
+data/caja-folder-handler.desktop.in.in
+data/caja-home.desktop.in.in
 data/caja.xml.in
 eel/eel-canvas.c
 eel/eel-editable-label.c
@@ -47,13 +52,8 @@ libcaja-private/caja-undostack-manager.c
 libcaja-private/caja-vfs-file.c
 [type: gettext/gsettings]libcaja-private/org.mate.caja.gschema.xml
 [type: gettext/gsettings]libcaja-private/org.mate.media-handling.gschema.xml
-data/caja-autorun-software.desktop.in.in
-data/caja-browser.desktop.in.in
-data/caja-computer.desktop.in.in
-data/caja-file-management-properties.desktop.in.in
-data/caja-folder-handler.desktop.in.in
-data/caja-home.desktop.in.in
-data/caja.desktop.in.in
+libegg/eggdesktopfile.c
+libegg/eggsmclient.c
 src/file-manager/fm-desktop-icon-view.c
 src/file-manager/fm-directory-view.c
 src/file-manager/fm-ditem-page.c
diff --git a/src/Makefile.am b/src/Makefile.am
index daeaa38b..f4e50024 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,6 @@ bin_PROGRAMS = \
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/cut-n-paste-code \
 	-I$(top_builddir)/libcaja-private \
 	$(CORE_CFLAGS) \
 	$(WARNING_CFLAGS) \
diff --git a/src/file-manager/Makefile.am b/src/file-manager/Makefile.am
index 1f46cfc2..9e5f5578 100644
--- a/src/file-manager/Makefile.am
+++ b/src/file-manager/Makefile.am
@@ -4,7 +4,6 @@ noinst_LTLIBRARIES=libcaja-file-manager.la
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/cut-n-paste-code \
 	$(CORE_CFLAGS) \
 	$(WARNING_CFLAGS) \
 	-DCAJA_DATADIR=\""$(datadir)/caja"\" \