summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfujiwarat <takao.fujiwara1@gmail.com>2012-10-06 10:06:54 +0900
committerfujiwarat <takao.fujiwara1@gmail.com>2012-10-06 21:58:37 +0900
commit422ae1e1239cce300430c4f84da98fb9e03ab5d0 (patch)
treea24abbbb8b188395d2997f5bb9713a9ddac930d4
parente685f0182f205e3daf75d55a7e53cebdb173bc61 (diff)
downloadibus-anthy-422ae1e1239cce300430c4f84da98fb9e03ab5d0.tar.gz
Disabled noinst data.1.4.99.20121006
-rw-r--r--icons/Makefile.am11
-rw-r--r--setup/anthyprefs.py.in6
-rw-r--r--setup/setup.ui4
3 files changed, 12 insertions, 9 deletions
diff --git a/icons/Makefile.am b/icons/Makefile.am
index fe97bde..dd8a090 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -20,16 +20,18 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+if HAVE_PRIVATE_PNG
pngicons_DATA = \
ibus-anthy.png \
$(NULL)
-
-if HAVE_PRIVATE_PNG
-pngiconsdir = $(pkgdatadir)/icons
else
-pngiconsdir = /tmp
+pngicons_files = \
+ ibus-anthy.png \
+ $(NULL)
endif
+pngiconsdir = $(pkgdatadir)/icons
+
scalable_icons_DATA = \
ibus-anthy.svg \
$(NULL)
@@ -39,5 +41,6 @@ scalable_iconsdir = $(datadir)/icons/hicolor/scalable/apps/
EXTRA_DIST = \
$(pngicons_DATA) \
+ $(pngicons_files) \
$(scalable_icons_DATA) \
$(NULL)
diff --git a/setup/anthyprefs.py.in b/setup/anthyprefs.py.in
index ba89330..bf6be07 100644
--- a/setup/anthyprefs.py.in
+++ b/setup/anthyprefs.py.in
@@ -245,9 +245,9 @@ _config = {
'keyboard_layouts': [
'default', 'jp', 'us',
# XKB options requires ibus 1.5.
- 'jp[ctrl:swapcaps]', 'us[ctrl:swapcaps]',
- 'jp[ctrl:swapcaps,compose:rctrl]',
- 'us[ctrl:swapcaps,compose:rctrl]',
+ #'jp[ctrl:swapcaps]', 'us[ctrl:swapcaps]',
+ #'jp[ctrl:swapcaps,compose:rctrl]',
+ #'us[ctrl:swapcaps,compose:rctrl]',
],
},
diff --git a/setup/setup.ui b/setup/setup.ui
index 670df85..5d5e8e1 100644
--- a/setup/setup.ui
+++ b/setup/setup.ui
@@ -1066,8 +1066,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">1</property>
- <property name="width_request">240</property>
- <property name="height_request">140</property>
+ <property name="width_request">120</property>
+ <property name="height_request">90</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>