From: handa <handa>
Date: Sun, 27 Jul 2008 02:32:43 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: REL-0-9-1
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0cba894de537311008d2b064928aae97de0838c;p=m17n%2Fm17n-im-config.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 5bc9da3..b08978e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,19 @@
-2008-07-26  Kenichi Handa  <handa@m17n.org>
+2008-07-27  Kenichi Handa  <handa@m17n.org>
 
 	* Version 0.9.1 released.
 
+2008-07-27  Kenichi Handa  <handa@m17n.org>
+
+	* src/Makefile.am (AM_CPPFLAGS): Renambed from AM_CFLAGS.  Add
+	flags fro building scim-m17n-setup.
+	(setupmoduedir, setupmodule_LTLIBRARIES)
+	(scim_m17n_setup_la_SOURCES)
+	(scim_m17n_setup_la_LDFLAGS): New variables.
+
+	* src/scim-m17n-setup.cpp: New file.
+
+	* configure.ac: Add check for building scim-m17n-setup.
+
 2008-07-26  Kenichi Handa  <handa@m17n.org>
 
 	* m17n-im-config.pc.in (Name): Fixed to m17n-im-config.
diff --git a/README b/README
index 0088327..af651a2 100644
--- a/README
+++ b/README
@@ -115,6 +115,13 @@ The program "m17n-im-config" provides a GUI for per-user configuration
 of input methods of the m17n library.  As the GUI is quite straight
 forward, there's nothing we should explain here.
 
+(3-4) Usage of SCIM Setup module
+
+The module "scim-m17n-setup" is installed in a proper directory where
+the program "scim-setup" searches loadable moduels.  When you run that
+program and click the tab "IMEngine->M17N Lib", you'll see the same
+GUI window as "m17n-im-config" provides.
+
 
 ----------------------------------------------------------------------
 Copyright information
diff --git a/src/scim_m17n_setup.cpp b/src/scim_m17n_setup.cpp
deleted file mode 100644
index d24103b..0000000
--- a/src/scim_m17n_setup.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/* scim_m17n_setup.cpp - SCIM Setup Module of m17n imengine module
-   Copyright (C) 2008
-     National Institute of Advanced Industrial Science and Technology (AIST)
-     Registration Number H15PRO112
-
-   This file is part of the m17n-im-config package; a sub-part of the
-   m17n library.
-
-   The m17n library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License
-   as published by the Free Software Foundation; either version 2.1 of
-   the License, or (at your option) any later version.
-
-   The m17n 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the m17n library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   02111-1307, USA.  */
-
-#include <dirent.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#include <gtk/gtk.h>
-#define Uses_SCIM_CONFIG_BASE
-#include <scim.h>
-#include <m17n-im-config.h>
-
-#if defined(HAVE_LIBINTL_H) && defined(ENABLE_NLS)
-  #include <libintl.h>
-  #define _(String) dgettext(GETTEXT_PACKAGE,String)
-  #define N_(String) (String)
-#else
-  #define _(String) (String)
-  #define N_(String) (String)
-  #define bindtextdomain(Package,Directory)
-  #define textdomain(domain)
-  #define bind_textdomain_codeset(domain,codeset)
-#endif
-
-using namespace scim;
-
-#define scim_module_init m17n_imengine_setup_LTX_scim_module_init
-#define scim_module_exit m17n_imengine_setup_LTX_scim_module_exit
-
-#define scim_setup_module_create_ui       m17n_imengine_setup_LTX_scim_setup_module_create_ui
-#define scim_setup_module_get_category    m17n_imengine_setup_LTX_scim_setup_module_get_category
-#define scim_setup_module_get_name        m17n_imengine_setup_LTX_scim_setup_module_get_name
-#define scim_setup_module_get_description m17n_imengine_setup_LTX_scim_setup_module_get_description
-#define scim_setup_module_load_config     m17n_imengine_setup_LTX_scim_setup_module_load_config
-#define scim_setup_module_save_config     m17n_imengine_setup_LTX_scim_setup_module_save_config
-#define scim_setup_module_query_changed   m17n_imengine_setup_LTX_scim_setup_module_query_changed
-
-static GtkWidget *widget = 0;
-
-// Module Interface.
-extern "C" {
-    void scim_module_init (void)
-    {
-    }
-
-    void scim_module_exit (void)
-    {
-    }
-
-    GtkWidget *scim_setup_module_create_ui (void)
-    {
-      if (! widget)
-	{
-	  widget = mim_config_new (NULL, NULL);
-	  gtk_widget_show_all (widget);
-	}
-      return widget;
-    }
-
-    String scim_setup_module_get_category (void)
-    {
-        return String ("IMEngine");
-    }
-
-    String scim_setup_module_get_name (void)
-    {
-        return String (_("M17N Lib"));
-    }
-
-    String scim_setup_module_get_description (void)
-    {
-        return String (_("An IMEngine Module for m17n-lib input methods."));
-    }
-
-    void scim_setup_module_load_config (const ConfigPointer &config)
-    {
-        mim_config_revert (widget);
-    }
-
-    void scim_setup_module_save_config (const ConfigPointer &config)
-    {
-        mim_config_save (widget);
-    }
-
-    bool scim_setup_module_query_changed ()
-    {
-        return mim_config_modified (widget);
-    }
-} // extern "C"