summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeng Wu <alexepico@gmail.com>2014-09-23 10:51:15 +0800
committerPeng Wu <alexepico@gmail.com>2014-09-23 10:51:15 +0800
commitbbc6022fe75cd5c1fc15fb2c297acdbf194bf918 (patch)
tree5d6b764b9ac74966347e5eecbead37e9c40a2c53
parentc1054a5731b2d7f0c9d19a5fe6c55bebfb986abc (diff)
downloadibus-libzhuyin-bbc6022fe75cd5c1fc15fb2c297acdbf194bf918.tar.gz
ibus-libzhuyin-bbc6022fe75cd5c1fc15fb2c297acdbf194bf918.tar.xz
ibus-libzhuyin-bbc6022fe75cd5c1fc15fb2c297acdbf194bf918.zip
fixes typo
-rw-r--r--src/ZYString.h3
-rw-r--r--src/ZYZPhoneticEditor.cc3
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ZYString.h b/src/ZYString.h
index 3e5cd9d..ebb8438 100644
--- a/src/ZYString.h
+++ b/src/ZYString.h
@@ -33,7 +33,8 @@ public:
String () : std::string () { }
String (const gchar *str) : std::string (str) { }
String (const std::string &str) : std::string (str) { }
- String (gint len) : std::string () { assert (FALSE); }
+ /* TODO: remove the following line later. */
+ G_DEPRECATED String (gint len) : std::string () { reserve (len); }
String (const gchar ch) : std::string (1, ch) { }
String & printf (const gchar *fmt, ...)
diff --git a/src/ZYZPhoneticEditor.cc b/src/ZYZPhoneticEditor.cc
index 9e67981..1788f1a 100644
--- a/src/ZYZPhoneticEditor.cc
+++ b/src/ZYZPhoneticEditor.cc
@@ -293,6 +293,9 @@ gboolean
PhoneticEditor::processEasySymbolKey (guint keyval, guint keycode,
guint modifiers)
{
+ if (!m_config.easySymbol ())
+ return FALSE;
+
if (! ('A' <= keyval && keyval <= 'Z'))
return FALSE;