Fix Twitter API. Remove unused amarok USE flag.

(Portage version: 2.1.6.11/cvs/Linux x86_64)

4 files changed, 193 insertions, 3 deletions

diff --git a/gnome-extra/gnome-do-plugins/ChangeLog b/gnome-extra/gnome-do-plugins/ChangeLog
index 1f2c8074b671..9bd3c62b952a 100644
--- a/gnome-extra/gnome-do-plugins/ChangeLog
+++ b/gnome-extra/gnome-do-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-do-plugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do-plugins/ChangeLog,v 1.10 2009/05/31 09:34:26 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do-plugins/ChangeLog,v 1.11 2009/05/31 09:54:31 graaff Exp $
+
+*gnome-do-plugins-0.8.1.3-r1 (31 May 2009)
+
+  31 May 2009; Hans de Graaff <graaff@gentoo.org>
+  metadata.xml, +gnome-do-plugins-0.8.1.3-r1.ebuild,
+  +files/gnome-do-plugins-0.8.1.3-update-twitter-api.patch:
+  Fix usage of Twitter API. Remove unused amarok USE flag.
 
   31 May 2009; Hans de Graaff <graaff@gentoo.org>
   -gnome-do-plugins-0.4.0.ebuild, -gnome-do-plugins-0.8.0.ebuild:
