rpms/pidgin/devel pidgin-2.0.1-purple-remote-oscar.patch, NONE, 1.1 pidgin.spec, 1.17, 1.18

[Stu Tomlinson (nosnilmot)]

Author: nosnilmot

Update of /cvs/extras/rpms/pidgin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17977

Modified Files:
	pidgin.spec 
Added Files:
	pidgin-2.0.1-purple-remote-oscar.patch 
Log Message:
- Fix purple-remote for AIM & ICQ accounts (#240589)


pidgin-2.0.1-purple-remote-oscar.patch:

--- NEW FILE pidgin-2.0.1-purple-remote-oscar.patch ---
-----------------------------------------------------------------
Revision: a0ccd8708935303973ab94ba534dabdc72002039
Ancestor: b9db139bf548b0ec1e2265131772e2eb763cfa5a
Author: markdoliner at pidgin.im
Date: 2007-06-04T05:56:16
Branch: im.pidgin.pidgin

Modified files:
        libpurple/purple-remote

ChangeLog: 

Fix http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=240589

"If you run "gaim-remote aim:goim?screenname=whatever" then it throws an
exception because it looks for a "prpl-oscar" account, but apparently I am
signed in with a "prpl-aim" account."

============================================================
--- libpurple/purple-remote	3d893ee565001dfffefae1f2d2c28d167530a14a
+++ libpurple/purple-remote	da0715a989b96d9f4840c7ab2917bccb76112413
@@ -31,7 +31,7 @@ def show_help():
         return result
             
 def show_help():
-    print """This program uses DBus to communicate with purple.
+    print """This program uses D-Bus to communicate with purple.
 
 Usage:
 
@@ -96,8 +96,6 @@ def execute(uri):
     protocol = match.group(2)
     if protocol == "xmpp":
         protocol = "jabber"
-    if protocol == "aim" or protocol == "icq":
-        protocol = "oscar"
     if protocol is not None:
         protocol = "prpl-" + protocol
     command = match.group(5)


Index: pidgin.spec
===================================================================
RCS file: /cvs/extras/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pidgin.spec	3 Jun 2007 16:29:58 -0000	1.17
+++ pidgin.spec	4 Jun 2007 19:47:21 -0000	1.18
@@ -27,7 +27,7 @@
 
 Name:		pidgin
 Version:	2.0.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://pidgin.im/
@@ -55,6 +55,7 @@
 ## Patches 100+: To be Included in Future Upstream
 Patch100: pidgin-2.0.1-early-g_thread_init.patch
 Patch101: pidgin-2.0.1-purple-remote-syntax.patch
+Patch102: pidgin-2.0.1-purple-remote-oscar.patch
 Patch113: pidgin-2.0.0-beta7-reread-resolvconf.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -268,6 +269,7 @@
 ## Patches 100+: To be Included in Future Upstream
 %patch100 -p0
 %patch101 -p0
+%patch102 -p0
 %patch113 -p1
 
 # Relabel internal version for support purposes
@@ -479,6 +481,9 @@
 
 
 %changelog
+* Mon Jun 4 2007 Stu Tomlinson <stu at nosnilmot.com> - 2.0.1-3
+- Fix purple-remote for AIM & ICQ accounts (#240589)
+
 * Fri May 31 2007 Stu Tomlinson <stu at nosnilmot.com> - 2.0.1-2
 - Call g_thread_init early (#241883)
 - Fix purple-remote syntax error (#241905)