[maemo-commits] [maemo-commits] r15615 - in projects/haf/trunk/hildon-input-method: . debian src

[From: subversion at stage.maemo.org]

Author: manwari
Date: 2008-05-30 15:17:31 +0300 (Fri, 30 May 2008)
New Revision: 15615

Modified:
   projects/haf/trunk/hildon-input-method/ChangeLog
   projects/haf/trunk/hildon-input-method/configure.ac
   projects/haf/trunk/hildon-input-method/debian/changelog
   projects/haf/trunk/hildon-input-method/hildon-input-method-ui3.schemas
   projects/haf/trunk/hildon-input-method/src/hildon-im-ui.h
Log:
2008-05-30  Mohammad Anwari  <Mohammad.Anwari at nokia.com>

        * version 2.0.4
        * src/hildon-im-ui.h: Keep en_GB as the default if the gconf key is
        accidentally removed.
        * hildon-input-method-ui3.schemas: Removed default language from
        schema.




Modified: projects/haf/trunk/hildon-input-method/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-input-method/ChangeLog	2008-05-29 13:26:08 UTC (rev 15614)
+++ projects/haf/trunk/hildon-input-method/ChangeLog	2008-05-30 12:17:31 UTC (rev 15615)
@@ -1,3 +1,11 @@
+2008-05-30  Mohammad Anwari  <Mohammad.Anwari at nokia.com>
+
+	* version 2.0.4
+	* src/hildon-im-ui.h: Keep en_GB as the default if the gconf key is
+	accidentally removed.
+	* hildon-input-method-ui3.schemas: Removed default language from
+	schema.	
+
 2008-05-29  Richard Sun  <richard.sun at nokia.com>
 
 	* version 2.0.3

Modified: projects/haf/trunk/hildon-input-method/configure.ac
===================================================================
--- projects/haf/trunk/hildon-input-method/configure.ac	2008-05-29 13:26:08 UTC (rev 15614)
+++ projects/haf/trunk/hildon-input-method/configure.ac	2008-05-30 12:17:31 UTC (rev 15615)
@@ -8,7 +8,7 @@
 #
 
 AC_INIT(Makefile.am)
-VERSION=2.0.3
+VERSION=2.0.4
 LIBVERSION=3
 MAJORVERSION=`echo $VERSION|cut -d . -f1`
 AC_SUBST(VERSION)

Modified: projects/haf/trunk/hildon-input-method/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-input-method/debian/changelog	2008-05-29 13:26:08 UTC (rev 15614)
+++ projects/haf/trunk/hildon-input-method/debian/changelog	2008-05-30 12:17:31 UTC (rev 15615)
@@ -1,3 +1,9 @@
+hildon-input-method (1:2.0.4-1) unstable; urgency=low
+
+  * Fixes: NB#85987 
+
+ -- Mohammad Anwari <mdamt at maemo.org>  Fri, 30 May 2008 15:11:40 +0300
+
 hildon-input-method (1:2.0.3-1) unstable; urgency=low
 
   * New release

Modified: projects/haf/trunk/hildon-input-method/hildon-input-method-ui3.schemas
===================================================================
--- projects/haf/trunk/hildon-input-method/hildon-input-method-ui3.schemas	2008-05-29 13:26:08 UTC (rev 15614)
+++ projects/haf/trunk/hildon-input-method/hildon-input-method-ui3.schemas	2008-05-30 12:17:31 UTC (rev 15615)
@@ -1,18 +1,6 @@
 <gconfschemafile>
   <schemalist>
     <schema>
-      <key>/schemas/apps/osso/inputmethod/hildon-im-languages/language-0</key>
-      <applyto>/apps/osso/inputmethod/hildon-im-languages/language-0</applyto>
-      <owner>hildon-input-method</owner>
-      <type>string</type>
-      <default>en_US</default>
-      <locale name="C">
-        <short>First Language</short>
-        <long>The language the user will mostly likely to use to input.</long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/osso/inputmethod/hildon-im-languages/language-1</key>
       <applyto>/apps/osso/inputmethod/hildon-im-languages/language-1</applyto>
       <owner>hildon-input-method</owner>

Modified: projects/haf/trunk/hildon-input-method/src/hildon-im-ui.h
===================================================================
--- projects/haf/trunk/hildon-input-method/src/hildon-im-ui.h	2008-05-29 13:26:08 UTC (rev 15614)
+++ projects/haf/trunk/hildon-input-method/src/hildon-im-ui.h	2008-05-30 12:17:31 UTC (rev 15615)
@@ -75,7 +75,7 @@
 #define HILDON_IM_GCONF_THUMB_DETECTION            HILDON_IM_GCONF_DIR       "/thumb_detection"
 
 
-#define HILDON_IM_DEFAULT_LANGUAGE IM_en_US
+#define HILDON_IM_DEFAULT_LANGUAGE IM_en_GB
 #define OSSO_DIR ".osso"
 #define IM_HOME_DIR "hildon-input-method"
 #define HILDON_IM_PROP_UI 1