diff --git a/gnome-extra/gnome-do-plugins/files/gnome-do-plugins-0.8.1.3-update-twitter-api.patch b/gnome-extra/gnome-do-plugins/files/gnome-do-plugins-0.8.1.3-update-twitter-api.patch
new file mode 100644
index 000000000000..d286c49aba04
--- /dev/null
+++ b/gnome-extra/gnome-do-plugins/files/gnome-do-plugins-0.8.1.3-update-twitter-api.patch
@@ -0,0 +1,121 @@
+Patch taken from upstream bug report to fix twitter by using the new API.
+
+https://code.launchpad.net/~alexlauni/do-plugins/twitter-api-fixes
+
+=== modified file 'Microblogging/src/MicroblogClient.cs'
+--- Microblogging/src/MicroblogClient.cs	2009-02-28 19:53:07 +0000
++++ Microblogging/src/MicroblogClient.cs	2009-04-13 04:10:11 +0000
+@@ -45,9 +45,9 @@
+ 		readonly string FailedPostMsg = Catalog.GetString ("Unable to post tweet. Check your login settings. If you "
+ 			+ "are behind a proxy make sure that the settings in /system/http_proxy are correct.");
+ 
+-		const int UpdateTimelineTimeout = 30 * 1000;
+-		const int UpdateContactsTimeout = 10 * 60 * 1000;
+-		const int CheckForMessagesTimeout = 5 * 60 * 1000;
++		const int UpdateTimelineTimeout = 60 * 1000; // every 60 seconds
++		const int UpdateContactsTimeout = 30 * 1000 * 60; // every 30 minutes
++		const int CheckForMessagesTimeout = 5 * 1000 * 60; // every 5 minutespr
+ 
+ 		#endregion
+ 
+@@ -61,6 +61,7 @@
+ 		
+ 		static MicroblogClient ()
+ 		{
++			Log<MicroblogClient>.Debug ("Using limited version!!!~~~~~");
+ 			PhotoDirectory = new [] { Services.Paths.UserDataDirectory, "Microblogging", "photos"}.Aggregate (Path.Combine);
+ 		}
+ 		
+@@ -121,11 +122,13 @@
+ 				newContacts = new List<FriendItem> ();
+ 				friends = blog.User.Friends ();
+ 			} catch (TwitterizerException e) {
++				Log.Error("{0} {1}", e.RequestData.ResponseException.Message, e.RequestData.ResponseException.StackTrace);
+ 				Log<MicroblogClient>.Debug (GenericErrorMsg, "UpdateContacts", e.Message);
+ 				return;
+ 			}
+ 			
+ 			foreach (TwitterUser friend in friends) {
++				Log<MicroblogClient>.Error ("we had friendzzz");
+ 				if (friend.Status != null) {
+ 					status = new MicroblogStatus (friend.Status.ID, friend.Status.Text, friend.ScreenName, friend.Status.Created);
+ 					newContact = new FriendItem (friend.ID, friend.ScreenName, status);
+
+=== modified file 'Microblogging/src/Twitterizer/Twitterizer.Framework/MethodClasses/TwitterStatusMethods.cs'
+--- Microblogging/src/Twitterizer/Twitterizer.Framework/MethodClasses/TwitterStatusMethods.cs	2009-02-28 16:16:48 +0000
++++ Microblogging/src/Twitterizer/Twitterizer.Framework/MethodClasses/TwitterStatusMethods.cs	2009-04-13 04:10:11 +0000
+@@ -109,7 +109,7 @@
+ 

+             string actionUri = (Parameters == null ? Twitter.Urls.FriendsTimelineUrl : Parameters.BuildActionUri(Twitter.Urls.FriendsTimelineUrl));

+             Data.ActionUri = new Uri(actionUri);

+-

++			

+             Data = Request.PerformWebRequest(Data);

+ 

+             return Data.Statuses;

+@@ -141,7 +141,7 @@
+             Data.ActionUri = new Uri(

+                 string.Format(Twitter.Urls.UpdateUrl, HttpUtility.UrlEncode(Status), InReplyToStatusID));

+ 			

+-            Data = Request.PerformWebRequest(Data);

++            Data = Request.PerformWebRequest(Data, "POST");

+ 

+             return Data.Statuses[0];

+         }

+
+=== modified file 'Microblogging/src/Twitterizer/Twitterizer.Framework/MethodClasses/TwitterUserMethods.cs'
+--- Microblogging/src/Twitterizer/Twitterizer.Framework/MethodClasses/TwitterUserMethods.cs	2008-12-11 04:16:01 +0000
++++ Microblogging/src/Twitterizer/Twitterizer.Framework/MethodClasses/TwitterUserMethods.cs	2009-04-13 04:10:11 +0000
+@@ -87,6 +87,7 @@
+         /// <returns></returns>

+         public TwitterUserCollection Friends(TwitterParameters Parameters)

+         {

++			Console.Error.WriteLine ("Goona get friends");

+             // page 0 == page 1 is the start

+             TwitterRequest Request = new TwitterRequest();

+             TwitterRequestData Data = new TwitterRequestData();

+@@ -95,9 +96,9 @@
+ 

+             string actionUri = (Parameters == null ? Twitter.Urls.FriendsUrl : Parameters.BuildActionUri(Twitter.Urls.FriendsUrl));

+             Data.ActionUri = new Uri(actionUri);

+-

++			Console.Error.WriteLine ("GOING TO GET EM");

+             Data = Request.PerformWebRequest(Data);

+-

++			Console.Error.WriteLine ("I have {0} frienz", Data.Users.Count);

+             return Data.Users;

+         }

+     }

