Fix warnings in scim module and indent Makefile.am correctly. By Jihoon Kim

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@66572 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/modules/immodules/scim/Makefile.am b/src/modules/immodules/scim/Makefile.am
index a5d1fed..40579ca 100644 (file)
--- a/src/modules/immodules/scim/Makefile.am
+++ b/src/modules/immodules/scim/Makefile.am
@@ -30,7 +30,7 @@ scim_la_LIBADD = \
         $(top_builddir)/src/lib/ecore_imf/libecore_imf.la \
         $(top_builddir)/src/lib/ecore_x/libecore_x.la \
        @SCIM_LIBS@ \
-        @EVAS_LIBS@ \
+       @EVAS_LIBS@ \
        @EINA_LIBS@
 scim_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
 scim_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/src/modules/immodules/scim/scim_imcontext.cpp b/src/modules/immodules/scim/scim_imcontext.cpp
index 375f26b..b4edfe4 100644 (file)
--- a/src/modules/immodules/scim/scim_imcontext.cpp
+++ b/src/modules/immodules/scim/scim_imcontext.cpp
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #define Uses_SCIM_DEBUG
 #define Uses_SCIM_BACKEND
 #define Uses_SCIM_IMENGINE_MODULE
@@ -1386,7 +1390,7 @@ isf_imf_context_filter_event (Ecore_IMF_Context *ctx, Ecore_IMF_Event_Type type,
 
 /* Panel Slot functions */
 static void
-panel_slot_reload_config (int context)
+panel_slot_reload_config (int context __UNUSED__)
 {
    SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
    _config->reload ();
@@ -1764,7 +1768,7 @@ panel_finalize (void)
 }
 
 static Eina_Bool
-panel_iochannel_handler (void *data, Ecore_Fd_Handler *fd_handler)
+panel_iochannel_handler (void *data __UNUSED__, Ecore_Fd_Handler *fd_handler)
 {
    SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
 
@@ -2665,14 +2669,9 @@ slot_update_property (IMEngineInstanceBase *si,
 }
 
 static void
-slot_beep (IMEngineInstanceBase *si)
+slot_beep (IMEngineInstanceBase *si __UNUSED__)
 {
    SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
-
-   EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *> (si->get_frontend_data ());
-
-   if (ic && ic->impl && _focused_ic == ic)
-     ;//gdk_beep ();
 }
 
 static void
@@ -2798,7 +2797,7 @@ reload_config_callback (const ConfigPointer &config)
 }
 
 static void
-fallback_commit_string_cb (IMEngineInstanceBase  *si,
+fallback_commit_string_cb (IMEngineInstanceBase  *si __UNUSED__,
                            const WideString      &str)
 {
    SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";