1 files changed, 9 insertions, 42 deletions
diff --git a/misc/ibus/doinst.sh b/misc/ibus/doinst.sh
index a6065acead..6450401b66 100644
--- a/misc/ibus/doinst.sh
+++ b/misc/ibus/doinst.sh
@@ -1,42 +1,15 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-preserve_perms etc/profile.d/ibus.sh.new
-preserve_perms etc/profile.d/ibus.csh.new
-
-schema_install() {
-  GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
-  chroot . gconftool-2 --makefile-install-rule "$1" 1>/dev/null
-}
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
 
-SCHEMA_FILE="etc/gconf/schemas/ibus.schemas"
-if [ -r "$SCHEMA_FILE" ]; then
-  schema_install "$SCHEMA_FILE"
+if [ -x usr/bin/update-gtk-immodules ]; then
+  chroot . /usr/bin/update-gtk-immodules --verbose 1>/dev/null
 fi
 
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
 fi
 
 if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
@@ -45,9 +18,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   fi
 fi
 
-# Run gtk-query-immodules so that "ibus" will appear under Input Method
-# when you right- click your mouse in a text box.
-if [ -x usr/bin/update-gtk-immodules ]; then
-  chroot . /usr/bin/update-gtk-immodules --verbose 1>/dev/null
-fi
-