+
+=== modified file 'Microblogging/src/Twitterizer/Twitterizer.Framework/TwitterRequest.cs'
+--- Microblogging/src/Twitterizer/Twitterizer.Framework/TwitterRequest.cs	2008-12-11 04:16:01 +0000
++++ Microblogging/src/Twitterizer/Twitterizer.Framework/TwitterRequest.cs	2009-04-13 04:10:11 +0000
+@@ -40,7 +40,7 @@
+     {

+         public TwitterRequestData PerformWebRequest(TwitterRequestData Data)

+         {

+-            PerformWebRequest(Data, "POST");

++            PerformWebRequest(Data, "GET");

+             

+             return (Data);

+ 

+@@ -48,7 +48,8 @@
+ 

+         public TwitterRequestData PerformWebRequest(TwitterRequestData Data, string HTTPMethod)

+         {

+-            HttpWebRequest Request = (HttpWebRequest)WebRequest.Create(Data.ActionUri);

++    	    Console.Error.WriteLine ("Posting {0} via {1}", Data.ActionUri, HTTPMethod);

++			HttpWebRequest Request = (HttpWebRequest)WebRequest.Create(Data.ActionUri);

+ 

+ 

+             Request.Method = HTTPMethod;

+@@ -99,7 +100,7 @@
+             {

+                 XmlDocument ResultXmlDocument = new XmlDocument();

+                 ResultXmlDocument.LoadXml(Data.Response);

+-

++				

+                 if (ResultXmlDocument.DocumentElement != null)

+                     switch (ResultXmlDocument.DocumentElement.Name.ToLower())

+                     {

+
diff --git a/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.1.3-r1.ebuild b/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.1.3-r1.ebuild
new file mode 100644
index 000000000000..9b7c120edde0
--- /dev/null
+++ b/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.1.3-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.1.3-r1.ebuild,v 1.1 2009/05/31 09:54:31 graaff Exp $
+
+inherit eutils autotools gnome2 mono versionator
+
+MY_PN="do-plugins"
+PVC=$(get_version_component_range 1-3)
+
+DESCRIPTION="Plugins to put the Do in Gnome Do"
+HOMEPAGE="http://do.davebsd.com/"
+SRC_URI="https://launchpad.net/${MY_PN}/0.8/${PVC}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="banshee evo"
+
+RDEPEND=">=gnome-extra/gnome-do-${PV}
+		dev-dotnet/wnck-sharp
+		banshee? ( >=media-sound/banshee-1.4.2 )
+		evo? ( dev-dotnet/evolution-sharp )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/monodevelop"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix use of Twitter API in Microblogging plugin.
+	epatch "${FILESDIR}/${P}-update-twitter-api.patch"
+
+	sed -i -r -e "/(FLICKR|Flickr)/d" configure.ac Makefile.am
+	use banshee || sed -i -r -e "/(BANSHEE|Banshee)/d" configure.ac Makefile.am
+	use evo     || sed -i -r -e "/(EVOLUTION|Evolution)/d" configure.ac Makefile.am
+	eautoreconf
+}
+
+src_compile()
+{
+	econf --enable-debug=no --enable-release=yes || die "configure failed"
+	# The make system is unfortunately broken for parallel builds and
+	# upstream indicated on IRC that they have no intention to fix
+	# that.
+	emake -j1 || die "make failed"
+}
+
+pkg_postinst()
+{
+	ewarn "Plugin handling has changed since gnome-do 0.4."
+	ewarn "If you install the gnome-do-plugins package you will have local copies"
+	ewarn "of the plugins, but you still need to manually enable them in Preferences."
+	ewarn "Also note that plugins installed from upstream may not be compatible with"
+	ewarn "your system. When in doubt check the output from gnome-do itself".
+	ewarn "Old plugins may not be compatible either."
+	ewarn "Check ~/.local/share/gnome-do/ if you have problems with plugins."
+
+	# To be removed when bumping from 0.8.1.3
+	ewarn
+	ewarn "This revision contains an update for the Microblogging.dll plugin."
+	ewarn "You will need to copy the updated version from /usr/share/gnome-do/plugins"
+	ewarn "to ~/.local/share/gnome-do/plugins-${PV}/addins/Do.Microblog.1.0/ manually"
+}
diff --git a/gnome-extra/gnome-do-plugins/metadata.xml b/gnome-extra/gnome-do-plugins/metadata.xml
index 1fbbfe71e8c1..c23c14f98950 100644
--- a/gnome-extra/gnome-do-plugins/metadata.xml
+++ b/gnome-extra/gnome-do-plugins/metadata.xml
@@ -8,8 +8,6 @@
 	</maintainer>
 
 	<use>
-		<flag name='amarok'>Enables the Amarok (<pkg>media-sound/amarok</pkg>)
-			plugin</flag>
 	 	<flag name="banshee">Enables the Banshee (<pkg>media-sound/banshee</pkg>) plugin</flag>
 	</use>