Acire

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

  1. gnomevfs
  2. Merge into trunk
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.
lp://qastaging/~foxxtrot/acire/gnomevfs updated
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
1=== modified file 'bin/acire'
2--- bin/acire 2010-01-12 10:06:43 +0000
3+++ bin/acire 2010-01-14 01:30:22 +0000
4@@ -23,7 +23,7 @@
5 import re
6 import vte
7 import gtksourceview
8-import gnome.vfs
9+import gnomevfs
10 import pango
11
12 # Check if we are working in the source tree or from the installed
13@@ -197,9 +197,9 @@
14 else:
15 path = os.path.abspath(self.current_filename)
16
17- uri = gnome.vfs.URI(path)
18+ uri = gnomevfs.URI(path)
19
20- mime_type = gnome.vfs.get_mime_type(path) # needs ASCII filename, not URI
21+ mime_type = gnomevfs.get_mime_type(path) # needs ASCII filename, not URI
22 if mime_type:
23 language = manager.get_language_from_mime_type(mime_type)
24 if language:

Subscribers

People subscribed via source and target branches