From 568769ba921762afb820af022fca4396b83a2ca5 Mon Sep 17 00:00:00 2001 From: Stu Tomlinson Date: May 20 2010 02:27:08 +0000 Subject: Remove accidentally duplicated patch --- diff --git a/pidgin-2.7.0-chatfilter.patch b/pidgin-2.7.0-chatfilter.patch deleted file mode 100644 index 605187b..0000000 --- a/pidgin-2.7.0-chatfilter.patch +++ /dev/null @@ -1,30 +0,0 @@ ------------------------------------------------------------------ -Revision: 13fbe0815f84d5b3c001947559f5818c10275f4c -Ancestor: cfe0e649dda34d9252d40d8f67e445336a247998 -Author: nosnilmot@pidgin.im -Date: 05/17/2010 01:11:01 AM -Branch: im.pidgin.pidgin - -Modified files: - pidgin/gtkblist.c - -ChangeLog: - -Prevent a null pointer dereference in chat_account_filter_func() if called -on a disconnected or disconnecting account. -This should fix https://bugzilla.redhat.com/show_bug.cgi?id=592750 - - -============================================================ ---- pidgin/gtkblist.c 59572bc5415328dec42852173febb8e6d216f911 -+++ pidgin/gtkblist.c cbe664829ff51113e1fda2ec2c6f1791a3b46c47 -@@ -942,6 +942,9 @@ chat_account_filter_func(PurpleAccount * - PurpleConnection *gc = purple_account_get_connection(account); - PurplePluginProtocolInfo *prpl_info = NULL; - -+ if (gc == NULL) -+ return FALSE; -+ - prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); - - return (prpl_info->chat_info != NULL); diff --git a/pidgin.spec b/pidgin.spec index a226c7b..d46fe3a 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -138,7 +138,6 @@ Patch102: pidgin-2.7.0-nulldref-592750.patch Patch103: pidgin-2.7.0-trayblink-11855.patch Patch104: pidgin-2.7.0-yahooraces.patch Patch105: pidgin-2.7.0-oscarcrash.patch -Patch106: pidgin-2.7.0-chatfilter.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Summary: A Gtk+ based multiprotocol instant messaging client @@ -414,7 +413,6 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}" %patch103 -p0 -b .trayblink %patch104 -p0 -b .yahooraces %patch105 -p0 -b .oscarcrash -%patch106 -p0 -b .chatfilter # Our preferences cp %{SOURCE1} prefs.xml