saving uncommitted changes in /etc prior to emerge run

diff --git a/X11/xinit/xinput.d/ibus.conf b/X11/xinit/xinput.d/ibus.conf
index 052ad30fcc1eddcceb1d468ddcffa521a2c4f09e..458145392f8af22e56ec52c6ae43559a563714d9 100644 (file)
--- a/X11/xinit/xinput.d/ibus.conf
+++ b/X11/xinit/xinput.d/ibus.conf
@@ -3,13 +3,16 @@ exec_prefix=${prefix}
 
 XIM=ibus
 XIM_PROGRAM="${exec_prefix}/bin/ibus-daemon"
-ICON=ibus
+ICON="ibus"
 XIM_ARGS="--xim"
 PREFERENCE_PROGRAM="${exec_prefix}/bin/ibus-setup"
 SHORT_DESC="IBus"
 GTK_IM_MODULE=ibus
+NOT_RUN=gnome3
 
-if test -f /usr/lib64/qt4/plugins/inputmethods/libqtim-ibus.so || \
+if test -f /usr/lib64/qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so || \
+   test -f /usr/lib/qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so || \
+   test -f /usr/lib64/qt4/plugins/inputmethods/libqtim-ibus.so || \
    test -f /usr/lib/qt4/plugins/inputmethods/libqtim-ibus.so;
 then
     QT_IM_MODULE=ibus

diff --git a/dconf/db/ibus.d/00-upstream-settings b/dconf/db/ibus.d/00-upstream-settings
index 30a8030e0d07c9a0b385eed468dea0de0b88bbfe..1d02c82df99d78190ba4316dfccb333b5a7ba910 100644 (file)
--- a/dconf/db/ibus.d/00-upstream-settings
+++ b/dconf/db/ibus.d/00-upstream-settings
@@ -31,6 +31,7 @@ triggers=['<Super>space']
 
 [desktop/ibus/panel]
 x=-1
+property-icon-delay-time=500
 y=-1
 lookup-table-orientation=1
 show=0

diff --git a/gconf/schemas/ibus.schemas b/gconf/schemas/ibus.schemas
index 719e7da67ad6b1e625a31a691f6e41870255861a..3ccc767fb558a6fd367183f29ccae8855f14df3e 100644 (file)
--- a/gconf/schemas/ibus.schemas
+++ b/gconf/schemas/ibus.schemas
@@ -568,6 +568,22 @@
                   of the alpha.</long>
       </locale>
     </schema>
+    <schema>
+      <key>/schemas/desktop/ibus/panel/property-icon-delay-time</key>
+      <applyto>/desktop/ibus/panel/property-icon-delay-time</applyto>
+      <owner>ibus</owner>
+      <type>int</type>
+      <default>500</default>
+      <locale name="C">
+        <short>The milliseconds to show the panel icon for a property</short>
+          <long>The milliseconds to show the panel icon from the
+                engine icon to a property icon whenever engines are
+                switched if the property is specified by the value of
+                icon-prop-key in IBusEngineDesc.
+                If the value is 0, no delay time and the property icon
+                is shown immediately.</long>
+      </locale>
+    </schema>
     <schema>
       <key>/schemas/desktop/ibus/general/use_system_keyboard_layout</key>
       <applyto>/desktop/ibus/general/use_system_keyboard_layout</applyto>