Fri Nov 11 15:46:47 UTC 2005

Author: wtogami

Update of /cvs/dist/rpms/gaim/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv20089

Modified Files:
	gaim.spec 
Added Files:
	gaim-1.5.0-aim-rate-limiting.patch gaim-1.5.0-authors.patch 
	gaim-1.5.0-clipboard-leak-history-scroll.patch 
	gaim-1.5.0-copyright.patch 
	gaim-1.5.0-crash-non-terminated-strings.patch 
	gaim-1.5.0-doc-creation.patch 
	gaim-1.5.0-forceful-connection_disconnect-not-wipe-password.patch 
	gaim-1.5.0-hacking-doc.patch gaim-1.5.0-it-yahoo_profile.patch 
	gaim-1.5.0-italics-ircs.patch 
	gaim-1.5.0-msn-data-corruption-fix.patch 
	gaim-1.5.0-msn-kill-convo-close-timeout-notices-p1.patch 
	gaim-1.5.0-msn-kill-convo-close-timeout-notices-p2.patch 
	gaim-1.5.0-msn-kill-convo-close-timeout-notices-p3.patch 
	gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p1.patch 
	gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p2.patch 
	gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p3.patch 
	gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p4.patch 
	gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p5.patch 
	gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p6.patch 
	gaim-1.5.0-smileys-logtype-p1.patch 
	gaim-1.5.0-smileys-logtype-p2.patch 
	gaim-1.5.0-strip-html-status.patch 
	gaim-1.5.0-xmlnode-cleanup.patch 
	gaim-1.5.0-yahoo-chatroom-ignore-on-join.patch 
