Branch: refs/heads/master
  Home:   https://github.com/ibus/ibus
  Commit: 99e4d9d7af0bdeaf396bbd26cac949eca7cdfe1d
      
https://github.com/ibus/ibus/commit/99e4d9d7af0bdeaf396bbd26cac949eca7cdfe1d
  Author: Peng Huang <[email protected]>
  Date:   2012-02-26 (Sun, 26 Feb 2012)

  Changed paths:
    M Makefile.am
  M autogen.sh
  M bus/Makefile.am
  M bus/component.c
  M bus/connection.c
  M bus/dbusimpl.c
  M bus/engineproxy.c
  M bus/factoryproxy.c
  A bus/global.c
  A bus/global.h
  M bus/ibusimpl.c
  M bus/ibusimpl.h
  M bus/inputcontext.c
  M bus/inputcontext.h
  M bus/main.c
  M bus/matchrule.c
  M bus/matchrule.h
  R bus/option.h
  M bus/panelproxy.c
  M bus/registry.c
  M bus/server.c
  M bus/test-client.c
  M bus/test-matchrule.c
  M bus/test-stress.c
  M client/gtk2/ibusimcontext.c
  A conf/Makefile.am
  A conf/dconf/Makefile.am
  A conf/dconf/config.c
  A conf/dconf/config.h
  A conf/dconf/dconf.xml.in.in
  A conf/dconf/main.c
  A conf/gconf/Makefile.am
  A conf/gconf/config.c
  A conf/gconf/config.h
  A conf/gconf/gconf.xml.in.in
  A conf/gconf/main.c
  A conf/memconf/Makefile.am
  A conf/memconf/config.c
  A conf/memconf/config.h
  A conf/memconf/main.c
  A conf/memconf/memconf.xml.in.in
  M configure.ac
  R dconf/Makefile.am
  R dconf/config.c
  R dconf/config.h
  R dconf/dconf.xml.in.in
  R dconf/main.c
  A engine/Makefile.am
  A engine/gensimple.py
  A engine/main.vala
  A engine/simple.xml.in.in
  R gconf/Makefile.am
  R gconf/config.c
  R gconf/config.h
  R gconf/gconf.xml.in.in
  R gconf/main.c
  M ibus.spec.in
  M ibus/__init__.py
  M ibus/bus.py
  M ibus/inputcontext.py
  M ibus/interface/iibus.py
  M ibus/interface/iinputcontext.py
  R memconf/Makefile.am
  R memconf/config.c
  R memconf/config.h
  R memconf/main.c
  R memconf/memconf.xml.in.in
  A setup/engineabout.py
  R setup/engineabout.py
  M setup/enginecombobox.py
  M setup/enginetreeview.py
  M setup/i18n.py
  M setup/icon.py
  M setup/keyboardshortcut.py
  M setup/main.py
  M setup/setup.ui
  M src/Makefile.am
  A src/gtkimcontextsimpleseqs.h
  M src/ibus.h
  M src/ibusattrlist.c
  M src/ibusbus.c
  M src/ibusbus.h
  M src/ibuscomponent.c
  M src/ibusengine.c
  A src/ibusenginesimple.c
  A src/ibusenginesimple.h
  M src/ibusfactory.c
  M src/ibushotkey.c
  M src/ibusinputcontext.c
  M src/ibusinputcontext.h
  M src/ibuskeymap.c
  M src/ibuskeynames.c
  A src/ibuskeysyms-compat.h
  M src/ibuskeysyms-update.pl
  M src/ibuskeysyms.h
  M src/ibusproplist.c
  M src/ibusutil.c
  M src/ibusxml.c
  M src/tests/Makefile.am
  M src/tests/ibus-bus.c
  M src/tests/ibus-inputcontext.c
  M src/tests/ibus-keynames.c
  A src/tests/ibus-util.c
  A tools/Makefile.am
  A tools/ibus.bash
  A tools/main.vala
  M ui/Makefile.am
  R ui/gtk/Makefile.am
  R ui/gtk/candidatepanel.py
  R ui/gtk/engineabout.py
  R ui/gtk/gtkpanel.xml.in.in
  R ui/gtk/handle.py
  R ui/gtk/i18n.py
  R ui/gtk/ibus-ui-gtk.in
  R ui/gtk/icon.py
  R ui/gtk/languagebar.py
  R ui/gtk/main.py
  R ui/gtk/menu.py
  R ui/gtk/notifications.py
  R ui/gtk/panel.py
  R ui/gtk/propitem.py
  R ui/gtk/toolitem.py
  A ui/gtk2/Makefile.am
  A ui/gtk2/candidatepanel.py
  A ui/gtk2/engineabout.py
  A ui/gtk2/gtkpanel.xml.in.in
  A ui/gtk2/handle.py
  A ui/gtk2/i18n.py
  A ui/gtk2/ibus-ui-gtk.in
  A ui/gtk2/icon.py
  A ui/gtk2/languagebar.py
  A ui/gtk2/main.py
  A ui/gtk2/menu.py
  A ui/gtk2/notifications.py
  A ui/gtk2/panel.py
  A ui/gtk2/propitem.py
  A ui/gtk2/toolitem.py
  A ui/gtk3/Makefile.am
  A ui/gtk3/application.vala
  A ui/gtk3/candidatearea.vala
  A ui/gtk3/candidatepanel.vala
  A ui/gtk3/grabkeycode.c
  A ui/gtk3/gtkpanel.xml.in.in
  A ui/gtk3/handle.vala
  A ui/gtk3/iconwidget.vala
  A ui/gtk3/keybindingmanager.vala
  A ui/gtk3/panel.vala
  A ui/gtk3/pango.vala
  A ui/gtk3/property.vala
  A ui/gtk3/separator.vala
  A ui/gtk3/switcher.vala
  A xinput-ibus
  R xinput-ibus.in

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/devel'

TEST=Linux Desktop

Review URL: https://codereview.appspot.com/5517048



-- 
You received this message because you are subscribed to the Google
Groups "ibus-devel" group.
iBus project web page: http://code.google.com/p/ibus/
iBus dev group: http://groups.google.com/group/ibus-devel?hl=en

回复