Merge branch '1.7-stable'

icq/src/icq-srv.cpp

@@ -2092,7 +2092,6 @@ void IcqProtocol::processIconHash(User* u, Buffer& packet)
       case BART_TYPExBUDDY_ICON_PHOTO:
       {
         // TODO: Handle photo item
-        packet.incDataPosRead(length);
         break;
       }
       case BART_TYPExBUDDY_ICON:
@@ -2106,38 +2105,37 @@ void IcqProtocol::processIconHash(User* u, Buffer& packet)
           u->setBuddyIconType(type);
           u->setBuddyIconHashType(flags);
           u->save(Licq::User::SavePictureInfo);
+          continue;
         }
         break;
       }
       case BART_TYPExSTATUS_STR:
       {
         // TODO: Handle status string
-        packet.incDataPosRead(length);
         break;
       }
       case BART_TYPExSTATUS_STR_TIMESTAMP:
       {
         // TODO: Handle status string timestamp
-        packet.incDataPosRead(length);
         break;
       }
       case BART_TYPExSTATUS_MOOD:
       {
         // TODO: Handle status mood item
-        packet.incDataPosRead(length);
         break;
       }
       case BART_TYPExITUNES_LINK:
       {
         // TODO: Handle iTunes music store link
-        packet.incDataPosRead(length);
         break;
       }
       default:
         gLog.warning(tr("Unknown Extended Status Data type 0x%04x flags 0x%02x length 0x%02x"),
             type, flags, length);
-        packet.incDataPosRead(length);
     }
+
+    // Unhandled part, skip the data
+    packet.incDataPosRead(length);
   }
 }
 

licq/LICENSE

@@ -1,5 +1,5 @@
 Licq - An Instant Messanger Client for Unix
-Copyright (C) 1998-2012 Licq developers
+Copyright (C) 1998-2013 Licq developers
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

licq/doc/CHANGELOG

@@ -6,7 +6,13 @@ o ICQ: Moved from daemon and built as separate protocol plugin
 
 
 New in 1.7.1
+o Fix a deadlock happening if log messages were flooding
+o Handle line breaks for URL field in history files
+o ICQ: Fix parsing of buddy icon data to not break on long fields
 o Qt4-Gui: Show authorization request dialog when adding a user
+o Qt4-Gui: Better logic for setting away message on non-ICQ account
+o Qt4-Gui: Dock icon could show offline even if one account was online
+o Qt4-Gui: Floaties could appear as empty windows
 
 
 New in 1.7.0

licq/doc/README-1.7.1

@@ -0,0 +1,14 @@
+      LICQ v1.7.1 README
+      http://www.licq.org/
+      #Licq on irc.freenode.net
+
+This is a bugfix release, mainly to solve some crashes and deadlocks that have
+been found in Licq 1.7.0.
+
+For more information on what has changed since Licq 1.7.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