summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-extra/conduit/files')
-rw-r--r--gnome-extra/conduit/files/conduit-0.3.17-escaping-caracters.patch31
-rw-r--r--gnome-extra/conduit/files/conduit-0.3.17-non-ASCII-folder-canvas.patch12
-rw-r--r--gnome-extra/conduit/files/conduit-0.3.17-programming-error-unicode.patch14
-rw-r--r--gnome-extra/conduit/files/conduit-0.3.17-rhythmbox-new-path.patch23
4 files changed, 0 insertions, 80 deletions
diff --git a/gnome-extra/conduit/files/conduit-0.3.17-escaping-caracters.patch b/gnome-extra/conduit/files/conduit-0.3.17-escaping-caracters.patch
deleted file mode 100644
index c62c1c4..0000000
--- a/gnome-extra/conduit/files/conduit-0.3.17-escaping-caracters.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -urNad conduit~/conduit/platform/FileGio.py conduit/conduit/platform/FileGio.py
---- conduit~/conduit/platform/FileGio.py 2009-08-30 13:33:34.000000000 +0200
-+++ conduit/conduit/platform/FileGio.py 2009-08-30 14:06:49.000000000 +0200
-@@ -1,4 +1,5 @@
- import gio
-+import urllib
-
- import conduit.platform
-
-@@ -200,6 +201,8 @@
- #if not relative, return abs path
- if not res:
- res = toURI
-+ else:
-+ res = urllib.quote(res)
- return res
-
- @staticmethod
-@@ -353,10 +356,10 @@
- if filetype == gio.FILE_TYPE_DIRECTORY:
- #Include hidden directories
- if not hidden or self.includeHidden:
-- self.dirs.append(dir+"/"+filename)
-+ self.dirs.append(dir+"/"+urllib.quote(filename))
- t += 1
- elif filetype == gio.FILE_TYPE_REGULAR or (filetype == gio.FILE_TYPE_SYMBOLIC_LINK and self.followSymlinks):
-- uri = dir+"/"+filename
-+ uri = dir+"/"+urllib.quote(filename)
- #Include hidden files
- if not hidden or self.includeHidden:
- self.URIs.append(uri)
diff --git a/gnome-extra/conduit/files/conduit-0.3.17-non-ASCII-folder-canvas.patch b/gnome-extra/conduit/files/conduit-0.3.17-non-ASCII-folder-canvas.patch
deleted file mode 100644
index 15ad2e2..0000000
--- a/gnome-extra/conduit/files/conduit-0.3.17-non-ASCII-folder-canvas.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNad conduit-fix~/conduit/modules/FileModule/FileModule.py conduit-fix/conduit/modules/FileModule/FileModule.py
---- conduit-fix~/conduit/modules/FileModule/FileModule.py 2009-02-24 22:56:27.000000000 +0100
-+++ conduit-fix/conduit/modules/FileModule/FileModule.py 2009-02-24 23:03:47.000000000 +0100
-@@ -116,7 +116,7 @@
- return self.folder
-
- def get_name(self):
-- return Vfs.uri_get_filename(self.folder)
-+ return Vfs.uri_unescape(Vfs.uri_get_filename(self.folder))
-
- def _monitor_folder(self):
- self._monitor.add(self.folder, self._monitor.MONITOR_DIRECTORY)
diff --git a/gnome-extra/conduit/files/conduit-0.3.17-programming-error-unicode.patch b/gnome-extra/conduit/files/conduit-0.3.17-programming-error-unicode.patch
deleted file mode 100644
index bc2c382..0000000
--- a/gnome-extra/conduit/files/conduit-0.3.17-programming-error-unicode.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urNad conduit~/conduit/MappingDB.py conduit/conduit/MappingDB.py
---- conduit~/conduit/MappingDB.py 2009-08-30 13:33:34.000000000 +0200
-+++ conduit/conduit/MappingDB.py 2009-08-30 13:40:49.000000000 +0200
-@@ -38,8 +38,8 @@
- self.sinkRid = rid
-
- def values(self):
-- return (self.sourceUID,self.sourceRid.get_UID(),self.sourceRid.get_mtime(),self.sourceRid.get_hash(),
-- self.sinkUID,self.sinkRid.get_UID(),self.sinkRid.get_mtime(),self.sinkRid.get_hash())
-+ return (unicode(self.sourceUID),unicode(self.sourceRid.get_UID()),self.sourceRid.get_mtime(),self.sourceRid.get_hash(),
-+ unicode(self.sinkUID),unicode(self.sinkRid.get_UID()),self.sinkRid.get_mtime(),self.sinkRid.get_hash())
-
- class MappingDB:
- """
diff --git a/gnome-extra/conduit/files/conduit-0.3.17-rhythmbox-new-path.patch b/gnome-extra/conduit/files/conduit-0.3.17-rhythmbox-new-path.patch
deleted file mode 100644
index d5c35ec..0000000
--- a/gnome-extra/conduit/files/conduit-0.3.17-rhythmbox-new-path.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urNad conduit-0.3.17~/conduit/modules/RhythmboxModule/RhythmboxModule.py conduit-0.3.17/conduit/modules/RhythmboxModule/RhythmboxModule.py
---- conduit-0.3.17~/conduit/modules/RhythmboxModule/RhythmboxModule.py 2010-01-07 17:10:30.000000000 +0100
-+++ conduit-0.3.17/conduit/modules/RhythmboxModule/RhythmboxModule.py 2010-03-28 14:37:12.034777215 +0200
-@@ -50,8 +50,8 @@
- _icon_ = "rhythmbox"
- _configurable_ = True
-
-- PLAYLIST_PATH="~/.gnome2/rhythmbox/playlists.xml"
-- RHYTHMDB_PATH="~/.gnome2/rhythmbox/rhythmdb.xml"
-+ PLAYLIST_PATH="~/.local/share/rhythmbox/playlists.xml"
-+ RHYTHMDB_PATH="~/.local/share/rhythmbox/rhythmdb.xml"
-
- def __init__(self, *args):
- DataProvider.DataSource.__init__(self)
-@@ -150,7 +150,7 @@
- '''Wrapper around the standard Audio datatype that implements
- the rating, playcount, and cover location tags.
- '''
-- COVER_ART_PATH="~/.gnome2/rhythmbox/covers/"
-+ COVER_ART_PATH="~/.cache/rhythmbox/covers"
- def __init__(self, URI, **kwargs):
- Audio.Audio.__init__(self, URI, **kwargs)
- self._songdata = kwargs['songdata'] or {}