/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to olive/bookmark.py

Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/bookmark.py
22
22
 
23
23
import gtk
24
24
 
25
 
from olive import OlivePreferences
26
 
from dialog import error_dialog
 
25
from olive import Preferences
 
26
from bzrlib.plugins.gtk.dialog import error_dialog
27
27
 
28
28
 
29
29
class BookmarkDialog(gtk.Dialog):
36
36
                                  flags=0,
37
37
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
38
38
        
39
 
        self.pref = OlivePreferences()
 
39
        self.pref = Preferences()
40
40
        
41
41
        # Get arguments
42
42
        self.selected = selected