Hello community, here is the log from the commit of package licq for openSUSE:Factory checked in at 2015-02-22 17:26:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/licq (Old) and /work/SRC/openSUSE:Factory/.licq.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "licq" Changes: -------- --- /work/SRC/openSUSE:Factory/licq/licq.changes 2013-11-07 08:42:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.licq.new/licq.changes 2015-02-22 17:26:18.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Feb 19 22:01:21 UTC 2015 - p.drouand@gmail.com + +- Update to version 1.8.2 + * Fixed crash when loading protocol plugins + * GPG: Don't retry decrypting if password is invalid + * ICQ: Fixed crash when receiving status updates + * MSN: Change default authentication host to login.passport.com + * Jabber: Fixed crash when disconnecting multiple accounts +- Remove licq-1.8.1-65026d6.patch; fixed on upstream release +- Use the relative sourceforge download Url instead of mirror Url for + source tarball downloading +- Split out translation files + +------------------------------------------------------------------- Old: ---- licq-1.8.1-65026d6.patch licq-1.8.1.tar.bz2 New: ---- licq-1.8.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ licq.spec ++++++ --- /var/tmp/diff_new_pack.b0WNLx/_old 2015-02-22 17:26:19.000000000 +0100 +++ /var/tmp/diff_new_pack.b0WNLx/_new 2015-02-22 17:26:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package licq # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,18 +27,16 @@ BuildRequires: libkde4-devel BuildRequires: xosd-devel BuildRequires: pkgconfig(QtGui) >= 4.7 -Version: 1.8.1 +Version: 1.8.2 Release: 0 Summary: Linux ICQ Client License: GPL-2.0+ Group: Productivity/Networking/ICQ -Source: http://switch.dl.sourceforge.net/project/licq/licq/%{version}/licq-%{version}.tar.bz2 +Source: http://sourceforge.net/projects/licq/files/licq/%{version}/licq-%{version}.tar.bz2 Source2: licq.png Recommends: sox +Recommends: %{name}-lang Patch2: licq-1.5.0-remove_desktop_file.patch -# TODO: please drop it after the next subj update! -# PATCH-FIX-UPSTREAM to prevent compiling error. -Patch3: licq-1.8.1-65026d6.patch Url: http://www.licq.org/ %description @@ -52,8 +50,6 @@ written in C++ and comes with a GUI plug-in using the Qt widget set. Other plug-ins are also available. - - %package qt4-gui-data Summary: Qt4 data files for Licq Group: Productivity/Networking/ICQ @@ -61,8 +57,6 @@ %description qt4-gui-data Data files for the Qt4 Licq plug-in. - - %package qt4-gui Summary: Qt4 plug-in for Licq Group: Productivity/Networking/ICQ @@ -73,7 +67,6 @@ %description qt4-gui This plug-in uses the Qt4 libraries to provide Licq GUI. - %package kde4-gui Summary: KDE4 plug-in for Licq Group: Productivity/Networking/ICQ @@ -85,7 +78,6 @@ %description kde4-gui This plug-in uses the KDE4 libraries to provide Licq GUI. - %package devel Summary: Development files of Licq Group: Development/Sources @@ -94,12 +86,11 @@ %description devel Header files of Licq program. - +%lang_package %prep %setup %patch2 -p1 -%patch3 # disabled for now (deps missing) rm -r plugins/aosd plugins/jabber @@ -133,14 +124,14 @@ %find_lang licq_osd_plugin %{name}.lang %fdupes -s $RPM_BUILD_ROOT -%files -f %{name}.lang +%files %defattr(-,root,root,755) %doc %{_docdir}/licq/ %{_bindir}/licq %{_libdir}/licq/ %{_datadir}/licq/ -/usr/share/applications/licq.desktop -/usr/share/pixmaps/licq.png +%{_datadir}/applications/licq.desktop +%{_datadir}/pixmaps/licq.png %exclude %{_includedir}/licq/ %exclude %{_libdir}/licq/licq_qt4-gui.so %exclude %{_libdir}/licq/licq_kde4-gui.so @@ -164,4 +155,6 @@ %defattr(-,root,root,755) %{_libdir}/licq/licq_kde4-gui.so +%files lang -f %{name}.lang + %changelog ++++++ licq-1.8.1.tar.bz2 -> licq-1.8.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/README new/licq-1.8.2/README --- old/licq-1.8.1/README 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/README 2014-06-01 21:16:42.000000000 +0200 @@ -1,11 +1,10 @@ - LICQ v1.8.1 README + LICQ v1.8.2 README http://www.licq.org/ #Licq on irc.freenode.net This is a bugfix release, mainly to solve some crashes and fix build problems. -This release also includes a big update of the Turkish translation. -For more information on what has changed since Licq 1.8.0, see doc/CHANGELOG. +For more information on what has changed since Licq 1.8.1, see doc/CHANGELOG. For general information on how to build and run Licq, see doc/README. For information about building and using the different plugins, see README or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/cmake/LicqVersion.cmake new/licq-1.8.2/cmake/LicqVersion.cmake --- old/licq-1.8.1/cmake/LicqVersion.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/cmake/LicqVersion.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -5,7 +5,7 @@ # Licq version set(LICQ_VERSION_MAJOR 1) # 0 <= major <= 64 set(LICQ_VERSION_MINOR 8) # 0 <= minor <= 99 -set(LICQ_VERSION_RELEASE 1) # 0 <= release <= 9 +set(LICQ_VERSION_RELEASE 2) # 0 <= release <= 9 set(LICQ_VERSION_EXTRA "") # Any string # When building from a git clone, set the extra version to the HEAD revision, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/doc/CHANGELOG new/licq-1.8.2/doc/CHANGELOG --- old/licq-1.8.1/doc/CHANGELOG 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/doc/CHANGELOG 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,13 @@ Change log for Licq. +New in 1.8.2 +o Fixed crash when loading protocol plugins +o GPG: Don't retry decrypting if password is invalid +o ICQ: Fixed crash when receiving status updates +o MSN: Change default authentication host to login.passport.com +o Jabber: Fixed crash when disconnecting multiple accounts + + New in 1.8.1 o Fixed crash when shutting down plugins o Handle slashes in account/contact ids diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/doc/README new/licq-1.8.2/doc/README --- old/licq-1.8.1/doc/README 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/doc/README 2014-06-01 21:16:42.000000000 +0200 @@ -1,4 +1,4 @@ -LICQ v1.8.1 +LICQ v1.8.2 An ICQ clone written in C and C++ using a plugin system to allow for many possible interfaces. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/doc/README-1.8.1 new/licq-1.8.2/doc/README-1.8.1 --- old/licq-1.8.1/doc/README-1.8.1 1970-01-01 01:00:00.000000000 +0100 +++ new/licq-1.8.2/doc/README-1.8.1 2014-06-01 21:16:42.000000000 +0200 @@ -0,0 +1,14 @@ + LICQ v1.8.1 README + http://www.licq.org/ + #Licq on irc.freenode.net + +This is a bugfix release, mainly to solve some crashes and fix build problems. +This release also includes a big update of the Turkish translation. + +For more information on what has changed since Licq 1.8.0, see doc/CHANGELOG. + +For general information on how to build and run Licq, see doc/README. +For information about building and using the different plugins, see README or +doc/README for the respective plugins. + +The Licq Team diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/aosd/version.cmake new/licq-1.8.2/plugins/aosd/version.cmake --- old/licq-1.8.1/plugins/aosd/version.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/aosd/version.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,5 @@ # The plugin's version set(PLUGIN_VERSION_MAJOR 1) set(PLUGIN_VERSION_MINOR 8) -set(PLUGIN_VERSION_RELEASE 1) +set(PLUGIN_VERSION_RELEASE 2) set(PLUGIN_VERSION_EXTRA "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/auto-reply/version.cmake new/licq-1.8.2/plugins/auto-reply/version.cmake --- old/licq-1.8.1/plugins/auto-reply/version.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/auto-reply/version.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,5 @@ # The plugin's version set(PLUGIN_VERSION_MAJOR 1) set(PLUGIN_VERSION_MINOR 8) -set(PLUGIN_VERSION_RELEASE 1) +set(PLUGIN_VERSION_RELEASE 2) set(PLUGIN_VERSION_EXTRA "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/forwarder/version.cmake new/licq-1.8.2/plugins/forwarder/version.cmake --- old/licq-1.8.1/plugins/forwarder/version.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/forwarder/version.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,5 @@ # The plugin's version set(PLUGIN_VERSION_MAJOR 1) set(PLUGIN_VERSION_MINOR 8) -set(PLUGIN_VERSION_RELEASE 1) +set(PLUGIN_VERSION_RELEASE 2) set(PLUGIN_VERSION_EXTRA "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/icq/src/icq-srv.cpp new/licq-1.8.2/plugins/icq/src/icq-srv.cpp --- old/licq-1.8.1/plugins/icq/src/icq-srv.cpp 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/icq/src/icq-srv.cpp 2014-06-01 21:16:42.000000000 +0200 @@ -1,6 +1,6 @@ /* * This file is part of Licq, an instant messaging client for UNIX. - * Copyright (C) 1998-2013 Licq developers <licq-dev@googlegroups.com> + * Copyright (C) 1998-2014 Licq developers <licq-dev@googlegroups.com> * * Licq is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -3252,21 +3252,24 @@ } u.unlock(); - Licq::Event* e = DoneServerEvent(nMsgID, Licq::Event::ResultAcked); - if (e) - { - e->m_pExtendedAck = pExtendedAck; - e->mySubResult = subResult; - ProcessDoneEvent(e); - return; - } - else + if (nMsgID != 0) { - gLog.warning(tr("Ack for unknown event.")); - break; + Licq::Event* e = DoneServerEvent(nMsgID, Licq::Event::ResultAcked); + if (e != NULL) + { + e->m_pExtendedAck = pExtendedAck; + e->mySubResult = subResult; + ProcessDoneEvent(e); + return; + } + else + { + gLog.warning(tr("Ack for unknown event.")); + break; + } } - break; + break; } case ICQ_SNACxMSG_RIGHTSxGRANTED: { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/icq/version.cmake new/licq-1.8.2/plugins/icq/version.cmake --- old/licq-1.8.1/plugins/icq/version.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/icq/version.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,5 @@ # The plugin's version set(PLUGIN_VERSION_MAJOR 1) set(PLUGIN_VERSION_MINOR 8) -set(PLUGIN_VERSION_RELEASE 1) +set(PLUGIN_VERSION_RELEASE 2) set(PLUGIN_VERSION_EXTRA "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/jabber/src/client.cpp new/licq-1.8.2/plugins/jabber/src/client.cpp --- old/licq-1.8.1/plugins/jabber/src/client.cpp 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/jabber/src/client.cpp 2014-06-01 21:16:42.000000000 +0200 @@ -1,6 +1,6 @@ /* * This file is part of Licq, an instant messaging client for UNIX. - * Copyright (C) 2010-2013 Licq developers <licq-dev@googlegroups.com> + * Copyright (C) 2010-2014 Licq developers <licq-dev@googlegroups.com> * * Please refer to the COPYRIGHT file distributed with this source * distribution for the names of the individual contributors. @@ -171,6 +171,7 @@ Licq::MutexLocker locker(myGlooxMutex); changeStatus(status, false); + myMainLoop.removeCallback(this); if (!myClient.connect(false)) return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/jabber/version.cmake new/licq-1.8.2/plugins/jabber/version.cmake --- old/licq-1.8.1/plugins/jabber/version.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/jabber/version.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,5 @@ # The plugin's version set(PLUGIN_VERSION_MAJOR 1) set(PLUGIN_VERSION_MINOR 8) -set(PLUGIN_VERSION_RELEASE 1) +set(PLUGIN_VERSION_RELEASE 2) set(PLUGIN_VERSION_EXTRA "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/licqweb/README new/licq-1.8.2/plugins/licqweb/README --- old/licq-1.8.1/plugins/licqweb/README 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/licqweb/README 2014-06-01 21:16:42.000000000 +0200 @@ -1,4 +1,4 @@ -licqweb 1.8.1 +licqweb 1.8.2 To use this you need latest cvs of licq with the rms plugin. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/msn/src/msn.cpp new/licq-1.8.2/plugins/msn/src/msn.cpp --- old/licq-1.8.1/plugins/msn/src/msn.cpp 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/msn/src/msn.cpp 2014-06-01 21:16:42.000000000 +0200 @@ -72,7 +72,8 @@ CMSN::CMSN() : myServerSocket(NULL), mySslSocket(NULL), - m_vlPacketBucket(211) + m_vlPacketBucket(211), + myNextTimeoutId(1) { m_bWaitingPingReply = m_bCanPing = false; m_pPacketBuf = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/msn/src/msn.h new/licq-1.8.2/plugins/msn/src/msn.h --- old/licq-1.8.1/plugins/msn/src/msn.h 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/msn/src/msn.h 2014-06-01 21:16:42.000000000 +0200 @@ -1,6 +1,6 @@ /* * This file is part of Licq, an instant messaging client for UNIX. - * Copyright (C) 2004-2013 Licq developers <licq-dev@googlegroups.com> + * Copyright (C) 2004-2014 Licq developers <licq-dev@googlegroups.com> * * Licq is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -128,7 +128,7 @@ void SendPacket(CMSNPacket *); void Send_SB_Packet(const Licq::UserId& userId, CMSNPacket* p, Licq::TCPSocket* sock, bool bDelete = true); - void MSNAuthenticate(const std::string& host = "loginnet.passport.com", + void MSNAuthenticate(const std::string& host = "login.passport.com", const std::string& path = "/login2.srf"); bool MSNSBConnectStart(const std::string& server, const std::string& cookie); bool MSNSBConnectAnswer(const std::string& server, const std::string& sessionId, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/msn/src/msnpacket.cpp new/licq-1.8.2/plugins/msn/src/msnpacket.cpp --- old/licq-1.8.1/plugins/msn/src/msnpacket.cpp 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/msn/src/msnpacket.cpp 2014-06-01 21:16:42.000000000 +0200 @@ -158,17 +158,17 @@ m_pBuffer->packRaw(buf, strlen(buf)); } -char* CMSNPacket::CreateGUID() +std::string CMSNPacket::CreateGUID() { - char *szGUID = new char[37]; + char guid[37]; static int x = 1; x++; // Create a random UID srand(time(0)+x); - sprintf(szGUID, "%4X%4X-%4X-%4X-%4X-%4X%4X%4X", + sprintf(guid, "%4X%4X-%4X-%4X-%4X-%4X%4X%4X", rand() % 0xFFFF, rand() % 0xFFFF, rand() % 0xFFFF, rand() % 0xFFFF, rand() % 0xFFFF, rand() % 0xFFFF, rand() % 0xFFFF, rand() % 0xFFFF); - return szGUID; + return guid; } CMSNPayloadPacket::CMSNPayloadPacket(char msgType) @@ -202,7 +202,6 @@ : CMSNPayloadPacket('A'), myToEmail(toEmail) { - m_szCallGUID = 0; m_nSessionId = nSessionId; m_nBaseId = nBaseId; m_nDataOffsetLO = nDataOffsetLO; @@ -219,7 +218,7 @@ CMSNP2PPacket::~CMSNP2PPacket() { - /* Empty */ + // Empty } void CMSNP2PPacket::InitBuffer() @@ -536,8 +535,8 @@ CPS_MSNInvitation::CPS_MSNInvitation(const string& toEmail, const string& fromEmail, const string& msnObject) : CMSNP2PPacket(toEmail) { - char *szBranchGUID = CreateGUID(); - m_szCallGUID = CreateGUID(); + std::string branchGUID = CreateGUID(); + myCallGUID = CreateGUID(); string strMSNObject64 = MSN_Base64Encode(msnObject); char szBodyBuf[512]; @@ -564,8 +563,8 @@ "Max-Forwards: 0\r\n" "Content-Type: application/x-msnmsgr-sessionreqbody\r\n" "Content-Length: %lu\r\n" - "\r\n", toEmail.c_str(), toEmail.c_str(), fromEmail.c_str(), szBranchGUID, - m_szCallGUID, static_cast<unsigned long>(strlen(szBodyBuf)+1)); + "\r\n", toEmail.c_str(), toEmail.c_str(), fromEmail.c_str(), branchGUID.c_str(), + myCallGUID.c_str(), static_cast<unsigned long>(strlen(szBodyBuf)+1)); string strMsg = szHeaderBuf; strMsg += szBodyBuf; @@ -592,7 +591,7 @@ : CMSNP2PPacket(toEmail, 0, _nBaseId, 0, 0, 0, 4, 0, 0, _nAckId, 0, 0, 0) //SizeHI, _nDataSizeLO) { - char *szBranchGUID = CreateGUID(); + std::string branchGUID = CreateGUID(); char szMsgBuf[768]; @@ -608,7 +607,8 @@ "Content-Length: 3\r\n" "\r\n" "\r\n", - toEmail.c_str(), toEmail.c_str(), fromEmail.c_str(), szBranchGUID, callId.c_str()); + toEmail.c_str(), toEmail.c_str(), fromEmail.c_str(), + branchGUID.c_str(), callId.c_str()); string strMsg = szMsgBuf; strMsg += '\0'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/msn/src/msnpacket.h new/licq-1.8.2/plugins/msn/src/msnpacket.h --- old/licq-1.8.1/plugins/msn/src/msnpacket.h 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/msn/src/msnpacket.h 2014-06-01 21:16:42.000000000 +0200 @@ -50,7 +50,7 @@ virtual void InitBuffer(); - char *CreateGUID(); + std::string CreateGUID(); protected: @@ -90,13 +90,13 @@ unsigned long SessionId() { return m_nSessionId; } unsigned long BaseId() { return m_nBaseId; } - char *CallGUID() { return m_szCallGUID; } + const std::string& CallGUID() { return myCallGUID; } // unsigned long DataSize() {} //unsigned long Offset() {} protected: std::string myToEmail; - char *m_szCallGUID; + std::string myCallGUID; unsigned long m_nSessionId, m_nBaseId, m_nDataSizeLO, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/msn/version.cmake new/licq-1.8.2/plugins/msn/version.cmake --- old/licq-1.8.1/plugins/msn/version.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/msn/version.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,5 @@ # The plugin's version set(PLUGIN_VERSION_MAJOR 1) set(PLUGIN_VERSION_MINOR 8) -set(PLUGIN_VERSION_RELEASE 1) +set(PLUGIN_VERSION_RELEASE 2) set(PLUGIN_VERSION_EXTRA "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/osd/version.cmake new/licq-1.8.2/plugins/osd/version.cmake --- old/licq-1.8.1/plugins/osd/version.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/osd/version.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,5 @@ # The plugin's version set(PLUGIN_VERSION_MAJOR 1) set(PLUGIN_VERSION_MINOR 8) -set(PLUGIN_VERSION_RELEASE 1) +set(PLUGIN_VERSION_RELEASE 2) set(PLUGIN_VERSION_EXTRA "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/qt4-gui/src/helpers/usercodec.h new/licq-1.8.2/plugins/qt4-gui/src/helpers/usercodec.h --- old/licq-1.8.1/plugins/qt4-gui/src/helpers/usercodec.h 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/qt4-gui/src/helpers/usercodec.h 2014-06-01 21:16:42.000000000 +0200 @@ -20,13 +20,14 @@ #ifndef USERCODEC_H #define USERCODEC_H +#include <QObject> #include <QString> namespace LicqQtGui { class UserCodec { - Q_OBJECT + Q_GADGET public: struct encoding_t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/qt4-gui/version.cmake new/licq-1.8.2/plugins/qt4-gui/version.cmake --- old/licq-1.8.1/plugins/qt4-gui/version.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/qt4-gui/version.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,5 @@ # The plugin's version set(PLUGIN_VERSION_MAJOR 1) set(PLUGIN_VERSION_MINOR 8) -set(PLUGIN_VERSION_RELEASE 1) +set(PLUGIN_VERSION_RELEASE 2) set(PLUGIN_VERSION_EXTRA "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/plugins/rms/version.cmake new/licq-1.8.2/plugins/rms/version.cmake --- old/licq-1.8.1/plugins/rms/version.cmake 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/plugins/rms/version.cmake 2014-06-01 21:16:42.000000000 +0200 @@ -1,5 +1,5 @@ # The plugin's version set(PLUGIN_VERSION_MAJOR 1) set(PLUGIN_VERSION_MINOR 8) -set(PLUGIN_VERSION_RELEASE 1) +set(PLUGIN_VERSION_RELEASE 2) set(PLUGIN_VERSION_EXTRA "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/src/gpghelper.cpp new/licq-1.8.2/src/gpghelper.cpp --- old/licq-1.8.1/src/gpghelper.cpp 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/src/gpghelper.cpp 2014-06-01 21:16:42.000000000 +0200 @@ -1,6 +1,6 @@ /* * This file is part of Licq, an instant messaging client for UNIX. - * Copyright (C) 2004-2013 Licq developers <licq-dev@googlegroups.com> + * Copyright (C) 2004-2014 Licq developers <licq-dev@googlegroups.com> * * Licq is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -231,12 +231,13 @@ } #ifdef HAVE_LIBGPGME -gpgme_error_t GpgHelper::PassphraseCallback(void* helperPtr, const char *, const char *, int, int fd) +gpgme_error_t GpgHelper::PassphraseCallback(void* helperPtr, const char *, + const char *, int prev_was_bad, int fd) { GpgHelper* helper = static_cast<GpgHelper*>(helperPtr); const char nl = '\n'; const string& pf = helper->myGpgPassphrase; - if (pf.empty()) + if (prev_was_bad || pf.empty()) { write(fd, &nl, 1); return GPG_ERR_CANCELED; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/src/plugin/pluginmanager.cpp new/licq-1.8.2/src/plugin/pluginmanager.cpp --- old/licq-1.8.1/src/plugin/pluginmanager.cpp 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/src/plugin/pluginmanager.cpp 2014-06-01 21:16:42.000000000 +0200 @@ -1,6 +1,6 @@ /* * This file is part of Licq, an instant messaging client for UNIX. - * Copyright (C) 2010-2013 Licq developers <licq-dev@googlegroups.com> + * Copyright (C) 2010-2014 Licq developers <licq-dev@googlegroups.com> * * Licq is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -586,12 +586,9 @@ // Load contacts and owners for the new protocol gUserManager.loadProtocol(plugin->protocolId()); - ProtocolPlugin::Instances instances = plugin->instances(); - BOOST_FOREACH(Licq::ProtocolPluginInstance::Ptr instance, instances) - { - startInstance( - boost::dynamic_pointer_cast<ProtocolPluginInstance>(instance)); - } + // Don't start any protocol instance here, as it has already been started in + // createProtocolOwner() (called by gUserManager.loadProtocol()). + return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/licq-1.8.1/src/sighandler.cpp new/licq-1.8.2/src/sighandler.cpp --- old/licq-1.8.1/src/sighandler.cpp 2013-10-28 13:26:38.000000000 +0100 +++ new/licq-1.8.2/src/sighandler.cpp 2014-06-01 21:16:42.000000000 +0200 @@ -1,6 +1,6 @@ /* * This file is part of Licq, an instant messaging client for UNIX. - * Copyright (C) 1998-2012 Licq Developers <licq-dev@googlegroups.com> + * Copyright (C) 1998-2014 Licq developers <licq-dev@googlegroups.com> * * Please refer to the COPYRIGHT file distributed with this source * distribution for the names of the individual contributors. @@ -207,10 +207,10 @@ char error[1024]; snprintf(error, 1024, "Licq has encountered a fatal error.\n" - "Please report this error either by creating a new ticket " - "at http://trac.licq.org/ or by sending an e-mail to the mailing list " - "licq-dev@googlegroups.com (you must be registered to be able to post, " - "see http://trac.licq.org/wiki/MailingList).\n" + "Please report this error either by creating a new ticket at" + "https://github.com/licq-im/licq/issues or by sending an e-mail to the" + "mailing list licq-dev@googlegroups.com (you must be registered to be" + "able to post, see http://groups.google.com/group/licq-dev).\n" "\n" "To help us debug the error, please include a full description of " "what you did when the error occurred. Additionally, please include " -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org