From f3fb04c054cc81689d74df40010da1ee1486320b Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@fedoraproject.org>
Date: Aug 20 2007 20:06:31 +0000
Subject: 2.1.1


---

diff --git a/.cvsignore b/.cvsignore
index 8d355a4..b6d4c86 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pidgin-2.1.0.tar.bz2
+pidgin-2.1.1.tar.bz2
diff --git a/pidgin-2.1.0-drag-and-drop-mouse-click-group-header.patch b/pidgin-2.1.0-drag-and-drop-mouse-click-group-header.patch
deleted file mode 100644
index 5afd2e8..0000000
--- a/pidgin-2.1.0-drag-and-drop-mouse-click-group-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
------------------------------------------------------------------
-Revision: 5618acb52bfd86c8ae9982aacffa80cbeffac9dc
-Ancestor: ba067178bb873c4a4ce6c3434d4c5cd6cf087483
-Author: seanegan@pidgin.im
-Date: 2007-07-30T18:02:03
-Branch: im.pidgin.pidgin
-
-Modified files:
-        pidgin/gtkcellrendererexpander.c
-
-ChangeLog: 
-
-Let drag-and-drop get mouse clicks on group headers. Fixes #2333
-
-============================================================
---- pidgin/gtkcellrendererexpander.c	5b8b56220f5e94b903370926d9d77d81a3570ca8
-+++ pidgin/gtkcellrendererexpander.c	07a9e98cc50d5228a0fa9fee56b25f214aeb420d
-@@ -285,5 +285,5 @@ static gboolean pidgin_cell_renderer_exp
- 	else
- 		gtk_tree_view_expand_row(GTK_TREE_VIEW(widget),path,FALSE);
- 	gtk_tree_path_free(path);
--	return TRUE;
-+	return FALSE;
- }
diff --git a/pidgin-2.1.0-gmail-notification-crash.patch b/pidgin-2.1.0-gmail-notification-crash.patch
deleted file mode 100644
index e62ed1c..0000000
--- a/pidgin-2.1.0-gmail-notification-crash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
------------------------------------------------------------------
-Revision: eae06ba9f36c975ca944d7b246354b6a90073df9
-Ancestor: c62d41eb896d55cf80abc8073cae63eeab0db492
-Author: datallah@pidgin.im
-Date: 2007-07-30T22:36:20
-Branch: im.pidgin.pidgin
-
-Modified files:
-        libpurple/protocols/jabber/google.c
-
-ChangeLog: 
-
-Fix a stupid crash (that I introduced) that occurs when parsing gmail notifications. Fixes #2323
-
-============================================================
---- libpurple/protocols/jabber/google.c	a775804dde0650d9915fdbe431a94b7cae8354b8
-+++ libpurple/protocols/jabber/google.c	3b098e3137be8a73b8f0844428f917b6d1a10815
-@@ -119,8 +119,8 @@ jabber_gmail_parse(JabberStream *js, xml
- 	g_free(to_name);
- 	g_free(tos);
- 	g_free(froms);
--	for (; i >= 0; i--)
--		g_free(subjects[i]);
-+	for (; i > 0; i--)
-+		g_free(subjects[i - 1]);
- 	g_free(subjects);
- 	g_free(urls);
- 
diff --git a/pidgin-2.1.0-jabber-confirm-authentication-unencrypted-crash.patch b/pidgin-2.1.0-jabber-confirm-authentication-unencrypted-crash.patch
deleted file mode 100644
index 66f1258..0000000
--- a/pidgin-2.1.0-jabber-confirm-authentication-unencrypted-crash.patch
+++ /dev/null
@@ -1,26 +0,0 @@
------------------------------------------------------------------
-Revision: 1df2323d7e95b0cd94b5d253abffd806e9b68494
-Ancestor: 5198e3d502cf72292ea563edd164a36d333835ee
-Author: datallah@pidgin.im
-Date: 2007-08-10T13:28:12
-Branch: im.pidgin.pidgin
-
-Modified files:
-        libpurple/protocols/jabber/auth.c
-
-ChangeLog: 
-
-Fix null pointer deref when confirming authentication over unencrypted connection. Fixes #2493.
-
-============================================================
---- libpurple/protocols/jabber/auth.c	b92b524c8526cca9006c1e7258895603c6264c1e
-+++ libpurple/protocols/jabber/auth.c	c31c23a9578378726861ff31d5f0f926ba5500b9
-@@ -296,7 +296,7 @@ static void jabber_auth_start_cyrus(Jabb
- 					purple_request_yes_no(js->gc, _("Plaintext Authentication"),
- 							_("Plaintext Authentication"),
- 							msg,
--							2, js->gc->account, NULL, NULL, NULL,
-+							2, js->gc->account, NULL, NULL, js->gc->account,
- 							allow_cyrus_plaintext_auth,
- 							disallow_plaintext_auth);
- 					g_free(msg);
diff --git a/pidgin.spec b/pidgin.spec
index 7d52ca5..88510d8 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -28,8 +28,8 @@
 %define perl_devel_separated    1
 
 Name:		pidgin
-Version:	2.1.0
-Release:	2%{?dist}
+Version:	2.1.1
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://pidgin.im/
@@ -56,9 +56,6 @@ Source1:	purple-fedora-prefs.xml
 
 ## Patches 100+: To be Included in Future Upstream
 Patch113: pidgin-2.0.0-beta7-reread-resolvconf.patch
-Patch115: pidgin-2.1.0-gmail-notification-crash.patch
-Patch117: pidgin-2.1.0-drag-and-drop-mouse-click-group-header.patch
-Patch118: pidgin-2.1.0-jabber-confirm-authentication-unencrypted-crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -287,9 +284,6 @@ and plugins.
 
 ## Patches 100+: To be Included in Future Upstream
 %patch113 -p1
-%patch115 -p0
-%patch117 -p0
-%patch118 -p0
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}/%{version}-%{release}/g" configure
@@ -501,6 +495,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 20 2007 Warren Togami <wtogami@redhat.com> - 2.1.1-1
+- 2.1.1
+
 * Wed Aug 15 2007 Warren Togami <wtogami@redhat.com> - 2.1.0-2
 - Upstream fix backports
   115: gmail-notification-crash #2323
diff --git a/sources b/sources
index e3aa800..66fe466 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83f44bf9c076595967f7374c50250176  pidgin-2.1.0.tar.bz2
+eb29fecb2f3a6d4790f47ce8e658c07c  pidgin-2.1.1.tar.bz2