diff -u pidgin-2.5.5/debian/changelog pidgin-2.5.5/debian/changelog
--- pidgin-2.5.5/debian/changelog
+++ pidgin-2.5.5/debian/changelog
@@ -1,3 +1,11 @@
+pidgin (1:2.5.5-1ubuntu3) jaunty; urgency=low
+
+  * Backport fix from http://developer.pidgin.im/ticket/4845
+    to rate limit popups when AIM buddy list is unavailable
+    (LP: #345774)
+
+ -- Mackenzie Morgan <maco.m@ubuntu.com>  Sun, 22 Mar 2009 05:22:39 -0400
+
 pidgin (1:2.5.5-1ubuntu2) jaunty; urgency=low
 
   * Adding debian/patches/11_buddy_list_really_show.patch to make
only in patch2:
unchanged:
--- pidgin-2.5.5.orig/debian/patches/12_rate_limit_aim_blist_warning.patch
+++ pidgin-2.5.5/debian/patches/12_rate_limit_aim_blist_warning.patch
@@ -0,0 +1,16 @@
+--- pidgin/libpurple/protocols/oscar/oscar.c~	2009-03-22 05:14:51.000000000 -0400
++++ pidgin/libpurple/protocols/oscar/oscar.c	2009-03-22 05:17:51.000000000 -0400
+@@ -5027,10 +5027,11 @@
+ 	purple_debug_error("oscar", "ssi: SNAC error %hu\n", reason);
+ 
+ 	if (reason == 0x0005) {
+-		purple_notify_error(gc, NULL, _("Unable to Retrieve Buddy List"),
+-						  _("The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few minutes."));
+ 		if (od->getblisttimer > 0)
+ 			purple_timeout_remove(od->getblisttimer);
++		else
++			purple_notify_error(gc, NULL, _("Unable to Retrieve Buddy List"),
++							  _("The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few minutes."));
+ 		od->getblisttimer = purple_timeout_add(30000, purple_ssi_rerequestdata, od);
+ 		return 1;
+ 	}