[meld] Adapt Preferences dialog options to better represent App/Window split

[Kai Willadsen <kaiw src gnome org>]

commit 32df8921e5190df7d556b02924b375191ff7d174
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Wed Feb 9 06:56:19 2011 +1000

    Adapt Preferences dialog options to better represent App/Window split

 meld/meldwindow.py  |    2 +-
 meld/preferences.py |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index 80b3d64..a9c4ba8 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -414,7 +414,7 @@ class MeldWindow(gnomeglade.Component):
     # Toolbar and menu items (settings)
     #
     def on_menu_preferences_activate(self, item):
-        preferences.PreferencesDialog(self)
+        preferences.PreferencesDialog(self.widget, app.prefs)
 
     def on_action_fullscreen_toggled(self, widget):
         is_full = self.widget.window.get_state() & gtk.gdk.WINDOW_STATE_FULLSCREEN
diff --git a/meld/preferences.py b/meld/preferences.py
index 0cd2771..292fb20 100644
--- a/meld/preferences.py
+++ b/meld/preferences.py
@@ -118,11 +118,11 @@ class ListWidget(gnomeglade.Component):
 
 class PreferencesDialog(gnomeglade.Component):
 
-    def __init__(self, parentapp):
+    def __init__(self, parent, prefs):
         gnomeglade.Component.__init__(self, paths.ui_dir("preferences.ui"),
                                       "preferencesdialog", ["adjustment1"])
-        self.widget.set_transient_for(parentapp.widget)
-        self.prefs = parentapp.prefs
+        self.widget.set_transient_for(parent)
+        self.prefs = prefs
         if not self.prefs.use_custom_font:
             self.checkbutton_default_font.set_active(True)
             self.fontpicker.set_sensitive(False)