Package: pidgin
Version: 2.3.1-2
Followup-For: Bug #448017

As pidgin has merged msnp9 branch since 2.3.0, the patch has to be
applied to that branch as well. The renewed patch is attached.



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

Kernel: Linux 2.6.23-1-686 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages pidgin depends on:
ii  gconf2                   2.20.1-1        GNOME configuration database syste
ii  libatk1.0-0              1.20.0-1        The ATK accessibility toolkit
ii  libc6                    2.7-4           GNU C Library: Shared libraries
ii  libcairo2                1.4.12-1        The Cairo 2D vector graphics libra
ii  libdbus-1-3              1.1.2-1         simple interprocess messaging syst
ii  libdbus-glib-1-2         0.74-1          simple interprocess messaging syst
ii  libglib2.0-0             2.14.4-2        The GLib library of C routines
ii  libgstreamer0.10-0       0.10.15-3       Core GStreamer libraries and eleme
ii  libgtk2.0-0              2.12.3-2        The GTK+ graphical user interface 
ii  libgtkspell0             2.0.10-3+b1     a spell-checking addon for GTK's T
ii  libice6                  2:1.0.4-1       X11 Inter-Client Exchange library
ii  libpango1.0-0            1.18.3-1        Layout and rendering of internatio
ii  libpurple0               2.3.1-2msngroup multi-protocol instant messaging l
ii  libsm6                   2:1.0.3-1+b1    X11 Session Management library
ii  libstartup-notification0 0.9-1           library for program launch feedbac
ii  libx11-6                 2:1.0.3-7       X11 client-side library
ii  libxss1                  1:1.1.2-1       X11 Screen Saver extension library
ii  pidgin-data              2.3.1-2msngroup multi-protocol instant messaging c

Versions of packages pidgin recommends:
ii  gstreamer0.10-plugins-base    0.10.15-4  GStreamer plugins from the "base" 
ii  gstreamer0.10-plugins-good    0.10.6-4   GStreamer plugins from the "good" 

-- no debconf information
diff -uar pidgin-2.3.0/libpurple/protocols/msn/switchboard.c pidgin-2.3.0.msngroup/libpurple/protocols/msn/switchboard.c
--- pidgin-2.3.0/libpurple/protocols/msn/switchboard.c	2007-11-25 03:05:57.000000000 +0800
+++ pidgin-2.3.0.msngroup/libpurple/protocols/msn/switchboard.c	2007-12-05 05:18:05.000000000 +0800
@@ -861,6 +861,14 @@
 	}
 #endif
 
+	if ((value = msn_message_get_attr(msg, "P4-Context")) != NULL)
+	{
+		char *body_enc_tmp = g_strdup_printf("<b>%s:</b> %s", value,
+									 body_enc ? body_enc : "");
+		g_free(body_enc);
+		body_enc = body_enc_tmp;
+	}
+
 	if ((value = msn_message_get_attr(msg, "X-MMS-IM-Format")) != NULL)
 	{
 		char *pre, *post;
diff -uar pidgin-2.3.0/libpurple/protocols/msnp9/switchboard.c pidgin-2.3.0.msngroup/libpurple/protocols/msnp9/switchboard.c
--- pidgin-2.3.0/libpurple/protocols/msnp9/switchboard.c	2007-11-25 03:05:58.000000000 +0800
+++ pidgin-2.3.0.msngroup/libpurple/protocols/msnp9/switchboard.c	2007-12-05 05:17:49.000000000 +0800
@@ -853,6 +853,14 @@
 	}
 #endif
 
+	if ((value = msn_message_get_attr(msg, "P4-Context")) != NULL)
+	{
+		char *body_enc_tmp = g_strdup_printf("<b>%s:</b> %s", value,
+									 body_enc ? body_enc : "");
+		g_free(body_enc);
+		body_enc = body_enc_tmp;
+	}
+
 	if ((value = msn_message_get_attr(msg, "X-MMS-IM-Format")) != NULL)
 	{
 		char *pre, *post;

Reply via email to