Hello community, here is the log from the commit of package psi+ for openSUSE:Factory checked in at 2013-05-16 11:24:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/psi+ (Old) and /work/SRC/openSUSE:Factory/.psi+.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "psi+" Changes: -------- --- /work/SRC/openSUSE:Factory/psi+/psi+.changes 2013-04-23 11:38:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.psi+.new/psi+.changes 2013-05-16 11:24:04.000000000 +0200 @@ -1,0 +2,13 @@ +Mon May 13 11:29:06 UTC 2013 - jsl...@suse.com + +- login1-dbus-suspend.patch: logind sends a differnet signal during + suspend + +------------------------------------------------------------------- +Mon May 13 07:46:55 UTC 2013 - jsl...@suse.com + +- update to 20130505 + * updated translations + * many bugfixes (see ChangeLog) + +------------------------------------------------------------------- Old: ---- psi+-20130405.tar.xz New: ---- add-return-to-nonvoid-fun.patch login1-dbus-suspend.patch psi+-20130505.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psi+.spec ++++++ --- /var/tmp/diff_new_pack.96M4vP/_old 2013-05-16 11:24:05.000000000 +0200 +++ /var/tmp/diff_new_pack.96M4vP/_new 2013-05-16 11:24:05.000000000 +0200 @@ -18,13 +18,15 @@ Name: psi+ Url: http://code.google.com/p/psi-dev/ -Version: 20130405 +Version: 20130505 Release: 0 Summary: Jabber client using Qt License: GPL-2.0+ Group: Productivity/Networking/Talk/Clients Source0: psi+-%{version}.tar.xz Source1: psi-plus-l10n-1.tar.xz +Patch0: add-return-to-nonvoid-fun.patch +Patch1: login1-dbus-suspend.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: aspell-devel BuildRequires: fdupes @@ -280,6 +282,8 @@ %prep %setup -q -b 1 +%patch0 -p1 +%patch1 -p1 %define plugins generic/attentionplugin generic/autoreplyplugin generic/birthdayreminderplugin generic/captchaformsplugin generic/cleanerplugin generic/conferenceloggerplugin generic/contentdownloaderplugin generic/extendedoptionsplugin generic/gmailserviceplugin generic/gnupgplugin generic/historykeeperplugin generic/icqdieplugin generic/imageplugin generic/juickplugin generic/otrplugin generic/pepchangenotifyplugin generic/qipxstatusesplugin generic/screenshotplugin generic/skinsplugin generic/stopspamplugin generic/storagenotesplugin generic/translateplugin generic/videostatusplugin generic/watcherplugin generic/yandexnarodplugin unix/gnome3supportplugin @@ -419,7 +423,7 @@ %files %defattr(-,root,root) -%doc COPYING README TODO +%doc ChangeLog COPYING README TODO %{_bindir}/psi-plus %{_datadir}/applications/psi-plus.desktop %dir %{_datadir}/icons/hicolor/ ++++++ add-return-to-nonvoid-fun.patch ++++++ --- iris/src/xmpp/xmpp-core/stream.cpp | 2 ++ 1 file changed, 2 insertions(+) --- a/iris/src/xmpp/xmpp-core/stream.cpp +++ b/iris/src/xmpp/xmpp-core/stream.cpp @@ -445,6 +445,8 @@ const QString ClientStream::getSCRAMStor if (context) { return context->property("scram-salted-password-base64").toString(); } + qDebug() << __func__ << ": no context\n"; + return "n/a"; } void ClientStream::setResourceBinding(bool b) ++++++ login1-dbus-suspend.patch ++++++ logind sends a differnet signal during suspend, fix that by listening on PrepareForSleep. But we need to wait on resuming case because it is sent too early... --- src/libpsi/tools/systemwatch/systemwatch_unix.cpp | 10 ++++++++++ src/libpsi/tools/systemwatch/systemwatch_unix.h | 1 + 2 files changed, 11 insertions(+) --- a/src/libpsi/tools/systemwatch/systemwatch_unix.cpp +++ b/src/libpsi/tools/systemwatch/systemwatch_unix.cpp @@ -21,6 +21,7 @@ #include "systemwatch_unix.h" #ifdef USE_DBUS # include <QDBusConnection> +# include <QTimer> #endif UnixSystemWatch::UnixSystemWatch() @@ -29,9 +30,18 @@ UnixSystemWatch::UnixSystemWatch() QDBusConnection conn = QDBusConnection::systemBus(); conn.connect("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "Sleeping", this, SLOT(sleeping())); conn.connect("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "Resuming", this, SLOT(resuming())); + conn.connect("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", "PrepareForSleep", this, SLOT(prepareForSleep(bool))); #endif } +void UnixSystemWatch::prepareForSleep(bool suspending) +{ + if (suspending) + emit sleeping(); + else + QTimer::singleShot(5000, this, SLOT(resuming())); +} + void UnixSystemWatch::sleeping() { emit sleep(); --- a/src/libpsi/tools/systemwatch/systemwatch_unix.h +++ b/src/libpsi/tools/systemwatch/systemwatch_unix.h @@ -32,6 +32,7 @@ public: private slots: void sleeping(); void resuming(); + void prepareForSleep(bool suspending); }; ++++++ psi+-20130405.tar.xz -> psi+-20130505.tar.xz ++++++ /work/SRC/openSUSE:Factory/psi+/psi+-20130405.tar.xz /work/SRC/openSUSE:Factory/.psi+.new/psi+-20130505.tar.xz differ: char 26, line 1 ++++++ psi-plus-l10n-1.tar.xz ++++++ ++++ 58113 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
