[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#444716: kopete: does not export custom msn emoticons



Package: kopete
Version: 4:3.5.7-4
Severity: normal

kopete doesn't export emoticons to msn live clients.

This bug is fixed in the svn, please apply this backported patch.

Best regards

-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (650, 'testing'), (600, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.22.1-kbytelnx (SMP w/1 CPU core; PREEMPT)
Locale: LANG=it_IT.UTF-8, LC_CTYPE=it_IT.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages kopete depends on:
ii  kdelibs4c2a             4:3.5.7.dfsg.1-7 core libraries and binaries for al
ii  libacl1                 2.2.45-1         Access control list shared library
ii  libart-2.0-2            2.3.19-3         Library of functions for 2D graphi
ii  libattr1                1:2.4.39-1       Extended attribute shared library
ii  libaudio2               1.9-2+b1         The Network Audio System (NAS). (s
ii  libc6                   2.6.1-1+b1       GNU C Library: Shared libraries
ii  libfontconfig1          2.4.2-1.2        generic font configuration library
ii  libfreetype6            2.3.5-1+b1       FreeType 2 font engine, shared lib
ii  libgadu3                1:1.7~rc2-2      Gadu-Gadu protocol library - runti
ii  libgamin0 [libfam0]     0.1.8-2          Client library for the gamin file 
ii  libgcc1                 1:4.2.1-4        GCC support library
ii  libglib2.0-0            2.14.0-2         The GLib library of C routines
ii  libgsmme1c2a            1.10-10          GSM mobile phone access library
ii  libice6                 2:1.0.4-1        X11 Inter-Client Exchange library
ii  libidn11                1.1-1            GNU libidn library, implementation
ii  libjpeg62               6b-14            The Independent JPEG Group's JPEG 
ii  libmeanwhile1           1.0.2-3          open implementation of the Lotus S
ii  libpcre3                6.7-1            Perl 5 Compatible Regular Expressi
ii  libpng12-0              1.2.15~beta5-2   PNG library - runtime
ii  libqt3-mt               3:3.3.7-8        Qt GUI Library (Threaded runtime v
ii  libsm6                  2:1.0.3-1+b1     X11 Session Management library
ii  libstdc++6              4.2.1-4          The GNU Standard C++ Library v3
ii  libx11-6                2:1.0.3-7        X11 client-side library
ii  libxcursor1             1:1.1.9-1        X cursor management library
ii  libxext6                1:1.0.3-2        X11 miscellaneous extension librar
ii  libxft2                 2.1.12-2         FreeType-based font drawing librar
ii  libxi6                  2:1.1.3-1        X11 Input extension library
ii  libxinerama1            1:1.0.2-1        X11 Xinerama extension library
ii  libxml2                 2.6.30.dfsg-2    GNOME XML library
ii  libxrandr2              2:1.2.2-1        X11 RandR extension library
ii  libxrender1             1:0.9.4-1        X Rendering Extension client libra
ii  libxslt1.1              1.1.22-1         XSLT processing library - runtime 
ii  libxt6                  1:1.0.5-3        X11 toolkit intrinsics library
ii  zlib1g                  1:1.2.3.3.dfsg-5 compression library - runtime

Versions of packages kopete recommends:
ii  qca-tls                       1.0-4      TLS plugin for the Qt Cryptographi

-- no debconf information

-- 
| /
| \Byte - Andrea Briganti - kbyte@despammed.com
http://kbytesys.altervista.org - ICQ: 40872731
CSLug member: http://cslug.linux.it - JID: kbyte@jabber.linux.it
*** I'm not living, I'm just killing time
diff -ur kdenetwork-3.5.7/kopete/protocols/msn/dispatcher.cpp kdenetwork-svn/kopete/protocols/msn/dispatcher.cpp
--- kdenetwork-3.5.7/kopete/protocols/msn/dispatcher.cpp	2006-01-19 17:43:04.000000000 +0100
+++ kdenetwork-svn/kopete/protocols/msn/dispatcher.cpp	2007-09-30 13:30:39.000000000 +0200
@@ -382,7 +382,7 @@
 			regex.search(body);
 			Q_UINT32 applicationId = regex.cap(1).toUInt();
 
-			if(applicationId == 1  || applicationId == 12)
+			if(applicationId == 1  || applicationId == 11 || applicationId == 12 )
 			{                         //the AppID is 12 since Messenger 7.5
 				// A contact has requested a session to download
 				// a display icon (User Display Icon or CustomEmotion).
diff -ur kdenetwork-3.5.7/kopete/protocols/msn/msnswitchboardsocket.cpp kdenetwork-svn/kopete/protocols/msn/msnswitchboardsocket.cpp
--- kdenetwork-3.5.7/kopete/protocols/msn/msnswitchboardsocket.cpp	2007-05-14 09:40:08.000000000 +0200
+++ kdenetwork-svn/kopete/protocols/msn/msnswitchboardsocket.cpp	2007-09-30 13:30:39.000000000 +0200
@@ -631,9 +631,9 @@
 
 			QString sha1d = QString(KCodecs::base64Encode(SHA1::hash(ar)));
 			QString size = QString::number( pictFile.size() );
-			QString all = "Creator" + m_account->accountId() +	"Size" + size + "Type3Location" + fi.fileName() + "FriendlyAAA=SHA1D" + sha1d;
+			QString all = "Creator" + m_account->accountId() +	"Size" + size + "Type2Location" + fi.fileName() + "FriendlyAAA=SHA1D" + sha1d;
 			QString sha1c = QString(KCodecs::base64Encode(SHA1::hashString(all.utf8())));
-			picObj = "<msnobj Creator=\"" + m_account->accountId() + "\" Size=\"" + size  + "\" Type=\"3\" Location=\""+ fi.fileName() + "\" Friendly=\"AAA=\" SHA1D=\""+sha1d+ "\" SHA1C=\""+sha1c+"\"/>";
+			picObj = "<msnobj Creator=\"" + m_account->accountId() + "\" Size=\"" + size  + "\" Type=\"2\" Location=\""+ fi.fileName() + "\" Friendly=\"AAA=\" SHA1D=\""+sha1d+ "\" SHA1C=\""+sha1c+"\"/>";
 
 			PeerDispatcher()->objectList.insert(picObj, filename);
 		}
diff -ur kdenetwork-3.5.7/kopete/protocols/msn/webcam/libmimic/mimic-private.h kdenetwork-svn/kopete/protocols/msn/webcam/libmimic/mimic-private.h
--- kdenetwork-3.5.7/kopete/protocols/msn/webcam/libmimic/mimic-private.h	2005-10-10 16:57:54.000000000 +0200
+++ kdenetwork-svn/kopete/protocols/msn/webcam/libmimic/mimic-private.h	2007-09-30 13:30:34.000000000 +0200
@@ -51,7 +51,7 @@
     guchar *cur_frame_buf;
     guchar *prev_frame_buf;
     
-    gchar vlcdec_lookup[2296];
+    gint8 vlcdec_lookup[2296];
     
     gchar *data_buffer;
     guint data_index;
@@ -96,7 +96,7 @@
 void _idct_dequant_block(MimCtx *ctx, gint *block, gboolean is_chrom);
 
 VlcMagic *_find_magic(guint magic);
-void _initialize_vlcdec_lookup(gchar *lookup_tbl);
+void _initialize_vlcdec_lookup(gint8 *lookup_tbl);
 
 void _rgb_to_yuv(const guchar *input_rgb,
                  guchar *output_y,
diff -ur kdenetwork-3.5.7/kopete/protocols/msn/webcam/libmimic/vlc_common.c kdenetwork-svn/kopete/protocols/msn/webcam/libmimic/vlc_common.c
--- kdenetwork-3.5.7/kopete/protocols/msn/webcam/libmimic/vlc_common.c	2005-09-10 10:20:25.000000000 +0200
+++ kdenetwork-svn/kopete/protocols/msn/webcam/libmimic/vlc_common.c	2007-09-30 13:30:34.000000000 +0200
@@ -1293,13 +1293,13 @@
  * Internal helper-function used to initialize
  * the lookup-table used by the VLC-decoder.
  */
-void _initialize_vlcdec_lookup(gchar *lookup_tbl)
+void _initialize_vlcdec_lookup(gint8 *lookup_tbl)
 {
-    gchar util_buf[3072];
+    gint8 util_buf[3072];
     gint v1_start, v1_end, v1_dec, util_buf_offset;
     gint util_buf_offset_inc, buf1_val, samples_offset;
     gint v1, v2;
-    gchar *p, *p1, *p2, *p3;
+    gint8 *p, *p1, *p2, *p3;
 
     util_buf[0] = 0;
     util_buf[1] = 0;

Reply to: