[ease/plugins] Revived the OCA "plugin", now building in ease.

[Nate Stedman <natesm src gnome org>]

commit 656c9fc83450764982936b2f5c9f58729eb87df1
Author: Nate Stedman <natesm gmail com>
Date:   Sun Aug 22 05:54:37 2010 -0400

    Revived the OCA "plugin", now building in ease.
    
    Doesn't actually work, cannot be accessed from the UI.
    
    That's next.

 configure.ac                                       |    2 ++
 ease-core/Makefile.am                              |    2 ++
 .../ease-plugin-import-media.vala                  |    0
 .../ease-plugin-import-service.vala                |    0
 ease/Makefile.am                                   |    2 ++
 .../ease-import-oca-media.vala                     |    0
 .../ease-import-oca-service.vala                   |    9 ---------
 7 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c365005..c396ca2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,7 @@ pkg_modules="\
  json-glib-1.0 >= 0.7.6\
  libarchive\
  poppler-glib\
+ rest-extras-0.6\
  unique-1.0"
  
 PKG_CHECK_MODULES(EASE, [$pkg_modules])
@@ -72,6 +73,7 @@ EASE_PACKAGES="\
  --pkg json-glib-1.0\
  --pkg libarchive\
  --pkg poppler-glib\
+ --pkg rest-extras-0.6\
  --pkg unique-1.0"
 
 AC_SUBST(EASE_CFLAGS)
diff --git a/ease-core/Makefile.am b/ease-core/Makefile.am
index 0767edd..287a989 100644
--- a/ease-core/Makefile.am
+++ b/ease-core/Makefile.am
@@ -22,6 +22,8 @@ libease_core_ EASE_CORE_VERSION@_la_SOURCES = \
 	ease-image.vala \
 	ease-iterable-models.vala \
 	ease-media-element.vala \
+	ease-plugin-import-media.vala \
+	ease-plugin-import-service.vala \
 	ease-pdf-actor.vala \
 	ease-pdf-element.vala \
 	ease-shape-element.vala \
diff --git a/src/ease-plugin-import-image.vala b/ease-core/ease-plugin-import-media.vala
similarity index 100%
rename from src/ease-plugin-import-image.vala
rename to ease-core/ease-plugin-import-media.vala
diff --git a/src/ease-plugin-import-dialog.vala b/ease-core/ease-plugin-import-service.vala
similarity index 100%
rename from src/ease-plugin-import-dialog.vala
rename to ease-core/ease-plugin-import-service.vala
diff --git a/ease/Makefile.am b/ease/Makefile.am
index 2833425..8cfccd1 100644
--- a/ease/Makefile.am
+++ b/ease/Makefile.am
@@ -8,6 +8,8 @@ ease_SOURCES = \
 	ease-editor-embed.vala \
 	ease-editor-window.vala \
 	ease-handle.vala \
+	ease-import-oca-media.vala \
+	ease-import-oca-service.vala \
 	ease-inspector-element-pane.vala \
 	ease-inspector-pane.vala \
 	ease-inspector-slide-pane.vala \
diff --git a/plugins/oca-image.vala b/ease/ease-import-oca-media.vala
similarity index 100%
rename from plugins/oca-image.vala
rename to ease/ease-import-oca-media.vala
diff --git a/plugins/oca-dialog.vala b/ease/ease-import-oca-service.vala
similarity index 93%
rename from plugins/oca-dialog.vala
rename to ease/ease-import-oca-service.vala
index 46642c0..e3fb6ee 100644
--- a/plugins/oca-dialog.vala
+++ b/ease/ease-import-oca-service.vala
@@ -94,12 +94,3 @@ public class OCA.Dialog : Ease.PluginImportDialog
 	}
 }
 
-public static int main(string[] args)
-{
-	Gtk.init(ref args);
-	var dialog = new OCA.Dialog();
-	dialog.show_all();
-	dialog.run();
-	
-	return 0;
-}