rpm/pidgin
SHA256
1
0
Fork 0
forked from pool/pidgin
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=17

Browse Source
This commit is contained in:
OBS User unknown 2007-11-21 02:27:19 +00:00 committed by Git OBS Bridge
parent e2b1a9aee2
commit 97c962336c
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pidgin-directconn-argfix.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/libpurple/protocols/msn/directconn.c b/libpurple/protocols/msn/directconn.c
index e4f3d5d..93a978a 100644
--- a/libpurple/protocols/msn/directconn.c
+++ b/libpurple/protocols/msn/directconn.c
@@ -27,6 +27,7 @@
#include "slp.h"
#include "slpmsg.h"
+#include <eventloop.h>
/**************************************************************************
* Directconn Specific
**************************************************************************/
@@ -413,7 +414,8 @@ directconn_connect_cb(gpointer data, gint source, const gchar *error_message)
if (error_message)
purple_debug_error("msn", "Error making direct connection: %s\n", error_message);
- connect_cb(data, source, PURPLE_INPUT_READ);
+ /* connect_cb(data, source, PURPLE_INPUT_READ); */
+ connect_cb(data, source, error_message);
}
gboolean

5
pidgin.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 13 21:29:06 CET 2007 - maw@suse.de
- Add pidgin-directconn-argfix.patch.
-------------------------------------------------------------------
Thu Nov 8 22:38:28 CET 2007 - maw@suse.de

9
pidgin.spec
View File

@ -13,7 +13,7 @@
Name: pidgin
Summary: GTK+-Based Multiprotocol Instant Messaging Client
Version: 2.2.2
Release: 1
Release: 2
License: GPL v2 or later
Group: Productivity/Networking/Instant Messenger
Url: http://www.pidgin.im/
@ -28,6 +28,8 @@ Patch5: pidgin-nonblock-common2.patch
Patch7: pidgin-check.patch
Patch9: includes.patch
Patch10: pidgin-64bit-buildhack.patch
# PATCH-FIX-UPSTREAM: pidgin-directconn-argfix.patch
Patch11: pidgin-directconn-argfix.patch
# Can use external libzephyr
BuildRequires: cyrus-sasl-devel dbus-1-devel doxygen evolution-data-server-devel gnome-keyring-devel graphviz gtkspell-devel intltool libao-devel libbonobo-devel libgadu-devel libstdc++-devel libxml2-devel meanwhile-devel mono-devel mozilla-nspr-devel mozilla-nss-devel ncurses-devel perl-XML-Parser python sqlite-devel startup-notification-devel tk-devel update-desktop-files
# Product specific lines
@ -690,6 +692,7 @@ Authors:
%patch5 -p1
%patch7
%patch9 -p1
%patch11 -p1
# Change Myanmar/Myanmar to Myanmar:
rename my_MM my po/my_MM.*
sed -i "/^ALL_LINGUAS/s/ my_MM / my /" configure.ac
@ -804,6 +807,8 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/purple-send-async
%{_bindir}/purple-url-handler
%{_datadir}/pixmaps/purple
%dir %{_datadir}/purple
%dir %{_datadir}/purple/ca-certs
%{_datadir}/purple/ca-certs/Equifax_Secure_CA.pem
%{_datadir}/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
%{_datadir}/purple/ca-certs/Microsoft_Secure_Server_Authority.pem
@ -851,6 +856,8 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/finch.pc
%{_libdir}/pkgconfig/gnt.pc
%changelog
* Tue Nov 13 2007 - maw@suse.de
- Add pidgin-directconn-argfix.patch.
* Thu Nov 08 2007 - maw@suse.de
- Update to version 2.2.2 (thanks to James, Ivan, and Michel for
the good work in GNOME:Community!)