rhythmbox r6220 - in trunk: . plugins/rb

[jmatthew svn gnome org]

Author: jmatthew
Date: Wed Mar 18 02:42:07 2009
New Revision: 6220
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6220&view=rev

Log:
2009-03-18  Jonathan Matthew  <jonathan d14n org>

	* plugins/rb/Loader.py:
	Fix a bunch of other stupid mistakes - typos, parameter ordering,
	passing callback arguments.


Modified:
   trunk/ChangeLog
   trunk/plugins/rb/Loader.py

Modified: trunk/plugins/rb/Loader.py
==============================================================================
--- trunk/plugins/rb/Loader.py	(original)
+++ trunk/plugins/rb/Loader.py	Wed Mar 18 02:42:07 2009
@@ -119,9 +119,9 @@
 			self.callback = callback
 			self.args = args
 
-			file = gio.File(url)
+			file = gio.File(uri)
 			if want_size:
-				file.query_info_async(gio.FILE_ATTRIBUTE_STANDARD_SIZE, self._info_cb, cancellable=self._cancel)
+				file.query_info_async(self._info_cb, gio.FILE_ATTRIBUTE_STANDARD_SIZE, cancellable=self._cancel)
 			else:
 				file.read_async(self._open_cb, cancellable=self.cancel)
 		except gio.Error, e:
@@ -136,7 +136,7 @@
 	def __init__ (self):
 		self._cancel = gio.Cancellable()
 
-	def _file_info_cb (self, result):
+	def _file_info_cb (self, file, result):
 		try:
 			rfi = file.query_info_finish(result)
 
@@ -158,14 +158,15 @@
 			self.local_mod = lfi.get_attribute_uint64(gio.FILE_ATTRIBUTE_TIME_MODIFIED)
 
 			rf = gio.File(remote)
-			rf.query_info_async(gio.FILE_ATTRIBUTE_TIME_MODIFIED, self._file_info_cb, cancellable=self._cancel)
+			rf.query_info_async(self._file_info_cb, gio.FILE_ATTRIBUTE_TIME_MODIFIED, cancellable=self._cancel)
 		except Exception, e:
 			print "error checking for update: %s" % e
-			self.callback(True, self.args)
+			self.callback(True, *self.args)
 
 	def cancel (self):
 		self._cancel.cancel()
 
+
 class GnomeVFSLoader (object):
 	def __init__ (self):
 		self.chunk = 4096