Merge pull request #67 from sarim/develop

merge fixes from develop branch
sarim · Jun 18, 2014 · 92b2ba6 · 92b2ba6
2 parents 804114f + d276a03
commit 92b2ba6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/avropref.ui b/avropref.ui
@@ -3,7 +3,7 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="lutable_size">
     <property name="lower">5</property>
-    <property name="upper">16</property>
+    <property name="upper">15</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>

diff --git a/com.omicronlab.avro.gschema.xml b/com.omicronlab.avro.gschema.xml
@@ -17,7 +17,7 @@
       <description>Whether enter key should commit newline after applying candidate</description>
     </key>
     <key type="i" name="lutable-size">
-      <default>16</default>
+      <default>15</default>
       <summary>lutable-size</summary>
       <description>Dictionary suggestion lookup table size</description>
     </key>    

diff --git a/main-gjs.js b/main-gjs.js
@@ -36,7 +36,7 @@ const Gio = imports.gi.Gio;
 const prefwindow = imports.pref;
 
 //check if running from ibus
-exec_by_ibus = (ARGV[0] == '--ibus')
+var exec_by_ibus = (ARGV[0] == '--ibus')
 
 // Let's initialize ibus
 IBus.init();
@@ -194,7 +194,7 @@ if (bus.is_connected()) {
         });
 
         var proplist = new IBus.PropList();
-        var propp = new IBus.Property.new(
+        var propp = IBus.Property.new(
             'setup',
             IBus.PropType.NORMAL,
             IBus.Text.new_from_string("Preferences - Avro"),

diff --git a/utf8.js b/utf8.js
@@ -1,3 +1,3 @@
 function utf8Decode(str) {
-    return decodeURIComponent( escape( str ) );
+    return decodeURIComponent( unescape( str ) );
 }