Hello community, here is the log from the commit of package ibus-qt for openSUSE:Factory checked in at 2013-07-08 11:53:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-qt (Old) and /work/SRC/openSUSE:Factory/.ibus-qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-qt" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-qt/ibus-qt.changes 2011-12-07 14:37:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ibus-qt.new/ibus-qt.changes 2013-07-08 11:53:24.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jul 8 09:54:17 CST 2013 - hillw...@linuxfans.org + +- update to 1.3.2 + * Enable dead_belowdot with de layout. + * Add codereview.settings. + +------------------------------------------------------------------- Old: ---- ibus-qt-1.3.1-Source.tar.gz New: ---- ibus-qt-1.3.2-Source.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-qt.spec ++++++ --- /var/tmp/diff_new_pack.c9ojYj/_old 2013-07-08 11:53:25.000000000 +0200 +++ /var/tmp/diff_new_pack.c9ojYj/_new 2013-07-08 11:53:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ibus-qt # -# Copyright (c) 2011 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 @@ -16,10 +16,9 @@ # - Name: ibus-qt -Version: 1.3.1 -Release: 1 +Version: 1.3.2 +Release: 0 Summary: Qt IBus library and Qt input method plugin License: GPL-2.0+ Group: System Environment/Libraries @@ -28,11 +27,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: cmake doxygen fdupes -BuildRequires: libqt4-devel +BuildRequires: cmake BuildRequires: dbus-1-devel >= 1.2 +BuildRequires: doxygen +BuildRequires: fdupes BuildRequires: ibus-devel >= 1.2 BuildRequires: libicu-devel >= 4.0 +BuildRequires: libqt4-devel Requires: ibus >= 1.2 Requires: libqt4 Supplements: packageand(ibus:libqt4) @@ -41,7 +42,6 @@ Qt IBus library and Qt input method plugin. %package devel -License: GPL-2.0+ Summary: Development tools for ibus qt Group: Development/Libraries/C and C++ Requires: %{name} = %{version}-%{release} ++++++ ibus-qt-1.3.1-Source.tar.gz -> ibus-qt-1.3.2-Source.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.1-Source/CMakeLists.txt new/ibus-qt-1.3.2-Source/CMakeLists.txt --- old/ibus-qt-1.3.1-Source/CMakeLists.txt 2010-08-19 09:05:40.000000000 +0200 +++ new/ibus-qt-1.3.2-Source/CMakeLists.txt 2013-03-11 07:54:25.000000000 +0100 @@ -11,7 +11,7 @@ set(MAINTAINER "Peng Huang <shawn.p.huang at gmail dot com>") set(VERSION_MAJOR "1") set(VERSION_MINOR "3") -set(VERSION_PATCH "1") +set(VERSION_PATCH "2") set(VERSION_SNAPDATE "") set(LIB_VERSION "1.3.0") set(LIB_SOVERSION "1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.1-Source/codereview.settings new/ibus-qt-1.3.2-Source/codereview.settings --- old/ibus-qt-1.3.1-Source/codereview.settings 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.2-Source/codereview.settings 2013-03-11 07:54:25.000000000 +0100 @@ -0,0 +1,2 @@ +# This file is used by "git cl" to get code review information. +CODE_REVIEW_SERVER: codereview.appspot.com diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.1-Source/qtim/ibus-input-context.cpp new/ibus-qt-1.3.2-Source/qtim/ibus-input-context.cpp --- old/ibus-qt-1.3.1-Source/qtim/ibus-input-context.cpp 2010-08-19 09:05:40.000000000 +0200 +++ new/ibus-qt-1.3.2-Source/qtim/ibus-input-context.cpp 2013-03-11 07:54:25.000000000 +0100 @@ -23,6 +23,7 @@ #include <QInputMethodEvent> #include <QTextCharFormat> #include <QApplication> +#include <QLineEdit> #include <qibus.h> #include "ibus-input-context.h" @@ -87,6 +88,7 @@ m_preedit_visible (false), m_preedit_cursor_pos (0), m_has_focus (false), + m_password_mode (false), m_caps (CapPreeditText | CapFocus), m_n_compose (0) { @@ -196,6 +198,16 @@ if (m_context.isNull ()) return; + m_password_mode = false; + + if (m_has_focus && widget->inherits ("QLineEdit")) { + QLineEdit::EchoMode mode = + qobject_cast<QLineEdit *>(widget)->echoMode(); + if (mode == QLineEdit::Password || mode == QLineEdit::NoEcho) { + m_password_mode = true; + } + } + if (m_has_focus) { m_context->focusIn (); } @@ -251,6 +263,10 @@ uint keycode = 0; uint state = 0; + if (m_password_mode) { + return false; + } + if (!m_has_focus) { m_has_focus = true; if (!m_context.isNull ()) @@ -722,11 +738,22 @@ void IBusInputContext::slotUpdatePreeditText (const TextPointer &text, uint cursor_pos, bool visible) { + // set visible to false, if text is empty + visible = visible && !text->text ().isEmpty (); + + // set cursor at end, if pos is greater than the text length + if (cursor_pos > (uint)text->text ().length ()) + cursor_pos = text->text ().length (); + + bool update = (m_preedit_visible != visible) || visible; + m_preedit = text; m_preedit_visible = visible; m_preedit_cursor_pos = cursor_pos; - displayPreeditText (m_preedit, m_preedit_cursor_pos, visible); + if (update) { + displayPreeditText (m_preedit, m_preedit_cursor_pos, visible); + } } void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.1-Source/qtim/ibus-input-context.h new/ibus-qt-1.3.2-Source/qtim/ibus-input-context.h --- old/ibus-qt-1.3.1-Source/qtim/ibus-input-context.h 2010-08-19 09:05:40.000000000 +0200 +++ new/ibus-qt-1.3.2-Source/qtim/ibus-input-context.h 2013-03-11 07:54:25.000000000 +0100 @@ -74,6 +74,7 @@ bool m_preedit_visible; uint m_preedit_cursor_pos; bool m_has_focus; + bool m_password_mode; uint m_caps; uint m_compose_buffer[IBUS_MAX_COMPOSE_LEN + 1]; int m_n_compose; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.1-Source/src/CMakeLists.txt new/ibus-qt-1.3.2-Source/src/CMakeLists.txt --- old/ibus-qt-1.3.1-Source/src/CMakeLists.txt 2010-08-19 09:05:40.000000000 +0200 +++ new/ibus-qt-1.3.2-Source/src/CMakeLists.txt 2013-03-11 07:54:25.000000000 +0100 @@ -92,12 +92,15 @@ target_link_libraries( ibus-qt debug ${QT_QTCORE_LIBRARY_DEBUG} + debug ${QT_QTGUI_LIBRARY_DEBUG} debug ${QT_QTDBUS_LIBRARY_DEBUG} debug ${QT_QTXML_LIBRARY_DEBUG} optimized ${QT_QTCORE_LIBRARY_RELEASE} + optimized ${QT_QTGUI_LIBRARY_RELEASE} optimized ${QT_QTDBUS_LIBRARY_RELEASE} optimized ${QT_QTXML_LIBRARY_RELEASE} ${DBUS_LIBRARIES} + ${X11_LIBRARIES} ) install(TARGETS ibus-qt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.1-Source/src/qibusbus.cpp new/ibus-qt-1.3.2-Source/src/qibusbus.cpp --- old/ibus-qt-1.3.1-Source/src/qibusbus.cpp 2010-08-19 09:05:40.000000000 +0200 +++ new/ibus-qt-1.3.2-Source/src/qibusbus.cpp 2013-03-11 07:54:25.000000000 +0100 @@ -12,7 +12,8 @@ #include "qibusbus.h" #include "qibusibusproxy.h" #include "qibusdbusproxy.h" - +#include <X11/Xlib.h> +#include <QX11Info> namespace IBus { /** @@ -121,15 +122,23 @@ Bus::getSocketPath (void) { QString display = getenv ("DISPLAY"); - QStringList strs = display.split(":"); QString hostname = "unix"; QString display_number = "0"; - - if (!strs[0].isEmpty()) - hostname = strs[0]; - strs = strs[1].split("."); - if (!strs[0].isEmpty()) - display_number = strs[0]; + /* fallback when -display is passed to QApplication with no DISPLAY env */ + if (display == NULL) { + Display * dpy = QX11Info::display(); + if (dpy) + display = XDisplayString(dpy); + } + if (display != NULL && display.contains(':')) { + QStringList strs = display.split(":"); + + if (!strs[0].isEmpty()) + hostname = strs[0]; + strs = strs[1].split("."); + if (!strs[0].isEmpty()) + display_number = strs[0]; + } QString path = QDir::homePath() + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.1-Source/src/qibusenginedesc.h new/ibus-qt-1.3.2-Source/src/qibusenginedesc.h --- old/ibus-qt-1.3.1-Source/src/qibusenginedesc.h 2010-08-19 09:05:41.000000000 +0200 +++ new/ibus-qt-1.3.2-Source/src/qibusenginedesc.h 2013-03-11 07:54:25.000000000 +0100 @@ -16,17 +16,17 @@ Q_OBJECT; public: - EngineDesc (): m_rank(0) + EngineDesc () : m_rank (0) {} - EngineDesc (QString name, - QString lname, - QString desc, - QString lang, - QString lics, - QString auth, - QString icon, - QString layout, - QString hotkeys = "", + EngineDesc (const QString & name, + const QString & lname, + const QString & desc, + const QString & lang, + const QString & lics, + const QString & auth, + const QString & icon, + const QString & layout, + const QString & hotkeys = "", uint rank = 0): m_name(name), m_longname(lname), @@ -39,31 +39,31 @@ m_hotkeys(hotkeys), m_rank(rank) { - m_engineInfo.insert("name", m_name); - m_engineInfo.insert("longname", m_longname); - m_engineInfo.insert("description", m_description); - m_engineInfo.insert("language", m_language); - m_engineInfo.insert("license", m_license); - m_engineInfo.insert("author", m_author); - m_engineInfo.insert("icon", m_icon); - m_engineInfo.insert("layout", m_layout); - m_engineInfo.insert("hotkeys", m_hotkeys); + m_engineInfo.insert ("name", m_name); + m_engineInfo.insert ("longname", m_longname); + m_engineInfo.insert ("description", m_description); + m_engineInfo.insert ("language", m_language); + m_engineInfo.insert ("license", m_license); + m_engineInfo.insert ("author", m_author); + m_engineInfo.insert ("icon", m_icon); + m_engineInfo.insert ("layout", m_layout); + m_engineInfo.insert ("hotkeys", m_hotkeys); QString stringRank; - stringRank = stringRank.number(m_rank); - m_engineInfo.insert("rank", stringRank); + stringRank = stringRank.number (m_rank); + m_engineInfo.insert ("rank", stringRank); } - virtual ~EngineDesc() {} + virtual ~EngineDesc () {} public : - virtual bool serialize (QDBusArgument &argument); - virtual bool deserialize (const QDBusArgument &argument); + virtual bool serialize (QDBusArgument & argument); + virtual bool deserialize (const QDBusArgument & argument); void output (QString & output) const; bool parseXmlNode (const QDomNode & node); - const QMap<QString, QString> & getEngineInfo() const + const QMap<QString, QString> & getEngineInfo () const { return m_engineInfo; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.1-Source/src/qibusserializable.h new/ibus-qt-1.3.2-Source/src/qibusserializable.h --- old/ibus-qt-1.3.1-Source/src/qibusserializable.h 2010-08-19 09:05:41.000000000 +0200 +++ new/ibus-qt-1.3.2-Source/src/qibusserializable.h 2013-03-11 07:54:25.000000000 +0100 @@ -91,7 +91,7 @@ template<typename T> QVariant & -qVariantFromSerializable (const Pointer<T> &p, QVariant & variant = QVariant ()) +qVariantFromSerializable (const Pointer<T> &p, QVariant & variant) { QDBusArgument argument; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org