rpms/pidgin/F-7 pidgin-2.1.0-drag-and-drop-mouse-click-group-header.patch, NONE, 1.1 pidgin-2.1.0-gmail-notification-crash.patch, NONE, 1.1 pidgin-2.1.0-jabber-confirm-authentication-unencrypted-crash.patch, NONE, 1.1 pidgin.spec, 1.20, 1.21

[Warren Togami (wtogami)]

Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4237

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.1.0-drag-and-drop-mouse-click-group-header.patch 
	pidgin-2.1.0-gmail-notification-crash.patch 
	pidgin-2.1.0-jabber-confirm-authentication-unencrypted-crash.patch 
Log Message:
- Upstream fix backports
  115: gmail-notification-crash #2323
  117: drag-and-drop-mouse-click-group-header #2333
  118: jabber-confirm-authentication-unencrypted-crash #2493
- require exact version of libpurple (#250720)


pidgin-2.1.0-drag-and-drop-mouse-click-group-header.patch:

--- NEW FILE pidgin-2.1.0-drag-and-drop-mouse-click-group-header.patch ---
-----------------------------------------------------------------
Revision: 5618acb52bfd86c8ae9982aacffa80cbeffac9dc
Ancestor: ba067178bb873c4a4ce6c3434d4c5cd6cf087483
Author: seanegan at 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;
 }

pidgin-2.1.0-gmail-notification-crash.patch:

--- NEW FILE pidgin-2.1.0-gmail-notification-crash.patch ---
-----------------------------------------------------------------
Revision: eae06ba9f36c975ca944d7b246354b6a90073df9
Ancestor: c62d41eb896d55cf80abc8073cae63eeab0db492
Author: datallah at 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);
 

pidgin-2.1.0-jabber-confirm-authentication-unencrypted-crash.patch:

--- NEW FILE pidgin-2.1.0-jabber-confirm-authentication-unencrypted-crash.patch ---
-----------------------------------------------------------------
Revision: 1df2323d7e95b0cd94b5d253abffd806e9b68494
Ancestor: 5198e3d502cf72292ea563edd164a36d333835ee
Author: datallah at 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);


Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-7/pidgin.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pidgin.spec	2 Aug 2007 19:26:39 -0000	1.20
+++ pidgin.spec	15 Aug 2007 15:56:13 -0000	1.21
@@ -29,7 +29,7 @@
 
 Name:		pidgin
 Version:	2.1.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://pidgin.im/
@@ -56,6 +56,9 @@
 
 ## 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
@@ -66,6 +69,8 @@
 %define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999")
 BuildRequires:	glib2-devel
 Requires:       glib2 >= %{glib_ver}
+# Require exact libpurple
+Requires:       libpurple = %{version}-%{release}
 
 Requires(pre):  GConf2
 Requires(post): GConf2
@@ -282,6 +287,9 @@
 
 ## 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
@@ -493,6 +501,15 @@
 
 
 %changelog
+* Wed Aug 15 2007 Warren Togami <wtogami at redhat.com> - 2.1.0-2
+- Upstream fix backports
+  115: gmail-notification-crash #2323
+  117: drag-and-drop-mouse-click-group-header #2333
+  118: jabber-confirm-authentication-unencrypted-crash #2493
+
+* Mon Aug 6 2007 Warren Togami <wtogami at redhat.com>
+- require exact version of libpurple (#250720)
+
 * Mon Jul 30 2007 Stu Tomlinson <stu at nosnilmot.com> - 2.1.0-1
 - 2.1.0
 - Only include translations in libpurple instead of duplicating them in