use dlog for printing error

Change-Id: I3da114c2135feaeacdf8671f81bf0667f624801a

diff --git a/configure.ac b/configure.ac
index e63b178..677800e 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script
 #AC_INIT(scim, 1.4.7, suzhe@tsinghua.org.cn)
-AC_INIT(isf, 2.3.6114, isf@samsung.com)
+AC_INIT(isf, 2.3.6115, isf@samsung.com)
 AC_CONFIG_SRCDIR([ism/src/scim.h])
 m4_pattern_allow([^AS_])
 
@@ -11,7 +11,7 @@ m4_pattern_allow([^AS_])
 # ISF version
 ISF_MAJOR_VERSION=2
 ISF_MINOR_VERSION=3
-ISF_MICRO_VERSION=6114
+ISF_MICRO_VERSION=6115
 
 ISF_VERSION=$ISF_MAJOR_VERSION.$ISF_MINOR_VERSION.$ISF_MICRO_VERSION
 

diff --git a/ism/src/Makefile.am b/ism/src/Makefile.am
index 90405c4..f36da12 100644 (file)
--- a/ism/src/Makefile.am
+++ b/ism/src/Makefile.am
@@ -137,12 +137,13 @@ libscim@SCIM_EPOCH@_la_SOURCES = scim_backend.cpp \
                          isf_imcontrol_client.cpp \
                          isf_query_utility.cpp
 
-libscim@SCIM_EPOCH@_la_CXXFLAGS = @GTK2_CFLAGS@
+libscim@SCIM_EPOCH@_la_CXXFLAGS = @GTK2_CFLAGS@ @DLOG_CFLAGS@
 
 libscim@SCIM_EPOCH@_la_LDFLAGS  = -version-info $(SCIM_CURRENT):$(SCIM_REVISION):$(SCIM_AGE) \
                          -export-dynamic \
                          -rpath $(libdir) \
                          $(LD_VERSION_SCRIPT_OPTION) \
+                         @DLOG_LIBS@ \
                          @LIBTOOL_EXPORT_OPTIONS@ \
                          @LIBICONV@ \
                          @LTLIBINTL@ \

diff --git a/ism/src/isf_imcontrol_client.cpp b/ism/src/isf_imcontrol_client.cpp
index 8e78845..3d9f3d9 100644 (file)
--- a/ism/src/isf_imcontrol_client.cpp
+++ b/ism/src/isf_imcontrol_client.cpp
@@ -27,10 +27,13 @@
 
 
 #include <string.h>
+#include <dlog.h>
 #include "scim.h"
 
+#define LOG_TAG "immodule"
+
 #define IMCONTROLDBG(str...)
-#define IMCONTROLERR(str...) printf(str)
+#define IMCONTROLERR(str...) LOGW(str)
 
 namespace scim
 {

diff --git a/packaging/isf.spec b/packaging/isf.spec
index d7e978e..5903dbf 100755 (executable)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -3,7 +3,7 @@
 
 Name:       isf
 Summary:    Input Service Framework
-Version:    2.3.6114
+Version:    2.3.6115
 Release:    1
 Group:      System Environment/Libraries
 License:    LGPL
@@ -22,6 +22,7 @@ BuildRequires:  pkgconfig(ecore)
 BuildRequires:  pkgconfig(edje)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(syspopup-caller)
+BuildRequires:  pkgconfig(dlog)
 Requires(post): /sbin/ldconfig /usr/bin/vconftool
 Requires(postun): /sbin/ldconfig
 requires:       e17, net-config

diff --git a/releasenote.txt b/releasenote.txt
index af6cfe2..eb3b61b 100644 (file)
--- a/releasenote.txt
+++ b/releasenote.txt
@@ -1,3 +1,8 @@
+ISF 2.3.6115 :
+ 1. change boilerplate
+ 2. [immodule] use dlog for printing error
+
+
 ISF 2.3.6114 :
  1. [immodule] Add interface to get imdata from isf_imf_context
  2. [demo] Add changed and preedit,changed event