[uim-commit] r1483 - trunk/uim

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-09-12 07:53:31 -0700 (Mon, 12 Sep 2005)
New Revision: 1483

Modified:
   trunk/uim/editline.c
   trunk/uim/plugin.c
Log:
* uim/editline.c
  - (UIM_EDITLINE_SEPARATED_BUILD): New macro. Currently defined as 1
    to be compatible with previous code. If no distro packagers need
    this, please remove
  - Include editline.h and uim-compat-scm.h
* uim/plugin.c
  - (plugin_load): Fix an invalid argument passing for DPRINTFN()


Modified: trunk/uim/editline.c
===================================================================
--- trunk/uim/editline.c	2005-09-12 14:23:59 UTC (rev 1482)
+++ trunk/uim/editline.c	2005-09-12 14:53:31 UTC (rev 1483)
@@ -30,11 +30,27 @@
   SUCH DAMAGE.
 */
 
+/*
+ * Currently defined as 1 to be compatible with previous code. If no
+ * distro packagers need this, please remove
+ */
+#define UIM_EDITLINE_SEPARATED_BUILD 1
+
+#include <histedit.h>
+
+#if UIM_EDITLINE_SEPARATED_BUILD
 #include <uim/uim.h>
 #include <uim/uim-scm.h>
+#include <uim/uim-compat-scm.h>
 #include <uim/plugin.h>
+#else
+#include "uim.h"
+#include "uim-scm.h"
+#include "uim-compat-scm.h"
+#include "plugin.h"
+#endif
 
-#include <histedit.h>
+#include "editline.h"
 
 static EditLine *el;
 static History *hist;

Modified: trunk/uim/plugin.c
===================================================================
--- trunk/uim/plugin.c	2005-09-12 14:23:59 UTC (rev 1482)
+++ trunk/uim/plugin.c	2005-09-12 14:53:31 UTC (rev 1483)
@@ -158,7 +158,7 @@
     return uim_scm_f();
   }
 
-  DPRINTFN(0, (stderr, "Calling plugin_instance_init().\n", plugin_name));
+  DPRINTFN(0, (stderr, "Calling plugin_instance_init() for %s.\n", plugin_name));
   (plugin_instance_init)();
   if (plugin_scm_filename) {
     uim_bool succeeded;