Merge lp://qastaging/~foxxtrot/acire/gnomevfs into lp://qastaging/acire

Proposed by Jeff Craig
Status: Rejected
Rejected by: Jono Bacon
Proposed branch: lp://qastaging/~foxxtrot/acire/gnomevfs
Merge into: lp://qastaging/acire
Diff against target: 24 lines (+3/-3)
1 file modified
bin/acire (+3/-3)
To merge this branch: bzr merge lp://qastaging/~foxxtrot/acire/gnomevfs
Reviewer Review Type Date Requested Status
Jono Bacon Pending
Review via email: mp+17249@code.qastaging.launchpad.net
To post a comment you must log in.
18. By Jeff Craig <craig@ford-prefect>

Missed a bad definition caused by the last commit.

Unmerged revisions

18. By Jeff Craig <craig@ford-prefect>

Missed a bad definition caused by the last commit.

17. By Jeff Craig <craig@ford-prefect>

Replace gnome.vfs with gnomevfs

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/acire'
--- bin/acire 2010-01-12 10:06:43 +0000
+++ bin/acire 2010-01-14 01:30:22 +0000
@@ -23,7 +23,7 @@
23import re23import re
24import vte24import vte
25import gtksourceview25import gtksourceview
26import gnome.vfs26import gnomevfs
27import pango27import pango
2828
29# Check if we are working in the source tree or from the installed 29# Check if we are working in the source tree or from the installed
@@ -197,9 +197,9 @@
197 else:197 else:
198 path = os.path.abspath(self.current_filename)198 path = os.path.abspath(self.current_filename)
199199
200 uri = gnome.vfs.URI(path)200 uri = gnomevfs.URI(path)
201201
202 mime_type = gnome.vfs.get_mime_type(path) # needs ASCII filename, not URI202 mime_type = gnomevfs.get_mime_type(path) # needs ASCII filename, not URI
203 if mime_type:203 if mime_type:
204 language = manager.get_language_from_mime_type(mime_type)204 language = manager.get_language_from_mime_type(mime_type)
205 if language:205 if language:

Subscribers

People subscribed via source and target branches