From c92c2ae48441eba8e4c0e92b6c07663aba3904e0 Mon Sep 17 00:00:00 2001
From: Yevgen Muntyan <17531749+muntyan@users.noreply.github.com>
Date: Wed, 28 Mar 2007 03:00:16 -0500
Subject: [PATCH] Reenabled completion

---
 configure.ac                                       | 1 +
 moo.mprj                                           | 2 +-
 moo/mooedit/Makefile.am                            | 8 +++++++-
 moo/mooedit/mooplugin.c                            | 2 +-
 moo/mooedit/plugins/Makefile.am                    | 4 ++--
 moo/mooedit/plugins/completion/completion-plugin.c | 1 +
 moo/mooutils/moomarshals.list                      | 2 ++
 7 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1dbd9bc1..8d478814 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,7 @@ moo/mooedit/gtksourceview/upstream/Makefile
 moo/mooedit/plugins/Makefile
 moo/mooedit/plugins/activestrings/Makefile
 moo/mooedit/plugins/fileselector/Makefile
+moo/mooedit/plugins/completion/Makefile
 moo/mooapp/Makefile
 moo/mooapp/smclient/Makefile
 moo/moopython/Makefile
diff --git a/moo.mprj b/moo.mprj
index ba23e6b9..37b765a8 100644
--- a/moo.mprj
+++ b/moo.mprj
@@ -34,7 +34,7 @@
    </configure>
   </optimized>
  </configurations>
- <file_selector_dir>/home/muntyan/projects/moo/moo/mooedit/glade/</file_selector_dir>
+ <file_selector_dir>/home/muntyan/projects/gap/gap4r4/src/</file_selector_dir>
  <run>
   <args>--g-fatal-warnings --new-app --mode=project</args>
   <exe>medit/medit</exe>
diff --git a/moo/mooedit/Makefile.am b/moo/mooedit/Makefile.am
index d78a59c1..9a72fea3 100644
--- a/moo/mooedit/Makefile.am
+++ b/moo/mooedit/Makefile.am
@@ -56,6 +56,8 @@ mooedit_sources =			\
 	moocommand-private.h		\
 	moocommand-script.c		\
 	moocommand-script.h		\
+	moocompletionsimple.c		\
+	moocompletionsimple.h		\
 	mooeditaction.c			\
 	mooeditaction-factory.c		\
 	mooeditaction-factory.h		\
@@ -103,16 +105,20 @@ mooedit_sources =			\
 	mooplugin-loader.c		\
 	moopluginprefs-glade.h		\
 	mooprint-glade.h		\
+	mootext-private.h		\
 	mootextbox.c			\
 	mootextbox.h			\
 	mootextbtree.c			\
 	mootextbtree.h			\
 	mootextbuffer.c			\
+	mootextcompletion.c		\
+	mootextcompletion.h		\
 	mootextfind.c			\
 	mootextfind-glade.h		\
 	mootextfind.h			\
 	mootextgotoline-glade.h		\
-	mootext-private.h		\
+	mootextpopup.c			\
+	mootextpopup.h			\
 	mootextsearch.c			\
 	mootextsearch-private.h		\
 	mootextstylescheme.c		\
diff --git a/moo/mooedit/mooplugin.c b/moo/mooedit/mooplugin.c
index d1f1780a..4a69e209 100644
--- a/moo/mooedit/mooplugin.c
+++ b/moo/mooedit/mooplugin.c
@@ -912,8 +912,8 @@ moo_plugin_init_builtin (void)
 #if GTK_CHECK_VERSION(2,6,0)
     _moo_file_selector_plugin_init ();
 #endif
-#if 0
     _moo_completion_plugin_init ();
+#if 0
     _moo_active_strings_plugin_init ();
 #endif
 }
diff --git a/moo/mooedit/plugins/Makefile.am b/moo/mooedit/plugins/Makefile.am
index c35d5da5..e68089de 100644
--- a/moo/mooedit/plugins/Makefile.am
+++ b/moo/mooedit/plugins/Makefile.am
@@ -2,8 +2,8 @@ DIST_SUBDIRS = activestrings fileselector
 
 # subdirs = activestrings completion
 # libs = activestrings/libastrings.la completion/libcompletion.la
-subdirs =
-libs =
+subdirs = completion
+libs = completion/libcompletion.la
 if GTK_2_6
 subdirs += fileselector
 libs += fileselector/libfileselector.la
diff --git a/moo/mooedit/plugins/completion/completion-plugin.c b/moo/mooedit/plugins/completion/completion-plugin.c
index 013c30f0..1526f3f6 100644
--- a/moo/mooedit/plugins/completion/completion-plugin.c
+++ b/moo/mooedit/plugins/completion/completion-plugin.c
@@ -130,6 +130,7 @@ cmpl_plugin_init (CmplPlugin *plugin)
                                  "tooltip", _("Complete Word"),
                                  "accel", "<Ctrl>space",
                                  "closure-callback", completion_callback,
+                                 "condition::sensitive", "has-open-document",
                                  NULL);
 
     if (xml)
diff --git a/moo/mooutils/moomarshals.list b/moo/mooutils/moomarshals.list
index 8a3d6372..a39e8a74 100644
--- a/moo/mooutils/moomarshals.list
+++ b/moo/mooutils/moomarshals.list
@@ -25,6 +25,7 @@ VOID:ENUM
 VOID:ENUM,UINT
 VOID:INT
 VOID:OBJECT
+VOID:OBJECT,BOXED
 VOID:OBJECT,BOXED,BOXED
 VOID:OBJECT,OBJECT
 VOID:POINTER
@@ -33,6 +34,7 @@ VOID:POINTER,OBJECT
 VOID:POINTER,POINTER
 VOID:STRING
 VOID:STRING,INT
+VOID:STRING,OBJECT
 VOID:UINT
 VOID:UINT,BOXED
 VOID:UINT,POINTER