Log Message:
- Ensure that security opt flags are used (#165795)
- Many bug fixes from Peter Lawler (#171350)
  156: Fix Yahoo chatroom ignore on join
  157: Fix Italian yahoo profiles
  158: Strip HTML from status
  159: xmlnode cleanup
  160: Fix crash on non-terminated strings
  161: silc-close-gaim_request-window-prpl-disconnect-p1
  162: silc-close-gaim_request-window-prpl-disconnect-p2
  163: silc-close-gaim_request-window-prpl-disconnect-p3
  164: silc-close-gaim_request-window-prpl-disconnect-p4
  165: silc-close-gaim_request-window-prpl-disconnect-p5
  166: silc-close-gaim_request-window-prpl-disconnect-p6
  167: MSN data corruption fix
  168: msn-kill-convo-close-timeout-notices-p1
  169: msn-kill-convo-close-timeout-notices-p2
  170: msn-kill-convo-close-timeout-notices-p3
  171: forceful-connection_disconnect-not-wipe-password
  172: Clipboard leak and history scrolling fix
  173: smileys-logtype-p1
  174: smileys-logtype-p2
  175: Allow Italics in IRC
  176: Add more authors
  177: Update copyright
  178: Update HACKING doc
  179: Fix doc creation
  180: Fix AIM/ICQ Rate Limiting issue
- use upstream desktop file (except use generic name, because
  this is our default instant messaging client)
- fix FORTIFY_SOURCE on FC3
- always use -z relro and FORTIFY_SOURCE opt flags for FC3+ and RHEL4+
  (compiler simply ignores these flags if they are unsupported)



gaim-1.5.0-aim-rate-limiting.patch:
 oscar.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gaim-1.5.0-aim-rate-limiting.patch ---
http://cvs.sourceforge.net/viewcvs.py/gaim/gaim/src/protocols/oscar/oscar.c?r1=1.663.2.39&r2=1.663.2.40&diff_format=u
AIM/ICQ rate limiting fix

===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.663.2.39
retrieving revision 1.663.2.40
diff -u -r1.663.2.39 -r1.663.2.40
--- gaim/gaim/src/protocols/oscar/oscar.c	2005/09/06 14:26:45	1.663.2.39
+++ gaim/gaim/src/protocols/oscar/oscar.c	2005/10/15 16:50:30	1.663.2.40
@@ -5063,7 +5063,7 @@
 	 * too quickly.
 	 */
 	if (od->getinfotimer == 0)
-		od->getinfotimer = gaim_timeout_add(1200, gaim_reqinfo_timeout_cb, sess);
+		od->getinfotimer = gaim_timeout_add(10000, gaim_reqinfo_timeout_cb, sess);
 
 	return 1;
 }

gaim-1.5.0-authors.patch:
 AUTHORS |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

--- NEW FILE gaim-1.5.0-authors.patch ---
Index: AUTHORS
===================================================================
RCS file: /cvsroot/gaim/gaim/AUTHORS,v
retrieving revision 1.27.2.3
retrieving revision 1.27.2.4
diff -u -d -p -r1.27.2.3 -r1.27.2.4
--- AUTHORS	27 Apr 2005 05:31:29 -0000	1.27.2.3
+++ AUTHORS	25 Aug 2005 08:04:23 -0000	1.27.2.4
@@ -6,13 +6,6 @@ We've got an IRC room now too, #gaim on 
 Active Developers:
 ------------------
 
-Rob Flynn <gaim at robflynn.com> - Maintainer
-	AIM: RobFlynn
-	ICQ: 1358450
-	MSN: rmf410 at hotmail.com
-	Yahoo: IBRRob
-	Jabber: robflynn at jabber.org
-
 Sean Egan <bj91704 at binghamton.edu> - Lead Developer
 	AIM: SeanEgn
 	ICQ: 96642211
@@ -31,6 +24,7 @@ Luke 'LSchiere' Schierer - Support
 Etan 'deryni' Reisner - Developer
 Stu 'nosnilmot' Tomlinson - Developer
 Gary 'grim' Kramlich - Developer
+Richard 'rlaager' Laager
 
 Crazy Patch Writers:
 --------------------
@@ -38,12 +32,14 @@ Crazy Patch Writers:
 Ka-Hing 'javabsp' Cheung
 Felipe 'shx' Contreras
 Decklin Foster
+Peter 'Bleeter' Lawler
 Robert 'Robot101' McQueen
 Benjamin Miller
 Kevin 'SimGuy' Stange
 
 Retired:
 --------
+Rob Flynn <gaim at robflynn.com> - Former Maintainer
 Adam Fritzler - Former libfaim Maintainer
 Eric Warmenhoven <eric at warmenhoven.org> - Former Lead Developer
 Jim Duchek <jimduchek at ou.edu> - Former Maintainer

gaim-1.5.0-clipboard-leak-history-scroll.patch:
 gtkimhtml.c |   37 ++++++++++++++++++++++++++++++++-----
 1 files changed, 32 insertions(+), 5 deletions(-)

--- NEW FILE gaim-1.5.0-clipboard-leak-history-scroll.patch ---
Index: src/gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.364.2.25
retrieving revision 1.364.2.27
diff -u -d -p -r1.364.2.25 -r1.364.2.27
--- src/gtkimhtml.c	7 Jul 2005 21:03:13 -0000	1.364.2.25
+++ src/gtkimhtml.c	28 Aug 2005 16:24:04 -0000	1.364.2.27
@@ -92,6 +92,7 @@ static void hijack_menu_cb(GtkIMHtml *im
 static void paste_received_cb (GtkClipboard *clipboard, GtkSelectionData *selection_data, gpointer data);
 static void paste_plaintext_received_cb (GtkClipboard *clipboard, const gchar *text, gpointer data);
 static void imhtml_paste_insert(GtkIMHtml *imhtml, const char *text, gboolean plaintext);
+static void gtk_imhtml_mapped_scroll_to_end(GtkWidget *imhtml, gpointer data);
 
 /* POINT_SIZE converts from AIM font sizes to a point size scale factor. */
 #define MAX_FONT_SIZE 7
@@ -193,8 +194,9 @@ clipboard_win32_to_html(char *clipboard)
 static gchar *
 clipboard_html_to_win32(char *html) {
 	int length;
-	gchar *ret;
 	GString *clipboard;
+	gchar *tmp;
+	gchar *ret;
 
 	if (html == NULL)
 		return NULL;
@@ -202,9 +204,13 @@ clipboard_html_to_win32(char *html) {
 	length = strlen(html);
 	clipboard = g_string_new ("Version:1.0\r\n");
 	g_string_append(clipboard, "StartHTML:0000000105\r\n");
-	g_string_append(clipboard, g_strdup_printf("EndHTML:%010d\r\n", 147 + length));
+	tmp = g_strdup_printf("EndHTML:%010d\r\n", 147 + length);
+	g_string_append(clipboard, tmp);
+	g_free(tmp);
 	g_string_append(clipboard, "StartFragment:0000000127\r\n");
-	g_string_append(clipboard, g_strdup_printf("EndFragment:%010d\r\n", 127 + length));
+	tmp = g_strdup_printf("EndFragment:%010d\r\n", 127 + length);
+	g_string_append(clipboard, tmp);
+	g_free(tmp);
 	g_string_append(clipboard, "<!--StartFragment-->\r\n");
 	g_string_append(clipboard, html);
 	g_string_append(clipboard, "\r\n<!--EndFragment-->");
@@ -1130,6 +1136,7 @@ static void gtk_imhtml_init (GtkIMHtml *
 			g_free, (GDestroyNotify)gtk_smiley_tree_destroy);
 	imhtml->default_smilies = gtk_smiley_tree_new();
 
+	g_signal_connect_after(G_OBJECT(imhtml), "map", G_CALLBACK(gtk_imhtml_mapped_scroll_to_end), imhtml);
 	g_signal_connect(G_OBJECT(imhtml), "size-allocate", G_CALLBACK(gtk_size_allocate_cb), NULL);
 	g_signal_connect(G_OBJECT(imhtml), "motion-notify-event", G_CALLBACK(gtk_motion_event_notify), NULL);
 	g_signal_connect(G_OBJECT(imhtml), "leave-notify-event", G_CALLBACK(gtk_leave_event_notify), NULL);
@@ -2058,6 +2065,8 @@ void gtk_imhtml_append_text_with_images 
 	}
 }
 
+#define SCROLL_TO_END_PENDING "gtk_imhtml_scroll_to_end_pending"
+
 gboolean scroll_idle_cb(gpointer data)
 {
 	GtkTextView *imhtml = data;
@@ -2065,15 +2074,33 @@ gboolean scroll_idle_cb(gpointer data)
 
 	adj = GTK_TEXT_VIEW(imhtml)->vadjustment;
 	gtk_adjustment_set_value(adj, adj->upper - adj->page_size);
+	GTK_IMHTML(imhtml)->scroll_src = 0;
 
 	return FALSE;
 }
 
+static void gtk_imhtml_mapped_scroll_to_end(GtkWidget *imhtml, gpointer data)
+{
+	if (g_object_get_data(G_OBJECT(imhtml), SCROLL_TO_END_PENDING)) {
+		g_object_set_data(G_OBJECT(imhtml), SCROLL_TO_END_PENDING, GINT_TO_POINTER(0));
+		if (GTK_IMHTML(imhtml)->scroll_src)
+			g_source_remove(GTK_IMHTML(imhtml)->scroll_src);
+		
+		GTK_IMHTML(imhtml)->scroll_src = g_idle_add_full(GTK_TEXT_VIEW_PRIORITY_VALIDATE + 10, scroll_idle_cb, imhtml, NULL);
+	}
+}
+
 void gtk_imhtml_scroll_to_end(GtkIMHtml *imhtml)
 {
-	if (imhtml->scroll_src)
+	if (imhtml->scroll_src) {
 		g_source_remove(imhtml->scroll_src);
-	imhtml->scroll_src = g_idle_add_full(GTK_TEXT_VIEW_PRIORITY_VALIDATE + 10, scroll_idle_cb, imhtml, NULL);
+		imhtml->scroll_src = 0;
+	}
+
+	if (!GTK_WIDGET(imhtml)->window || !gdk_window_is_visible(GTK_WIDGET(imhtml)->window))
+		g_object_set_data(G_OBJECT(imhtml), SCROLL_TO_END_PENDING, GINT_TO_POINTER(1));
+	else
+		imhtml->scroll_src = g_idle_add_full(GTK_TEXT_VIEW_PRIORITY_VALIDATE + 10, scroll_idle_cb, imhtml, NULL);
 }
 
 void gtk_imhtml_insert_html_at_iter(GtkIMHtml        *imhtml,

gaim-1.5.0-copyright.patch:
 COPYRIGHT |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE gaim-1.5.0-copyright.patch ---
Index: COPYRIGHT
===================================================================
RCS file: /cvsroot/gaim/gaim/COPYRIGHT,v
retrieving revision 1.86.2.31
retrieving revision 1.86.2.36
diff -u -d -p -r1.86.2.31 -r1.86.2.36
--- COPYRIGHT	11 Aug 2005 19:25:26 -0000	1.86.2.31
+++ COPYRIGHT	31 Aug 2005 19:18:36 -0000	1.86.2.36
@@ -74,6 +74,7 @@ Evgueni V. Gavrilov
 Ignacy Gawedzki
 Caleb Gilmour
 Michael Golden
+Charlie Gordon
 Ryan C. Gordon
 Will Gorman
 Miah Gregory
@@ -100,6 +101,7 @@ Richard Laager
 Scott Lamb
 Dennis Lambe Jr.
 Joe LaPenna
+Steve Láposi
 Daniel Larsson
 Peter Lawler
 Ho-seok Lee
@@ -186,11 +188,13 @@ Philip Tellis
 Arun A. Tharuvai
 Cestonaro Thilo
 Douglas (douglaswth) Thrift
+Jeffery To
 Warren Togami
 Stu Tomlinson
 Bill Tompkins
 Tom Tromey
 Chris Toshok
+Ken Tossell
 Junichi Uekawa
 István Váradi
 David Vermeille
@@ -210,4 +214,5 @@ Jared Yanovich
 Timmy Yee
 Nickolai Zeldovich
 Marco Ziech
+Zmitrok
 Jaroen Zwartepoorte

gaim-1.5.0-crash-non-terminated-strings.patch:
 util.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE gaim-1.5.0-crash-non-terminated-strings.patch ---
Index: src/util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.325.2.26
retrieving revision 1.325.2.27
diff -u -d -p -r1.325.2.26 -r1.325.2.27
--- src/util.c	12 Aug 2005 00:53:33 -0000	1.325.2.26
+++ src/util.c	1 Sep 2005 04:21:31 -0000	1.325.2.27
@@ -2741,6 +2741,7 @@ url_fetched_cb(gpointer url_data, gint s
 		return;
 	}
 
+	/* Read in data, one byte at a time */
 	if (read(sock, &data, 1) > 0 || errno == EWOULDBLOCK)
 	{
 		if (errno == EWOULDBLOCK)
@@ -2752,7 +2753,8 @@ url_fetched_cb(gpointer url_data, gint s
 
 		gfud->len++;
 
-		if (gfud->len == gfud->data_len + 1)
+		/* If we've filled up our buffer then make it bigger */
+		if (gfud->len == gfud->data_len)
 		{
 			gfud->data_len += (gfud->data_len) / 2;
 
@@ -2760,6 +2762,7 @@ url_fetched_cb(gpointer url_data, gint s
 		}
 
 		gfud->webdata[gfud->len - 1] = data;
+		gfud->webdata[gfud->len] = '\0';
 
 		if (!gfud->startsaving)
 		{

gaim-1.5.0-doc-creation.patch:
 conversation-signals.dox |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gaim-1.5.0-doc-creation.patch ---
Index: doc/conversation-signals.dox
===================================================================
RCS file: /cvsroot/gaim/gaim/doc/conversation-signals.dox,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -d -p -r1.18 -r1.18.2.1
--- doc/conversation-signals.dox	24 Jul 2004 15:26:08 -0000	1.18
+++ doc/conversation-signals.dox	9 Sep 2005 04:02:24 -0000	1.18.2.1
@@ -429,7 +429,7 @@ void (*chat_invited_user)(GaimConversati
   @signalproto
 void (*chat_invited)(GaimAccount *account, const char *inviter,
                      const char *chat, const char *invite_message
-                     const GHastTable *components);
+                     const GHashTable *components);
   @endsignalproto
   @signaldesc
    Emitted when an account was invited to a chat.

gaim-1.5.0-forceful-connection_disconnect-not-wipe-password.patch:
 connection.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE gaim-1.5.0-forceful-connection_disconnect-not-wipe-password.patch ---
Index: src/connection.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/connection.c,v
retrieving revision 1.66
retrieving revision 1.66.2.3
diff -u -d -p -r1.66 -r1.66.2.3
--- src/connection.c	24 Aug 2004 22:08:53 -0000	1.66
+++ src/connection.c	20 Sep 2005 00:28:03 -0000	1.66.2.3
@@ -274,13 +274,13 @@ gaim_connection_disconnect_cb(gpointer d
 {
 	GaimAccount *account = data;
 	GaimConnection *gc = gaim_account_get_connection(account);
-
-	if (!gaim_account_get_remember_password(account))
-		gaim_account_set_password(account,NULL);
-
+	/* gaim_connection_disconnect() will wipe the password, which is usually fine, but
+	 * when we're knocked off forecfully, we'll want to reconnect easily. */
+	char *password = g_strdup(gaim_account_get_password(account));
 	if (gc)
 		gaim_connection_disconnect(gc);
-
+	gaim_account_set_password(account, password);
+	g_free(password);
 	return FALSE;
 }
 

gaim-1.5.0-hacking-doc.patch:
 HACKING |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

--- NEW FILE gaim-1.5.0-hacking-doc.patch ---
Index: HACKING
===================================================================
RCS file: /cvsroot/gaim/gaim/HACKING,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -u -d -p -r1.38 -r1.38.2.1
--- HACKING	8 Aug 2004 05:37:58 -0000	1.38
+++ HACKING	22 Aug 2005 21:59:14 -0000	1.38.2.1
@@ -1,6 +1,13 @@
-The majority of the below was written by Eric Warmenhoven way back in 
+Lots of this is pretty grossly out of date...
+Some of it might still be useful.  For coding style, your
+best bet is to browse through some of the files in src and
+emulate what you see there.
+--Mark
+
+
+The majority of the below was written by Eric Warmenhoven way back in
 antiquity. I have taken the liberty of attempting to PARTIALLY update
-it. I still think its helpful, but use it at your own risk. 
+it. I still think its helpful, but use it at your own risk.
 --Luke
 
 
@@ -40,13 +47,13 @@ You'll now have your normal gaim tree wi
 your life really simple, learn how CVS works. CVS is your friend.) To make
 a patch, just edit the files right there in that tree (don't bother with
 two trees, or even two copies of the same file). Then when you're ready to
-make your patch, simply run 'cvs diff -u >my.patch' and post it on 
+make your patch, simply run 'cvs diff -u >my.patch' and post it on
 sf.net/projects/gaim in the patches section.
 
-Some Documentation is available on the Gaim api if you run the command 
+Some Documentation is available on the Gaim api if you run the command
 $make docs
 after running ./configure (or ./autogen.sh). You will need doxygen and
-graphiz dot to generate these docs. 
+graphiz dot to generate these docs.
 
 CODING STYLE
 ============

gaim-1.5.0-it-yahoo_profile.patch:
 yahoo_profile.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE gaim-1.5.0-it-yahoo_profile.patch ---
Index: src/protocols/yahoo/yahoo_profile.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo_profile.c,v
retrieving revision 1.8.2.2
diff -u -p -r1.8.2.2 yahoo_profile.c
--- src/protocols/yahoo/yahoo_profile.c	30 Jun 2005 06:23:34 -0000	1.8.2.2
+++ src/protocols/yahoo/yahoo_profile.c	10 Nov 2005 18:21:09 -0000
@@ -125,7 +125,7 @@ static const profile_lang_node_t profile
 	{ ES_US, "Actualizada el  ",                                NULL },
 	{ FR_CA, "Derni\xe8re mise \xe0 jour", "http://cf.profiles.yahoo.com" },
 	{ FR_FR, "Derni\xe8re mise \xe0 jour",                           NULL },
-	{ IT,    "Ultimo aggiornamento ",                           NULL },
+	{ IT,    "Ultimo aggiornamento:",                                NULL },
 	{ JA,    "\xba\xc7\xbd\xaa\xb9\xb9\xbf\xb7\xc6\xfc\xa1\xa7",     NULL },
 	{ KO,    "\xb0\xbb\xbd\xc5\x20\xb3\xaf\xc2\xa5 ",           NULL },
 	{ NO,    "Sist oppdatert ",                                 NULL },
@@ -394,26 +394,26 @@ static const profile_strings_node_t prof
 		NULL
 	},
 	{ IT, "it", "ISO-8859-1",
-		"ID Yahoo!:",
+		"Yahoo! ID:",
 		"Non pubblica",
 		"Nessuna risposta",
-		"La mia e-mail",
+		"La mia e-mail:",
 		"Nome vero:",
 		"LocalitÃ :",
-		"Eta':",
+		"EtÃ :",
 		"Stato civile:",
 		"Sesso:",
 		"Occupazione:",
-		"Hobby:",
-		"Ultime notizie:",
+		"Hobby",
+		"Ultime notizie",
 		"Citazione preferita",
 		"Link",
 		"Nessuna home page specificata",
 		"Inizio:",
 		"Nessun link specificato",
-		"Link Preferiti 1:",
-		"Link Preferiti 2:",
-		"Link Preferiti 3:",
+		"Cool Link 1",
+		"Cool Link 2",
+		"Cool Link 3",
 		NULL
 	},
 	{ JA, "ja", "EUC-JP",

gaim-1.5.0-italics-ircs.patch:
 parse.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE gaim-1.5.0-italics-ircs.patch ---
Index: src/protocols/irc/parse.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/parse.c,v
retrieving revision 1.25.2.11
retrieving revision 1.25.2.12
diff -u -d -p -r1.25.2.11 -r1.25.2.12
--- src/protocols/irc/parse.c	21 Jul 2005 03:51:20 -0000	1.25.2.11
+++ src/protocols/irc/parse.c	26 Aug 2005 16:00:00 -0000	1.25.2.12
@@ -279,7 +279,7 @@ char *irc_mirc2html(const char *string)
 	const char *cur, *end;
 	char fg[3] = "\0\0", bg[3] = "\0\0";
 	int fgnum, bgnum;
-	int font = 0, bold = 0, underline = 0;
+	int font = 0, bold = 0, underline = 0, italic = 0;
 	GString *decoded = g_string_sized_new(strlen(string));
 
 	cur = string;
@@ -333,6 +333,16 @@ char *irc_mirc2html(const char *string)
 				decoded = g_string_append_c(decoded, '>');
 			}
 			break;
+		case '\011':
+			cur++;
+			if (!italic) {
+				decoded = g_string_append(decoded, "<I>");
+				italic = TRUE;
+			} else {
+				decoded = g_string_append(decoded, "</I>");
+				italic = FALSE;
+			}
+			break;
 		case '\037':
 			cur++;
 			if (!underline) {
@@ -353,6 +363,8 @@ char *irc_mirc2html(const char *string)
 		case '\000':
 			if (bold)
 				decoded = g_string_append(decoded, "</B>");
+			if (italic)
+				decoded = g_string_append(decoded, "</I>");
 			if (underline)
 				decoded = g_string_append(decoded, "</U>");
 			if (font)

gaim-1.5.0-msn-data-corruption-fix.patch:
 httpconn.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gaim-1.5.0-msn-data-corruption-fix.patch ---
Index: src/protocols/msn/httpconn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/httpconn.c,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -p -r1.1.2.8 -r1.1.2.9
--- src/protocols/msn/httpconn.c	24 Mar 2005 04:10:16 -0000	1.1.2.8
+++ src/protocols/msn/httpconn.c	25 Aug 2005 06:03:44 -0000	1.1.2.9
@@ -142,7 +142,7 @@ write_raw(MsnHttpConn *httpconn, const c
 
 	do
 	{
-		res = write(httpconn->fd, buf, buf_len);
+		res = write(httpconn->fd, buf + s, buf_len - s);
 		if (res >= 0)
 		{
 			s += res;

gaim-1.5.0-msn-kill-convo-close-timeout-notices-p1.patch:
 msn.c |   34 ++--------------------------------
 1 files changed, 2 insertions(+), 32 deletions(-)

--- NEW FILE gaim-1.5.0-msn-kill-convo-close-timeout-notices-p1.patch ---
Index: src/protocols/msn/msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.320.2.26
retrieving revision 1.320.2.27
diff -u -d -p -r1.320.2.26 -r1.320.2.27
--- src/protocols/msn/msn.c	14 May 2005 14:40:53 -0000	1.320.2.26
+++ src/protocols/msn/msn.c	21 Aug 2005 17:13:43 -0000	1.320.2.27
@@ -1800,34 +1800,6 @@ static gboolean msn_unload(GaimPlugin *p
 	return TRUE;
 }
 
-static GaimPluginPrefFrame *
-get_plugin_pref_frame(GaimPlugin *plugin)
-{
-	GaimPluginPrefFrame *frame;
-	GaimPluginPref *ppref;
-
-	frame = gaim_plugin_pref_frame_new();
-
-	ppref = gaim_plugin_pref_new_with_label(_("Conversations"));
-	gaim_plugin_pref_frame_add(frame, ppref);
-
-	ppref = gaim_plugin_pref_new_with_name_and_label(
-								"/plugins/prpl/msn/conv_close_notice",
-								_("Display conversation closed notices"));
-	gaim_plugin_pref_frame_add(frame, ppref);
-
-	ppref = gaim_plugin_pref_new_with_name_and_label(
-								"/plugins/prpl/msn/conv_timeout_notice",
-								_("Display timeout notices"));
-	gaim_plugin_pref_frame_add(frame, ppref);
-
-	return frame;
-}
-
-static GaimPluginUiInfo prefs_info = {
-	get_plugin_pref_frame
-};
-
 static GaimPluginProtocolInfo prpl_info =
 {
 	OPT_PROTO_MAIL_CHECK,
@@ -1917,7 +1889,7 @@ static GaimPluginInfo info =
 
 	NULL,                                             /**< ui_info        */
 	&prpl_info,                                       /**< extra_info     */
-	&prefs_info,                                      /**< prefs_info     */
+	NULL,                                             /**< prefs_info     */
 	msn_actions
 };
 
@@ -1940,9 +1912,7 @@ init_plugin(GaimPlugin *plugin)
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 											   option);
 
-	gaim_prefs_add_none("/plugins/prpl/msn");
-	gaim_prefs_add_bool("/plugins/prpl/msn/conv_close_notice",   TRUE);
-	gaim_prefs_add_bool("/plugins/prpl/msn/conv_timeout_notice", TRUE);
+	gaim_prefs_remove("/plugins/prpl/msn");
 }
 
 GAIM_INIT_PLUGIN(msn, init_plugin, info);

gaim-1.5.0-msn-kill-convo-close-timeout-notices-p2.patch:
 slplink.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE gaim-1.5.0-msn-kill-convo-close-timeout-notices-p2.patch ---
Index: src/protocols/msn/slplink.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/slplink.c,v
retrieving revision 1.12.2.14
retrieving revision 1.12.2.15
diff -u -d -p -r1.12.2.14 -r1.12.2.15
--- src/protocols/msn/slplink.c	2 Apr 2005 16:36:07 -0000	1.12.2.14
+++ src/protocols/msn/slplink.c	21 Aug 2005 17:13:43 -0000	1.12.2.15
@@ -384,6 +384,7 @@ msn_slplink_release_slpmsg(MsnSlpLink *s
 		msg->msnslp_header.session_id = slpmsg->session_id;
 		msg->msnslp_header.ack_id = slpmsg->ack_id;
 		msg->msnslp_header.ack_size = slpmsg->ack_size;
+		msg->msnslp_header.ack_sub_id = slpmsg->ack_sub_id;
 	}
 	else if (slpmsg->flags == 0x20 || slpmsg->flags == 0x1000030)
 	{

gaim-1.5.0-msn-kill-convo-close-timeout-notices-p3.patch:
 switchboard.c |   52 +---------------------------------------------------
 1 files changed, 1 insertion(+), 51 deletions(-)

--- NEW FILE gaim-1.5.0-msn-kill-convo-close-timeout-notices-p3.patch ---
Index: src/protocols/msn/switchboard.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/switchboard.c,v
retrieving revision 1.76.2.23
retrieving revision 1.76.2.24
diff -u -d -p -r1.76.2.23 -r1.76.2.24
--- src/protocols/msn/switchboard.c	10 Apr 2005 16:48:53 -0000	1.76.2.23
+++ src/protocols/msn/switchboard.c	21 Aug 2005 17:13:43 -0000	1.76.2.24
@@ -637,19 +637,8 @@ bye_cmd(MsnCmdProc *cmdproc, MsnCommand 
 	swboard = cmdproc->data;
 	user = cmd->params[0];
 
-#if 0
-	if (!(swboard->flag & MSN_SB_FLAG_IM))
-	{
-		/* TODO: This is a helper switchboard. It would be better if
-		 * swboard->conv is NULL, but it isn't. */
-		/* Umm? I think swboard->conv is NULL for all helper switchboards now? */
-		msn_switchboard_destroy(swboard);
-		return;
-	}
-#else
-	if (!(swboard->flag & MSN_SB_FLAG_IM))
+	if (!(swboard->flag & MSN_SB_FLAG_IM) && (swboard->conv != NULL))
 		gaim_debug_error("msn_switchboard", "bye_cmd: helper bug\n");
-#endif
 
 	if (swboard->conv == NULL)
 	{
@@ -668,45 +657,6 @@ bye_cmd(MsnCmdProc *cmdproc, MsnCommand 
 	else
 	{
 		/* This is a switchboard used for a im session */
-
-		char *str = NULL;
-
-		if (cmd->param_count == 2 && atoi(cmd->params[1]) == 1)
-		{
-			if (gaim_prefs_get_bool("/plugins/prpl/msn/conv_timeout_notice"))
-			{
-				str = g_strdup_printf(_("The conversation has become "
-										"inactive and timed out."));
-			}
-		}
-		else
-		{
-			if (gaim_prefs_get_bool("/plugins/prpl/msn/conv_close_notice"))
-			{
-				char *username;
-				GaimAccount *account;
-				GaimBuddy *b;
-
-				account = cmdproc->session->account;
-
-				if ((b = gaim_find_buddy(account, user)) != NULL)
-					username = gaim_escape_html(gaim_buddy_get_alias(b));
-				else
-					username = gaim_escape_html(user);
-
-				str = g_strdup_printf(_("%s has closed the conversation "
-										"window."), username);
-
-				g_free(username);
-			}
-		}
-
-		if (str != NULL)
-		{
-			msn_switchboard_report_user(swboard, GAIM_MESSAGE_SYSTEM, str);
-			g_free(str);
-		}
-
 		msn_switchboard_destroy(swboard);
 	}
 }

gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p1.patch:
 util.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p1.patch ---
Index: src/protocols/silc/util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/silc/util.c,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -d -p -r1.8.2.4 -r1.8.2.5
--- src/protocols/silc/util.c	15 Apr 2005 01:47:08 -0000	1.8.2.4
+++ src/protocols/silc/util.c	13 Aug 2005 00:41:40 -0000	1.8.2.5
@@ -329,7 +329,7 @@ void silcgaim_show_public_key(SilcGaim s
 
 	buf = g_string_free(s, FALSE);
 
-	gaim_request_action(NULL, _("Public Key Information"),
+	gaim_request_action(sg->gc, _("Public Key Information"),
 			    _("Public Key Information"),
 			    buf, 0, context, 1,
 			    _("Close"), callback);

gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p2.patch:
 silc.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p2.patch ---
Index: src/protocols/silc/silc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/silc/silc.c,v
retrieving revision 1.24.2.9
retrieving revision 1.24.2.10
diff -u -d -p -r1.24.2.9 -r1.24.2.10
--- src/protocols/silc/silc.c	9 May 2005 20:46:27 -0000	1.24.2.9
+++ src/protocols/silc/silc.c	13 Aug 2005 00:41:40 -0000	1.24.2.10
@@ -702,7 +702,7 @@ silcgaim_attrs(GaimPluginAction *action)
 	gaim_request_fields_add_group(fields, g);
 
 
-	gaim_request_fields(NULL, _("User Online Status Attributes"),
+	gaim_request_fields(gc, _("User Online Status Attributes"),
 			    _("User Online Status Attributes"),
 			    _("You can let other users see your online status information "
 			      "and your personal information. Please fill the information "

gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p3.patch:
 pk.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p3.patch ---
Index: src/protocols/silc/pk.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/silc/pk.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -p -r1.1.2.2 -r1.1.2.3
--- src/protocols/silc/pk.c	10 Feb 2005 00:07:35 -0000	1.1.2.2
+++ src/protocols/silc/pk.c	13 Aug 2005 00:41:40 -0000	1.1.2.3
@@ -112,7 +112,7 @@ static void silcgaim_verify_ask(const ch
 		   _("Fingerprint and babbleprint for the %s key are:\n\n"
 		     "%s\n%s\n"), entity, fingerprint, babbleprint);
 
-	gaim_request_action(NULL, _("Verify Public Key"), tmp, tmp2, 
+	gaim_request_action(verify->client->application, _("Verify Public Key"), tmp, tmp2, 
 						GAIM_DEFAULT_ACTION_NONE, verify, 3,
 			    _("Yes"), G_CALLBACK(silcgaim_verify_cb),
 			    _("No"), G_CALLBACK(silcgaim_verify_cb),

gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p4.patch:
 ops.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p4.patch ---
Index: src/protocols/silc/ops.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/silc/ops.c,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -u -d -p -r1.18.2.3 -r1.18.2.4
--- src/protocols/silc/ops.c	20 Apr 2005 03:55:17 -0000	1.18.2.3
+++ src/protocols/silc/ops.c	13 Aug 2005 00:41:40 -0000	1.18.2.4
@@ -1075,7 +1075,7 @@ silc_command_reply(SilcClient client, Si
 			buf = g_string_free(s, FALSE);
 #if 0 /* XXX for now, let's not show attrs here */
 			if (client_entry->attrs)
-				gaim_request_action(NULL, _("User Information"),
+				gaim_request_action(gc, _("User Information"),
 						_("User Information"),
 						buf, 1, client_entry, 2,
 						_("OK"), G_CALLBACK(silcgaim_whois_more),
@@ -1694,7 +1694,7 @@ silc_ask_passphrase(SilcClient client, S
 		return;
 	internal->completion = completion;
 	internal->context = context;
-	gaim_request_input(NULL, _("Passphrase"), NULL,
+	gaim_request_input(client->application, _("Passphrase"), NULL,
 			   _("Passphrase required"), NULL, FALSE, TRUE, NULL,
 			   _("OK"), G_CALLBACK(silc_ask_passphrase_cb),
 			   _("Cancel"), G_CALLBACK(silc_ask_passphrase_cb),

gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p5.patch:
 chat.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p5.patch ---
Index: src/protocols/silc/chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/silc/chat.c,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -d -p -r1.17 -r1.17.2.1
--- src/protocols/silc/chat.c	31 Aug 2004 01:45:11 -0000	1.17
+++ src/protocols/silc/chat.c	13 Aug 2005 00:41:40 -0000	1.17.2.1
@@ -285,7 +285,7 @@ silcgaim_chat_chpk_cb(SilcGaimChauth sgc
 	f = gaim_request_fields_get_field(fields, "list");
 	if (!gaim_request_field_list_get_selected(f)) {
 		/* Add new public key */
-		gaim_request_file(NULL, _("Open Public Key..."), NULL, FALSE,
+		gaim_request_file(sg->gc, _("Open Public Key..."), NULL, FALSE,
 				  G_CALLBACK(silcgaim_chat_chpk_add),
 				  G_CALLBACK(silcgaim_chat_chpk_cancel), sgc);
 		return;
@@ -453,7 +453,7 @@ void silcgaim_chat_chauth_show(SilcGaim 
 	}
 
 	gaim_request_field_list_set_multi_select(f, FALSE);
-	gaim_request_fields(NULL, _("Channel Authentication"),
+	gaim_request_fields(sg->gc, _("Channel Authentication"),
 			    _("Channel Authentication"), t, fields,
 			    _("Add / Remove"), G_CALLBACK(silcgaim_chat_chpk_cb),
 			    _("OK"), G_CALLBACK(silcgaim_chat_chauth_ok), sgc);
@@ -589,7 +589,7 @@ silcgaim_chat_prv(GaimBlistNode *node, g
 	g_snprintf(tmp, sizeof(tmp),
 		   _("Please enter the %s channel private group name and passphrase."),
 		   p->channel);
-	gaim_request_fields(NULL, _("Add Channel Private Group"), NULL, tmp, fields,
+	gaim_request_fields(gc, _("Add Channel Private Group"), NULL, tmp, fields,
 			    _("Add"), G_CALLBACK(silcgaim_chat_prv_add),
 			    _("Cancel"), G_CALLBACK(silcgaim_chat_prv_cancel), p);
 }
@@ -716,7 +716,7 @@ silcgaim_chat_ulimit(GaimBlistNode *node
 	s->channel = ch;
 	s->sg = sg;
 	g_snprintf(tmp, sizeof(tmp), "%d", (int)channel->user_limit);
-	gaim_request_input(NULL, _("User Limit"), NULL,
+	gaim_request_input(gc, _("User Limit"), NULL,
 			   _("Set user limit on channel. Set to zero to reset user limit."),
 			   tmp, FALSE, FALSE, NULL,
 			   _("OK"), G_CALLBACK(silcgaim_chat_ulimit_cb),

gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p6.patch:
 buddy.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p6.patch ---
Index: src/protocols/silc/buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/silc/buddy.c,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -d -p -r1.16.2.2 -r1.16.2.3
--- src/protocols/silc/buddy.c	10 Feb 2005 00:07:35 -0000	1.16.2.2
+++ src/protocols/silc/buddy.c	13 Aug 2005 00:41:40 -0000	1.16.2.3
@@ -302,7 +302,7 @@ void silcgaim_buddy_keyagr_request(SilcC
 		a->hostname = strdup(hostname);
 	a->port = port;
 
-	gaim_request_action(NULL, _("Key Agreement Request"), tmp,
+	gaim_request_action(client->application, _("Key Agreement Request"), tmp,
 			    hostname ? tmp2 : NULL, 1, a, 2,
 			    _("Yes"), G_CALLBACK(silcgaim_buddy_keyagr_request_cb),
 			    _("No"), G_CALLBACK(silcgaim_buddy_keyagr_request_cb));
@@ -455,7 +455,7 @@ silcgaim_buddy_privkey(GaimConnection *g
 	p->client = sg->client;
 	p->conn = sg->conn;
 	p->client_id = *clients[0]->id;
-        gaim_request_input(NULL, _("IM With Password"), NULL,
+        gaim_request_input(gc, _("IM With Password"), NULL,
                            _("Set IM Password"), NULL, FALSE, TRUE, NULL,
                            _("OK"), G_CALLBACK(silcgaim_buddy_privkey_cb),
                            _("Cancel"), G_CALLBACK(silcgaim_buddy_privkey_cb),
@@ -1020,7 +1020,7 @@ silcgaim_add_buddy_ask_pk_cb(SilcGaimBud
 	}
 
 	/* Open file selector to select the public key. */
-	gaim_request_file(NULL, _("Open..."), NULL, FALSE,
+	gaim_request_file(r->client->application, _("Open..."), NULL, FALSE,
 			  G_CALLBACK(silcgaim_add_buddy_ask_import),
 			  G_CALLBACK(silcgaim_add_buddy_ask_pk_cancel), r);
 }
@@ -1031,7 +1031,7 @@ silcgaim_add_buddy_ask_pk(SilcGaimBuddyR
 	char tmp[512];
 	g_snprintf(tmp, sizeof(tmp), _("The %s buddy is not present in the network"),
 		   r->b->name);
-	gaim_request_action(NULL, _("Add Buddy"), tmp,
+	gaim_request_action(r->client->application, _("Add Buddy"), tmp,
 			    _("To add the buddy you must import his/her public key. "
 			      "Press Import to import a public key."), 0, r, 2,
 			    _("Cancel"), G_CALLBACK(silcgaim_add_buddy_ask_pk_cb),
@@ -1121,7 +1121,7 @@ silcgaim_add_buddy_select(SilcGaimBuddyR
 		gaim_request_field_list_add(f, tmp, clients[i]);
 	}
 
-	gaim_request_fields(NULL, _("Add Buddy"),
+	gaim_request_fields(r->client->application, _("Add Buddy"),
 				_("Select correct user"),
 				r->pubkey_search
 					? _("More than one user was found with the same public key. Select "

gaim-1.5.0-smileys-logtype-p1.patch:
 gtklog.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE gaim-1.5.0-smileys-logtype-p1.patch ---
Index: src/gtklog.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtklog.c,v
retrieving revision 1.22.2.3
retrieving revision 1.22.2.4
diff -u -d -p -r1.22.2.3 -r1.22.2.4
--- src/gtklog.c	12 Jun 2005 05:59:36 -0000	1.22.2.3
+++ src/gtklog.c	16 Aug 2005 17:53:37 -0000	1.22.2.4
@@ -198,6 +198,8 @@ static void log_select_cb(GtkTreeSelecti
 	title = title_utf8;
 	gtk_window_set_title(GTK_WINDOW(viewer->window), title);
 	gtk_imhtml_clear(GTK_IMHTML(viewer->imhtml));
+	gtk_imhtml_set_protocol_name(GTK_IMHTML(viewer->imhtml),
+				     gaim_account_get_protocol_name(log->account));
 	gtk_imhtml_append_text(GTK_IMHTML(viewer->imhtml), read,
 			       GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_TITLE | GTK_IMHTML_NO_SCROLL |
 			       ((flags & GAIM_LOG_READ_NO_NEWLINE) ? GTK_IMHTML_NO_NEWLINE : 0));

gaim-1.5.0-smileys-logtype-p2.patch:
 log.c |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

--- NEW FILE gaim-1.5.0-smileys-logtype-p2.patch ---
Index: src/log.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/log.c,v
retrieving revision 1.103.2.7
retrieving revision 1.103.2.8
diff -u -d -p -r1.103.2.7 -r1.103.2.8
--- src/log.c	12 Jul 2005 04:27:41 -0000	1.103.2.7
+++ src/log.c	16 Aug 2005 17:53:37 -0000	1.103.2.8
@@ -562,7 +562,6 @@ static void html_logger_write(GaimLog *l
 	char *msg_fixed;
 	char date[64];
 	GaimPlugin *plugin = gaim_find_prpl(gaim_account_get_protocol_id(log->account));
-	const char *prpl_name = plugin->info->name;
 	struct generic_logger_data *data = log->logger_data;
 
 	if(!data) {
@@ -612,18 +611,18 @@ static void html_logger_write(GaimLog *l
 				fprintf(data->file, _("<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"), date, from, msg_fixed);
 		} else if (type & GAIM_MESSAGE_RECV) {
 			if(gaim_message_meify(msg_fixed, -1))
-				fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> <font sml=\"%s\">%s</font><br/>\n",
-						date, from, prpl_name, msg_fixed);
+				fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> %s<br/>\n",
+						date, from, msg_fixed);
 			else
-				fprintf(data->file, "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s:</b></font> <font sml=\"%s\">%s</font><br/>\n",
-						date, from, prpl_name, msg_fixed);
+				fprintf(data->file, "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s:</b></font> %s<br/>\n",
+						date, from, msg_fixed);
 		} else if (type & GAIM_MESSAGE_SEND) {
 			if(gaim_message_meify(msg_fixed, -1))
-				fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> <font sml=\"%s\">%s</font><br/>\n",
-						date, from, prpl_name, msg_fixed);
+				fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> %s<br/>\n",
+						date, from, msg_fixed);
 			else
-				fprintf(data->file, "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s:</b></font> <font sml=\"%s\">%s</font><br/>\n",
-						date, from, prpl_name, msg_fixed);
+				fprintf(data->file, "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s:</b></font> %s<br/>\n",
+						date, from, msg_fixed);
 		}
 	}
 

gaim-1.5.0-strip-html-status.patch:
 yahoo.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gaim-1.5.0-strip-html-status.patch ---
Index: src/protocols/yahoo/yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.273.2.27
retrieving revision 1.273.2.28
diff -u -d -p -r1.273.2.27 -r1.273.2.28
--- src/protocols/yahoo/yahoo.c	4 Aug 2005 00:57:44 -0000	1.273.2.27
+++ src/protocols/yahoo/yahoo.c	11 Oct 2005 04:35:48 -0000	1.273.2.28
@@ -3210,7 +3210,7 @@ static void yahoo_set_idle(GaimConnectio
 		yahoo_packet_hash(pkt, 10, buf);
 		if (gc->away && yd->current_status == YAHOO_STATUS_CUSTOM) {
 			msg = yahoo_string_encode(gc, gc->away, NULL);
-			msg2 = gaim_unescape_html(msg);
+			msg2 = gaim_markup_strip_html(msg);
 			yahoo_packet_hash(pkt, 19, msg2);
 			if (idle)
 				yahoo_packet_hash(pkt, 47, "2");

gaim-1.5.0-xmlnode-cleanup.patch:
 xmlnode.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE gaim-1.5.0-xmlnode-cleanup.patch ---
Index: src/xmlnode.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/xmlnode.c,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -p -r1.9 -r1.9.2.1
--- src/xmlnode.c	23 Aug 2004 05:17:59 -0000	1.9
+++ src/xmlnode.c	31 Aug 2005 18:38:23 -0000	1.9.2.1
@@ -395,11 +395,15 @@ static GMarkupParser xmlnode_parser = {
 
 xmlnode *xmlnode_from_str(const char *str, size_t size)
 {
-	struct _xmlnode_parser_data *xpd = g_new0(struct _xmlnode_parser_data, 1);
+	struct _xmlnode_parser_data *xpd;
 	xmlnode *ret;
 	GMarkupParseContext *context;
-	size_t real_size = size == -1 ? strlen(str) : size;
+	size_t real_size;
 
+	g_return_val_if_fail(str != NULL, NULL);
+
+	real_size = size == -1 ? strlen(str) : size;
+	xpd = g_new0(struct _xmlnode_parser_data, 1);
 	context = g_markup_parse_context_new(&xmlnode_parser, 0, xpd, NULL);
 
 	if(!g_markup_parse_context_parse(context, str, real_size, NULL)) {

gaim-1.5.0-yahoo-chatroom-ignore-on-join.patch:
 yahoochat.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE gaim-1.5.0-yahoo-chatroom-ignore-on-join.patch ---
Index: src/protocols/yahoo/yahoochat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoochat.c,v
retrieving revision 1.25.2.8
retrieving revision 1.25.2.9
diff -u -d -p -r1.25.2.8 -r1.25.2.9
--- src/protocols/yahoo/yahoochat.c	30 Jun 2005 05:43:44 -0000	1.25.2.8
+++ src/protocols/yahoo/yahoochat.c	12 Sep 2005 14:46:47 -0000	1.25.2.9
@@ -354,7 +354,6 @@ void yahoo_process_chat_join(GaimConnect
 	GSList *l;
 	GList *members = NULL;
 	GList *roomies = NULL;
-	GaimConversationUiOps *ops;
 	char *room = NULL;
 	char *topic = NULL;
 	char *someid, *someotherid, *somebase64orhashosomething, *somenegativenumber;
@@ -453,22 +452,23 @@ void yahoo_process_chat_join(GaimConnect
 		yahoo_chat_add_users(GAIM_CONV_CHAT(c), members);
 	}
 
-	ops = gaim_conversation_get_ui_ops(c);
 
-	for (l = account->deny; l != NULL; l = l->next) {
-		for (roomies = members; roomies; roomies = roomies->next) {
-			if (!gaim_utf8_strcasecmp((char *)l->data, roomies->data)) {
-				gaim_debug_info("yahoo", "Ignoring room member %s in room %s\n" ,roomies->data, room);
-				gaim_conv_chat_ignore(GAIM_CONV_CHAT(c),roomies->data);
-				ops->chat_update_user((c), roomies->data);
+	if (account->deny && c) {
+		GaimConversationUiOps *ops = gaim_conversation_get_ui_ops(c);
+		for (l = account->deny; l != NULL; l = l->next) {
+			for (roomies = members; roomies; roomies = roomies->next) {
+				if (!gaim_utf8_strcasecmp((char *)l->data, roomies->data)) {
+					gaim_debug_info("yahoo", "Ignoring room member %s in room %s\n" , roomies->data, room ? room : "");
+					gaim_conv_chat_ignore(GAIM_CONV_CHAT(c),roomies->data);
+					ops->chat_update_user(c, roomies->data);
+				}
 			}
 		}
 	}
 	g_list_free(roomies);
 	g_list_free(members);
 	g_free(room);
-	if (topic)
-		g_free(topic);
+	g_free(topic);
 }
 
 void yahoo_process_chat_exit(GaimConnection *gc, struct yahoo_packet *pkt)


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-4/gaim.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- gaim.spec	12 Aug 2005 04:37:55 -0000	1.91
+++ gaim.spec	11 Nov 2005 15:46:44 -0000	1.92
@@ -13,7 +13,7 @@
 
 Name:		gaim
 Version:	1.5.0
-Release:	1.fc4
+Release:	9.fc4
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -35,7 +35,6 @@
 Source1:	gaim-fedora-prefs.xml
 
 ## Patches 0-99: Fedora specific or upstream wont accept
-Patch0:		gaim-desktop.patch
 # to be replaced by upstream fix
 Patch4:		gaim-0.76-xinput.patch
 Patch5:		gaim-1.3.1-PIE.patch
@@ -43,7 +42,31 @@
 Patch6:		gaim-1.0.1-naive-gnome-check.patch
 
 ## Patches 100-199: Upstream CVS Backports
-#Patch155: gaim-1.4.0-mailto-parse-crash-zephyr.patch
+Patch156: gaim-1.5.0-yahoo-chatroom-ignore-on-join.patch
+Patch157: gaim-1.5.0-it-yahoo_profile.patch
+Patch158: gaim-1.5.0-strip-html-status.patch
+Patch159: gaim-1.5.0-xmlnode-cleanup.patch
+Patch160: gaim-1.5.0-crash-non-terminated-strings.patch
+Patch161: gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p1.patch
+Patch162: gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p2.patch
+Patch163: gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p3.patch
+Patch164: gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p4.patch
+Patch165: gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p5.patch
+Patch166: gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p6.patch
+Patch167: gaim-1.5.0-msn-data-corruption-fix.patch
+Patch168: gaim-1.5.0-msn-kill-convo-close-timeout-notices-p1.patch
+Patch169: gaim-1.5.0-msn-kill-convo-close-timeout-notices-p2.patch
+Patch170: gaim-1.5.0-msn-kill-convo-close-timeout-notices-p3.patch
+Patch171: gaim-1.5.0-forceful-connection_disconnect-not-wipe-password.patch
+Patch172: gaim-1.5.0-clipboard-leak-history-scroll.patch
+Patch173: gaim-1.5.0-smileys-logtype-p1.patch
+Patch174: gaim-1.5.0-smileys-logtype-p2.patch
+Patch175: gaim-1.5.0-italics-ircs.patch
+Patch176: gaim-1.5.0-authors.patch
+Patch177: gaim-1.5.0-copyright.patch
+Patch178: gaim-1.5.0-hacking-doc.patch
+Patch179: gaim-1.5.0-doc-creation.patch
+Patch180: gaim-1.5.0-aim-rate-limiting.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -103,13 +126,36 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %patch4 -p1
 #patch5 happens after configure, yes this sucks
 %patch6 -p1
 
 # CVS backports go here
-#%patch155 -p2
+%patch156 -p0
+%patch157 -p0
+%patch158 -p0
+%patch159 -p0
+%patch160 -p0
+%patch161 -p0
+%patch162 -p0
+%patch163 -p0
+%patch164 -p0
+%patch165 -p0
+%patch166 -p0
+%patch167 -p0
+%patch168 -p0
+%patch169 -p0
+%patch170 -p0
+%patch171 -p0
+%patch172 -p0
+%patch173 -p0
+%patch174 -p0
+%patch175 -p0
+%patch176 -p0
+%patch177 -p0
+%patch178 -p0
+%patch179 -p0
+%patch180 -p2
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}/%{version}-%{release}/g" configure
@@ -140,6 +186,13 @@
 
 # FC5+ automatic -fstack-protector-all switch
 export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
+# Use relro opt flag, compiler simply ignores this in < FC3
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wl,-z,relro"
+# Use FORTIFY_SOURCE if it is not already in opt flags
+# compiler simply ignores this in < FC3
+echo $RPM_OPT_FLAGS | grep -q "FORTIFY_SOURCE" || export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wp,-D_FORTIFY_SOURCE=2"
+export CFLAGS="$RPM_OPT_FLAGS"
+
 # disable tcl and tk because nobody uses it
 # gnutls is buggy so use mozilla-nss on all distributions
 %configure --disable-tcl --disable-tk --enable-gnutls=no --enable-nss=yes $WITH_KRB $WITH_SILC $WITH_PERL
@@ -151,7 +204,13 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/
+
+desktop-file-install --vendor gaim --delete-original       \
+  --add-category X-Red-Hat-Base                            \
+  --copy-generic-name-to-name                              \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
+  $RPM_BUILD_ROOT%{_datadir}/applications/gaim.desktop
+
 # remove libtool libraries and static libraries
 rm -f `find $RPM_BUILD_ROOT -name "*.la" -o -name "*.a"`
 # remove the old perllocal.pod file
@@ -207,6 +266,55 @@
 %endif
 
 %changelog
+* Thu Nov 10 2005 Warren Togami <wtogami at redhat.com> - 1:1.5.0-9
+- Ensure that security opt flags are used (#165795)
+- Many bug fixes from Peter Lawler (#171350)
+  156: Fix Yahoo chatroom ignore on join
+  157: Fix Italian yahoo profiles
+  158: Strip HTML from status
+  159: xmlnode cleanup
+  160: Fix crash on non-terminated strings
+  161: silc-close-gaim_request-window-prpl-disconnect-p1
+  162: silc-close-gaim_request-window-prpl-disconnect-p2
+  163: silc-close-gaim_request-window-prpl-disconnect-p3
+  164: silc-close-gaim_request-window-prpl-disconnect-p4
+  165: silc-close-gaim_request-window-prpl-disconnect-p5
+  166: silc-close-gaim_request-window-prpl-disconnect-p6
+  167: MSN data corruption fix
+  168: msn-kill-convo-close-timeout-notices-p1
+  169: msn-kill-convo-close-timeout-notices-p2
+  170: msn-kill-convo-close-timeout-notices-p3
+  171: forceful-connection_disconnect-not-wipe-password
+  172: Clipboard leak and history scrolling fix
+  173: smileys-logtype-p1
+  174: smileys-logtype-p2
+  175: Allow Italics in IRC
+  176: Add more authors
+  177: Update copyright
+  178: Update HACKING doc
+  179: Fix doc creation
+  180: Fix AIM/ICQ Rate Limiting issue
+
+* Thu Oct 13 2005 Ray Strode <rstrode at redhat.com> - 1:1.5.0-7
+- use upstream desktop file (except use generic name, because 
+  this is our default instant messaging client)
+
+* Tue Sep 27 2005 Warren Togami <wtogami at redhat.com> - 1:1.5.0-6
+- remove -Wno-pointer-sign, not sure why it was needed earlier
+- fix FORTIFY_SOURCE on FC3
+
+* Thu Sep 15 2005 Jeremy Katz <katzj at redhat.com> - 1:1.5.0-5
+- rebuild for new e-d-s
+
+* Sun Aug 21 2005 Peter Jones <pjones at redhat.cm> - 1:1.5.0-4
+- rebuild for new cairo, add -Wno-pointer-sign
+- add -Wno-pointer-sign until somebody maintaining this package makes it build
+  without it.
+
+* Sun Aug 14 2005 Warren Togami <wtogami at redhat.com> - 1:1.5.0-2
+- always use -z relro and FORTIFY_SOURCE opt flags for FC3+ and RHEL4+ 
+  (compiler simply ignores these flags if they are unsupported)
+
 * Thu Aug 11 2005 Warren Togami <wtogami at redhat.com> - 1:1.5.0-1
 - 1.5.0 security and bug fixes
   CAN-2005-2370 Gadu-Gadu memory alignment bug


