Hello community, here is the log from the commit of package ibus-hangul for openSUSE:Factory checked in at 2013-01-29 13:33:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-hangul (Old) and /work/SRC/openSUSE:Factory/.ibus-hangul.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-hangul", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-hangul/ibus-hangul.changes 2012-10-03 07:46:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ibus-hangul.new/ibus-hangul.changes 2013-01-29 13:33:59.000000000 +0100 @@ -1,0 +2,8 @@ +Sat Jan 26 23:26:17 CST 2013 - [email protected] + +- update to 1.4.2 + * Use Gobject Introspection + * GNOME Control Center integration + * Miscellaneous bug fixes + +------------------------------------------------------------------- Old: ---- ibus-hangul-1.4.1.tar.gz New: ---- ibus-hangul-1.4.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-hangul.spec ++++++ --- /var/tmp/diff_new_pack.d3Colg/_old 2013-01-29 13:34:00.000000000 +0100 +++ /var/tmp/diff_new_pack.d3Colg/_new 2013-01-29 13:34:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ibus-hangul # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,14 +25,14 @@ BuildRequires: pkgconfig BuildRequires: python BuildRequires: update-desktop-files -Version: 1.4.1 +Version: 1.4.2 Release: 0 Summary: The Hangul engine for IBus input platform License: GPL-2.0+ Group: System/I18n/Korean Provides: locale(ibus:ko) Url: http://code.google.com/p/ibus/ -Source: %{name}-%{version}.tar.gz +Source: https://ibus.googlecode.com/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ ibus-hangul-1.4.1.tar.gz -> ibus-hangul-1.4.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.4.1/ChangeLog new/ibus-hangul-1.4.2/ChangeLog --- old/ibus-hangul-1.4.1/ChangeLog 2012-04-15 17:00:41.000000000 +0200 +++ new/ibus-hangul-1.4.2/ChangeLog 2013-01-26 09:20:01.000000000 +0100 @@ -1,3 +1,76 @@ +commit cc82ea1221847499e62b4b6b7a0bffc30b2e9ecb +Author: Choe Hwanjin <[email protected]> +Date: 2013-01-13 01:33:22 +0900 + + Don't use ENV variable in Makefile (NetBSD problem) + + NetBSD uses ENV variable for shell option. + So our makefile should not override ENV variable. + We use ENV_PROG instead + + Issue: http://code.google.com/p/ibus/issues/detail?id=1029 + +M configure.ac +M setup/Makefile.am + +commit afa0ce2953e8d64ae88f956f3657e6faf1e3c44d +Author: Choe Hwanjin <[email protected]> +Date: 2012-11-02 00:21:52 +0900 + + Make applying the “Automatic reordering” setup option work + + Patch from Mike FABIAN + + ISSUE: https://github.com/choehwanjin/ibus-hangul/pull/13 + +M setup/main.py + +commit 039a7cf6808c8a473a145dd12643d87e8ebd40d4 +Merge: f1b2a97 010540d +Author: Choe Hwanjin <[email protected]> +Date: 2012-11-01 23:54:46 +0900 + + Merge branch 'setup-gi' of git://github.com/ueno/ibus-hangul + + Use GObject Introspection + + ISSUE: http://code.google.com/p/ibus/issues/detail?id=1540 + + Conflicts: + setup/keycapturedialog.py + setup/main.py + + Fix indentation(remove all tab chars, use spaces for indent) + +commit f1b2a97b428d8432604ec782505516b9ea1fe565 +Author: Choe Hwanjin <[email protected]> +Date: 2012-10-22 01:39:51 +0900 + + Rename this engine to "Hangul" + + "Hangul" means this engine is using libhangul. + +M src/hangul.xml.in.in + +commit 4022bff2bfec3519fe07034ca8277dfaea3b2021 +Author: Xiaojun Ma <[email protected]> +Date: 2012-10-12 08:40:08 -0500 + + fix google #1495 + +M setup/ibus-setup-hangul.desktop.in + +commit aa2889445e4ce85cffa7bbca7369cda1f4cf18db +Author: Choe Hwanjin <[email protected]> +Date: 2012-05-01 22:27:39 +0900 + + Fix indentation + + ISSUE: https://github.com/choehwanjin/ibus-hangul/issues/8 + +M setup/keycapturedialog.py +M setup/main.py + commit 13aba2e479e9f85543604c19129c2955d23c449e Author: Choe Hwanjin <[email protected]> Date: 2012-04-16 00:00:25 +0900 @@ -35,6 +108,15 @@ M icons/Makefile.am M setup/Makefile.am +commit 010540d2a05fee1f8f4971db5ffa5885981aba29 +Author: Daiki Ueno <[email protected]> +Date: 2012-01-25 11:46:33 +0900 + + ibus-setup-hangul: use gobject-introspection instead ibus python library. + +M setup/keycapturedialog.py +M setup/main.py + commit 86a2b75ac2c0f999bf987b99d4b4920342a2cbd1 Author: Choe Hwanjin <[email protected]> Date: 2012-02-18 21:39:48 +0900 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.4.1/Makefile.in new/ibus-hangul-1.4.2/Makefile.in --- old/ibus-hangul-1.4.1/Makefile.in 2012-04-08 15:32:07.000000000 +0200 +++ new/ibus-hangul-1.4.2/Makefile.in 2013-01-26 09:16:16.000000000 +0100 @@ -159,7 +159,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_PROG = @ENV_PROG@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.4.1/NEWS new/ibus-hangul-1.4.2/NEWS --- old/ibus-hangul-1.4.1/NEWS 2012-04-15 16:59:20.000000000 +0200 +++ new/ibus-hangul-1.4.2/NEWS 2013-01-15 16:37:22.000000000 +0100 @@ -1,3 +1,8 @@ +1.4.2 + * Use Gobject Introspection + * GNOME Control Center integration + * Miscellaneous bug fixes + 1.4.1 * Handle exceptions properly in ibus-setup-hangul https://github.com/choehwanjin/ibus-hangul/pull/5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.4.1/configure new/ibus-hangul-1.4.2/configure --- old/ibus-hangul-1.4.1/configure 2012-04-08 15:32:08.000000000 +0200 +++ new/ibus-hangul-1.4.2/configure 2013-01-26 09:16:17.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for ibus-hangul 1.4.1. +# Generated by GNU Autoconf 2.65 for ibus-hangul 1.4.2. # # Report bugs to <http://code.google.com/p/ibus/issues/entry>. # @@ -562,8 +562,8 @@ # Identity of this package. PACKAGE_NAME='ibus-hangul' PACKAGE_TARNAME='ibus-hangul' -PACKAGE_VERSION='1.4.1' -PACKAGE_STRING='ibus-hangul 1.4.1' +PACKAGE_VERSION='1.4.2' +PACKAGE_STRING='ibus-hangul 1.4.2' PACKAGE_BUGREPORT='http://code.google.com/p/ibus/issues/entry' PACKAGE_URL='' @@ -630,7 +630,7 @@ PYTHON_PREFIX PYTHON_VERSION PYTHON -ENV +ENV_PROG HANGUL_LIBS HANGUL_CFLAGS IBUS_LIBS @@ -1368,7 +1368,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ibus-hangul 1.4.1 to adapt to many kinds of systems. +\`configure' configures ibus-hangul 1.4.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1438,7 +1438,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ibus-hangul 1.4.1:";; + short | recursive ) echo "Configuration of ibus-hangul 1.4.2:";; esac cat <<\_ACEOF @@ -1561,7 +1561,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ibus-hangul configure 1.4.1 +ibus-hangul configure 1.4.2 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2053,7 +2053,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ibus-hangul $as_me 1.4.1, which was +It was created by ibus-hangul $as_me 1.4.2, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2862,7 +2862,7 @@ # Define the identity of the package. PACKAGE='ibus-hangul' - VERSION='1.4.1' + VERSION='1.4.2' cat >>confdefs.h <<_ACEOF @@ -4350,9 +4350,9 @@ # define PACKAGE_VERSION_* variables - PACKAGE_VERSION_MAJOR=$(echo 1.4.1 | cut -d'.' -f1) - PACKAGE_VERSION_MINOR=$(echo 1.4.1 | cut -d'.' -f2) - PACKAGE_VERSION_MICRO=$(echo 1.4.1 | cut -d'.' -f3) + PACKAGE_VERSION_MAJOR=$(echo 1.4.2 | cut -d'.' -f1) + PACKAGE_VERSION_MINOR=$(echo 1.4.2 | cut -d'.' -f2) + PACKAGE_VERSION_MICRO=$(echo 1.4.2 | cut -d'.' -f3) @@ -4362,7 +4362,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 $as_echo_n "checking nano version... " >&6; } - NANO=$(echo 1.4.1 | cut -d'.' -f4) + NANO=$(echo 1.4.2 | cut -d'.' -f4) if test x"$NANO" = x || test "x$NANO" = "x0" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5 @@ -17072,12 +17072,12 @@ set dummy env; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ENV+set}" = set; then : +if test "${ac_cv_path_ENV_PROG+set}" = set; then : $as_echo_n "(cached) " >&6 else - case $ENV in + case $ENV_PROG in [\\/]* | ?:[\\/]*) - ac_cv_path_ENV="$ENV" # Let the user override the test with a path. + ac_cv_path_ENV_PROG="$ENV_PROG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -17087,7 +17087,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ENV="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_ENV_PROG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -17098,10 +17098,10 @@ ;; esac fi -ENV=$ac_cv_path_ENV -if test -n "$ENV"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENV" >&5 -$as_echo "$ENV" >&6; } +ENV_PROG=$ac_cv_path_ENV_PROG +if test -n "$ENV_PROG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENV_PROG" >&5 +$as_echo "$ENV_PROG" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -19780,7 +19780,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ibus-hangul $as_me 1.4.1, which was +This file was extended by ibus-hangul $as_me 1.4.2, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19846,7 +19846,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ibus-hangul config.status 1.4.1 +ibus-hangul config.status 1.4.2 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.4.1/configure.ac new/ibus-hangul-1.4.2/configure.ac --- old/ibus-hangul-1.4.1/configure.ac 2012-04-08 15:31:48.000000000 +0200 +++ new/ibus-hangul-1.4.2/configure.ac 2013-01-26 09:14:52.000000000 +0100 @@ -22,7 +22,7 @@ m4_define([ibus_released], [1]) m4_define([ibus_major_version], [1]) m4_define([ibus_minor_version], [4]) -m4_define([ibus_micro_version], [1]) +m4_define([ibus_micro_version], [2]) m4_define(ibus_maybe_datestamp, m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) @@ -63,8 +63,8 @@ ]) # check env -AC_PATH_PROG(ENV, env) -AC_SUBST(ENV) +AC_PATH_PROG(ENV_PROG, env) +AC_SUBST(ENV_PROG) #check python AM_PATH_PYTHON([2.5]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.4.1/data/Makefile.in new/ibus-hangul-1.4.2/data/Makefile.in --- old/ibus-hangul-1.4.1/data/Makefile.in 2012-04-08 15:32:06.000000000 +0200 +++ new/ibus-hangul-1.4.2/data/Makefile.in 2013-01-26 09:16:15.000000000 +0100 @@ -127,7 +127,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_PROG = @ENV_PROG@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.4.1/icons/Makefile.in new/ibus-hangul-1.4.2/icons/Makefile.in --- old/ibus-hangul-1.4.1/icons/Makefile.in 2012-04-08 15:38:10.000000000 +0200 +++ new/ibus-hangul-1.4.2/icons/Makefile.in 2013-01-26 09:16:15.000000000 +0100 @@ -130,7 +130,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_PROG = @ENV_PROG@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.4.1/m4/Makefile.in new/ibus-hangul-1.4.2/m4/Makefile.in --- old/ibus-hangul-1.4.1/m4/Makefile.in 2012-04-08 15:32:07.000000000 +0200 +++ new/ibus-hangul-1.4.2/m4/Makefile.in 2013-01-26 09:16:15.000000000 +0100 @@ -102,7 +102,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_PROG = @ENV_PROG@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.4.1/setup/Makefile.am new/ibus-hangul-1.4.2/setup/Makefile.am --- old/ibus-hangul-1.4.1/setup/Makefile.am 2012-04-08 15:35:15.000000000 +0200 +++ new/ibus-hangul-1.4.2/setup/Makefile.am 2013-01-12 17:31:06.000000000 +0100 @@ -65,7 +65,7 @@ $(NULL) test: - $(ENV) DBUS_DEBUG=true \ + $(ENV_PROG) DBUS_DEBUG=true \ PYTHONPATH=$(abs_top_srcdir):$(pyexecdir) \ $(PYTHON) $(srcdir)/main.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.4.1/setup/Makefile.in new/ibus-hangul-1.4.2/setup/Makefile.in --- old/ibus-hangul-1.4.1/setup/Makefile.in 2012-04-08 15:35:20.000000000 +0200 +++ new/ibus-hangul-1.4.2/setup/Makefile.in 2013-01-26 09:16:15.000000000 +0100 @@ -161,7 +161,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_PROG = @ENV_PROG@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ @@ -854,7 +854,7 @@ @INTLTOOL_DESKTOP_RULE@ test: - $(ENV) DBUS_DEBUG=true \ + $(ENV_PROG) DBUS_DEBUG=true \ PYTHONPATH=$(abs_top_srcdir):$(pyexecdir) \ $(PYTHON) $(srcdir)/main.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.4.1/setup/ibus-setup-hangul.desktop.in new/ibus-hangul-1.4.2/setup/ibus-setup-hangul.desktop.in --- old/ibus-hangul-1.4.1/setup/ibus-setup-hangul.desktop.in 2011-12-29 15:14:31.000000000 +0100 +++ new/ibus-hangul-1.4.2/setup/ibus-setup-hangul.desktop.in 2012-10-21 10:44:02.000000000 +0200 @@ -4,6 +4,7 @@ _Comment=Set IBus Hangul Preferences Exec=ibus-setup-hangul Icon=ibus-setup-hangul +NoDisplay=true Terminal=false Type=Application StartupNotify=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.4.1/setup/keycapturedialog.py new/ibus-hangul-1.4.2/setup/keycapturedialog.py --- old/ibus-hangul-1.4.1/setup/keycapturedialog.py 2012-01-30 14:25:24.000000000 +0100 +++ new/ibus-hangul-1.4.2/setup/keycapturedialog.py 2012-11-01 15:43:24.000000000 +0100 @@ -1,42 +1,42 @@ -import gtk -import gtk.gdk as gdk +from gi.repository import Gtk +from gi.repository import Gdk import gettext _ = lambda a : gettext.dgettext("ibus-hangul", a) class KeyCaptureDialog (): def __init__ (self, title, parent): - self.__key_str = '' - self.__dialog = gtk.MessageDialog(parent, - gtk.DIALOG_MODAL, - gtk.MESSAGE_INFO, - gtk.BUTTONS_OK_CANCEL, - "") - self.__dialog.set_markup(_("Press any key which you want to use as hanja key. " + self.__key_str = '' + self.__dialog = Gtk.MessageDialog(parent, + Gtk.DialogFlags.MODAL, + Gtk.MessageType.INFO, + Gtk.ButtonsType.OK_CANCEL, + "") + self.__dialog.set_markup(_("Press any key which you want to use as hanja key. " "The key you pressed is displayed below.\n" "If you want to use it, click \"Ok\" or click \"Cancel\"")) - self.__dialog.format_secondary_markup(" ") - self.__dialog.connect("key-press-event", self.on_keypress, None) + self.__dialog.format_secondary_markup(" ") + self.__dialog.connect("key-press-event", self.on_keypress, None) def destroy(self): - self.__dialog.destroy() + self.__dialog.destroy() def run(self): - return self.__dialog.run() + return self.__dialog.run() def get_key_string(self): - return self.__key_str + return self.__key_str def on_keypress(self, widget, event, data = None): - self.__key_str = "" - if event.state & gdk.CONTROL_MASK : - self.__key_str += "Control+" - if event.state & gdk.MOD1_MASK : - self.__key_str += "Alt+" - if event.state & gdk.SHIFT_MASK : - self.__key_str += "Shift+" - - self.__key_str += gdk.keyval_name(event.keyval) - - self.__dialog.format_secondary_markup('<span size="large" weight="bold">%s</span>' % self.__key_str) + self.__key_str = "" + if event.state & Gdk.ModifierType.CONTROL_MASK : + self.__key_str += "Control+" + if event.state & Gdk.ModifierType.MOD1_MASK : + self.__key_str += "Alt+" + if event.state & Gdk.ModifierType.SHIFT_MASK : + self.__key_str += "Shift+" + + self.__key_str += Gdk.keyval_name(event.keyval) + + self.__dialog.format_secondary_markup('<span size="large" weight="bold">%s</span>' % self.__key_str) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.4.1/setup/main.py new/ibus-hangul-1.4.2/setup/main.py --- old/ibus-hangul-1.4.1/setup/main.py 2012-04-15 16:46:37.000000000 +0200 +++ new/ibus-hangul-1.4.2/setup/main.py 2012-11-01 16:20:36.000000000 +0100 @@ -20,9 +20,9 @@ import sys import os -import gobject -import gtk -import ibus +from gi.repository import GLib +from gi.repository import Gtk +from gi.repository import IBus import locale import gettext import config @@ -35,157 +35,166 @@ def __init__ (self, bus): self.__bus = bus self.__config = self.__bus.get_config() - self.__config.connect("value-changed", self.on_value_changed, None) + self.__config.connect("value-changed", self.on_value_changed, None) - ui_file = os.path.join(os.path.dirname(__file__), "setup.ui") - self.__builder = gtk.Builder() - self.__builder.set_translation_domain(config.gettext_package) - self.__builder.add_from_file(ui_file) - - # Hangul tab - pipe = subprocess.Popen([config.setuplibdir + '/hangul_keyboard_list'], stdout = subprocess.PIPE) - list = pipe.communicate()[0].split('\n') - - self.__hangul_keyboard = self.__builder.get_object("HangulKeyboard") - model = gtk.ListStore(str, str, int) - i = 0 - for line in list: - items = line.split('\t') - if len(items) > 1: - model.append([items[1], items[0], i]) - i+=1 - - self.__hangul_keyboard.set_model(model) - renderer = gtk.CellRendererText() - self.__hangul_keyboard.pack_start(renderer) - self.__hangul_keyboard.add_attribute(renderer, "text", 0) - - current = self.__read("HangulKeyboard", "2") - for i in model: - if i[1] == current: - self.__hangul_keyboard.set_active(i[2]) - break + ui_file = os.path.join(os.path.dirname(__file__), "setup.ui") + self.__builder = Gtk.Builder() + self.__builder.set_translation_domain(config.gettext_package) + self.__builder.add_from_file(ui_file) + + # Hangul tab + pipe = subprocess.Popen([config.setuplibdir + '/hangul_keyboard_list'], stdout = subprocess.PIPE) + list = pipe.communicate()[0].split('\n') + + self.__hangul_keyboard = self.__builder.get_object("HangulKeyboard") + model = Gtk.ListStore(str, str, int) + i = 0 + for line in list: + items = line.split('\t') + if len(items) > 1: + model.append([items[1], items[0], i]) + i+=1 + + self.__hangul_keyboard.set_model(model) + renderer = Gtk.CellRendererText() + self.__hangul_keyboard.pack_start(renderer, True) + self.__hangul_keyboard.add_attribute(renderer, "text", 0) + + default = GLib.Variant.new_string("2") + current = self.__read("HangulKeyboard", default).get_string() + for i in model: + if i[1] == current: + self.__hangul_keyboard.set_active(i[2]) + break - self.__word_commit = self.__builder.get_object("WordCommit") + self.__word_commit = self.__builder.get_object("WordCommit") - word_commit = self.__read("WordCommit", False) + default = GLib.Variant.new_boolean(False) + word_commit = self.__read("WordCommit", default).get_boolean() self.__word_commit.set_active(word_commit) - self.__auto_reorder = self.__builder.get_object("AutoReorder") - auto_reorder = self.__read("AutoReorder", True) + self.__auto_reorder = self.__builder.get_object("AutoReorder") + default = GLib.Variant.new_boolean(True) + auto_reorder = self.__read("AutoReorder", default).get_boolean() self.__auto_reorder.set_active(auto_reorder) - # hanja tab - button = self.__builder.get_object("HanjaKeyListAddButton") - button.connect("clicked", self.on_hanja_key_add, None) - - button = self.__builder.get_object("HanjaKeyListRemoveButton") - button.connect("clicked", self.on_hanja_key_remove, None) - - model = gtk.ListStore(str) - - keylist_str = self.__read("HanjaKeys", "Hangul_Hanja,F9") - self.__hanja_key_list_str = keylist_str.split(',') - for i in self.__hanja_key_list_str: - model.append([i]) - - self.__hanja_key_list = self.__builder.get_object("HanjaKeyList") - self.__hanja_key_list.set_model(model) - column = gtk.TreeViewColumn() - column.set_title("key") - renderer = gtk.CellRendererText() - column.pack_start(renderer) - column.add_attribute(renderer, "text", 0) - self.__hanja_key_list.append_column(column) - - - # advanced tab - notebook = self.__builder.get_object("SetupNotebook") - notebook.remove_page(2) - - # setup dialog - self.__window = self.__builder.get_object("SetupDialog") - icon_file = os.path.join(config.pkgdatadir, "icons", "ibus-hangul.svg") - self.__window.set_icon_from_file(icon_file) - self.__window.connect("response", self.on_response, None) - self.__window.show() + # hanja tab + button = self.__builder.get_object("HanjaKeyListAddButton") + button.connect("clicked", self.on_hanja_key_add, None) + + button = self.__builder.get_object("HanjaKeyListRemoveButton") + button.connect("clicked", self.on_hanja_key_remove, None) + + model = Gtk.ListStore(str) + + default = GLib.Variant.new_string("Hangul_Hanja,F9") + keylist_str = self.__read("HanjaKeys", default).get_string() + self.__hanja_key_list_str = keylist_str.split(',') + for i in self.__hanja_key_list_str: + model.append([i]) + + self.__hanja_key_list = self.__builder.get_object("HanjaKeyList") + self.__hanja_key_list.set_model(model) + column = Gtk.TreeViewColumn() + column.set_title("key") + renderer = Gtk.CellRendererText() + column.pack_start(renderer, True) + column.add_attribute(renderer, "text", 0) + self.__hanja_key_list.append_column(column) + + # advanced tab + notebook = self.__builder.get_object("SetupNotebook") + notebook.remove_page(2) + + # setup dialog + self.__window = self.__builder.get_object("SetupDialog") + icon_file = os.path.join(config.pkgdatadir, "icons", "ibus-hangul.svg") + self.__window.set_icon_from_file(icon_file) + self.__window.connect("response", self.on_response, None) + self.__window.show() - ok_button = self.__builder.get_object("button_cancel") - ok_button.grab_focus() + ok_button = self.__builder.get_object("button_cancel") + ok_button.grab_focus() def run(self): - res = self.__window.run() - if (res == gtk.RESPONSE_OK): - self.on_ok() - self.__window.destroy() + res = self.__window.run() + if (res == Gtk.ResponseType.OK): + self.on_ok() + self.__window.destroy() def apply(self): - model = self.__hangul_keyboard.get_model() - i = self.__hangul_keyboard.get_active() - self.__write("HangulKeyboard", model[i][1]) + model = self.__hangul_keyboard.get_model() + i = self.__hangul_keyboard.get_active() + self.__write("HangulKeyboard", GLib.Variant.new_string(model[i][1])) word_commit = self.__word_commit.get_active() - self.__write("WordCommit", word_commit) + self.__write("WordCommit", GLib.Variant.new_boolean(word_commit)) - model = self.__hanja_key_list.get_model() - str = "" - iter = model.get_iter_first() - while iter: - if len(str) > 0: - str += "," - str += model.get_value(iter, 0) - else: - str += model.get_value(iter, 0) - iter = model.iter_next(iter) - self.__write("HanjaKeys", str) + auto_reorder = self.__auto_reorder.get_active() + self.__write("AutoReorder", GLib.Variant.new_boolean(auto_reorder)) + + model = self.__hanja_key_list.get_model() + str = "" + iter = model.get_iter_first() + while iter: + if len(str) > 0: + str += "," + str += model.get_value(iter, 0) + else: + str += model.get_value(iter, 0) + iter = model.iter_next(iter) + self.__write("HanjaKeys", GLib.Variant.new_string(str)) def on_response(self, widget, id, data = None): - if id == gtk.RESPONSE_APPLY: - self.apply() - widget.emit_stop_by_name("response") - if id == gtk.RESPONSE_NONE: - widget.emit_stop_by_name("response") + if id == Gtk.ResponseType.APPLY: + self.apply() + widget.emit_stop_by_name("response") + if id == Gtk.ResponseType.NONE: + widget.emit_stop_by_name("response") def on_ok(self): - self.apply() + self.apply() def on_hanja_key_add(self, widget, data = None): - dialog = KeyCaptureDialog(_("Select Hanja key"), self.__window) - res = dialog.run() - if res == gtk.RESPONSE_OK: - key_str = dialog.get_key_string() - if len(key_str) > 0: - model = self.__hanja_key_list.get_model() - iter = model.get_iter_first() - while iter: - str = model.get_value(iter, 0) - if str == key_str: - model.remove(iter) - break - iter = model.iter_next(iter) + dialog = KeyCaptureDialog(_("Select Hanja key"), self.__window) + res = dialog.run() + if res == Gtk.ResponseType.OK: + key_str = dialog.get_key_string() + if len(key_str) > 0: + model = self.__hanja_key_list.get_model() + iter = model.get_iter_first() + while iter: + str = model.get_value(iter, 0) + if str == key_str: + model.remove(iter) + break + iter = model.iter_next(iter) - model.append([key_str]) - dialog.destroy() + model.append([key_str]) + dialog.destroy() def on_hanja_key_remove(self, widget, data = None): - selection = self.__hanja_key_list.get_selection() - (model, iter) = selection.get_selected() - if model and iter: - model.remove(iter) + selection = self.__hanja_key_list.get_selection() + (model, iter) = selection.get_selected() + if model and iter: + model.remove(iter) def on_value_changed(self, config, section, name, value, data): - if section == "engine/Hangul": - if name == "HangulKeyboard": - model = self.__hangul_keyboard.get_model() - for i in model: - if i[1] == value: - self.__hangul_keyboard.set_active(i[2]) - break - elif name == "HanjaKeys": - self.__hanja_key_list_str = value.split(',') + if section == "engine/Hangul": + if name == "HangulKeyboard": + model = self.__hangul_keyboard.get_model() + for i in model: + if i[1] == value: + self.__hangul_keyboard.set_active(i[2]) + break + elif name == "HanjaKeys": + self.__hanja_key_list_str = value.split(',') def __read(self, name, v): - return self.__config.get_value("engine/Hangul", name, v) + value = self.__config.get_value("engine/Hangul", name) + if value is None: + return v + return value def __write(self, name, v): return self.__config.set_value("engine/Hangul", name, v) @@ -194,14 +203,13 @@ locale.bindtextdomain(config.gettext_package, config.localedir) locale.bind_textdomain_codeset(config.gettext_package, "UTF-8") - try: - bus = ibus.Bus() - except: + bus = IBus.Bus() + if bus.is_connected(): + Setup(bus).run() + else: message = _("IBus daemon is not running.\nHangul engine settings cannot be saved.") - dialog = gtk.MessageDialog(type = gtk.MESSAGE_ERROR, - buttons = gtk.BUTTONS_CLOSE, + dialog = Gtk.MessageDialog(type = Gtk.MessageType.ERROR, + buttons = Gtk.ButtonsType.CLOSE, message_format = message) dialog.run() sys.exit(1) - - Setup(bus).run() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.4.1/src/Makefile.in new/ibus-hangul-1.4.2/src/Makefile.in --- old/ibus-hangul-1.4.1/src/Makefile.in 2012-04-08 15:32:07.000000000 +0200 +++ new/ibus-hangul-1.4.2/src/Makefile.in 2013-01-26 09:16:16.000000000 +0100 @@ -160,7 +160,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -ENV = @ENV@ +ENV_PROG = @ENV_PROG@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-hangul-1.4.1/src/hangul.xml.in.in new/ibus-hangul-1.4.2/src/hangul.xml.in.in --- old/ibus-hangul-1.4.1/src/hangul.xml.in.in 2012-02-18 05:51:03.000000000 +0100 +++ new/ibus-hangul-1.4.2/src/hangul.xml.in.in 2012-10-21 11:08:46.000000000 +0200 @@ -18,7 +18,7 @@ <author>Peng Huang <[email protected]></author> <icon>ibus-hangul</icon> <layout>us</layout> - <longname>Korean</longname> + <longname>Hangul</longname> <description>Korean Input Method</description> <rank>99</rank> <symbol>한</symbol> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
