[maemo-commits] [maemo-commits] r15607 - in projects/haf/trunk/osso-af-startup: . debian services

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-05-27 12:33:03 +0300 (Tue, 27 May 2008)
New Revision: 15607

Modified:
   projects/haf/trunk/osso-af-startup/configure.ac
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/services/af-defines.sh
Log:
  * Incomplete hack: When making /etc/osso-af-init/locale en_US, also set gconf key
  * Fixes: NB#85821


Modified: projects/haf/trunk/osso-af-startup/configure.ac
===================================================================
--- projects/haf/trunk/osso-af-startup/configure.ac	2008-05-27 09:13:33 UTC (rev 15606)
+++ projects/haf/trunk/osso-af-startup/configure.ac	2008-05-27 09:33:03 UTC (rev 15607)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(osso-af-startup, 1.56)
+AM_INIT_AUTOMAKE(osso-af-startup, 1.57)
 
 AC_OUTPUT(Makefile \
 	services/Makefile \

Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2008-05-27 09:13:33 UTC (rev 15606)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2008-05-27 09:33:03 UTC (rev 15607)
@@ -1,3 +1,10 @@
+osso-af-startup (1.57-1) unstable; urgency=low
+
+  * Incomplete hack: When making /etc/osso-af-init/locale en_US, also set gconf key
+  * Fixes: NB#85821
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Tue, 27 May 2008 12:28:01 +0300
+
 osso-af-startup (1.56-1) unstable; urgency=low
 
   * Add the mv -f command line to sudoers so as to avoid permission denials

Modified: projects/haf/trunk/osso-af-startup/services/af-defines.sh
===================================================================
--- projects/haf/trunk/osso-af-startup/services/af-defines.sh	2008-05-27 09:13:33 UTC (rev 15606)
+++ projects/haf/trunk/osso-af-startup/services/af-defines.sh	2008-05-27 09:33:03 UTC (rev 15607)
@@ -60,6 +60,11 @@
     cd $AF_INIT_DIR && $_SUDO mv -f /tmp/locale .
 
     source $AF_INIT_DIR/locale
+
+    # ... and inform input methods of the change
+    if test -x /usr/bin/gconftool-2; then
+      /usr/bin/gconftool-2 --set --type string /apps/osso/inputmethod/hildon-im-languages/language-0 'en_US'
+    fi
   fi
 fi