--- deskbar-applet-2.22.1.old/deskbar/ui/DeskbarTray.py 2008-04-15 15:21:33.438701000 +0100

+++ deskbar-applet-2.22.1/deskbar/ui/DeskbarTray.py 2008-04-15 15:30:53.958469000 +0100

@@ -92,7 +92,7 @@

self._active_view = deskbar.BUTTON_UI_NAME

def __create_window_ui(self):

- self.__view = CuemiacWindowView(self.__controller, self.__core)

+ self.__view = CuemiacWindowView(self.__controller, self.__core, self.applet)

self._active_view = deskbar.WINDOW_UI_NAME

def __setup_applet_menu(self):

@@ -167,4 +167,4 @@

return False

if gtk.pygtk_version < (2,8,0):

- gobject.type_register(DeskbarTray)

\ No newline at end of file

+ gobject.type_register(DeskbarTray)

--- deskbar-applet-2.22.2.old/deskbar/ui/CuemiacAlignedView.py 2008-04-15 15:21:33.442534000 +0100

+++ deskbar-applet-2.22.2/deskbar/ui/CuemiacAlignedView.py 2008-04-15 15:23:41.316857000 +0100

@@ -36,6 +36,7 @@

self.set_keep_above(True)

self.applet.set_applet_flags(gnomeapplet.EXPAND_MINOR)

self.applet.set_flags(gtk.CAN_FOCUS)

+ self.set_screen(applet.get_screen())

self.applet.connect("change-orient", self._on_change_orient)

self._screen_height = self.get_screen().get_height ()

@@ -180,6 +181,9 @@

def get_toplevel(self):

return self

+

+ def get_topwindow(self):

+ return self.applet.window

def get_entry(self):

return self.entry

--- deskbar-applet-2.22.1.old/deskbar/ui/CuemiacWindowController.py 2008-04-15 15:21:33.442334000 +0100

+++ deskbar-applet-2.22.1/deskbar/ui/CuemiacWindowController.py 2008-04-15 15:25:58.101389000 +0100

@@ -1,6 +1,6 @@

import gtk

import gtk.gdk

-import gnomevfs

+import gnome

import logging

import deskbar

import deskbar.interfaces.Controller

@@ -48,14 +48,14 @@

return True

def on_show_about(self, sender):

- show_about(self._view.get_toplevel())

+ show_about(self._view.get_topwindow())

def on_show_preferences(self, sender):

prefs = DeskbarPreferences(self._model)

- prefs.show_run_hide(self._view.get_toplevel())

+ prefs.show_run_hide(self._view.get_topwindow())

def on_show_help(self, sender):

- gnomevfs.url_show("ghelp:deskbar")

+ gnome.ui.help_display_uri_on_screen("ghelp:deskbar", (self._view.get_topwindow()).get_screen())

def on_query_entry_changed(self, entry):

self._view.set_clear()

--- deskbar-applet-2.22.1.old/deskbar/ui/CuemiacWindowView.py 2008-04-15 15:21:33.438975000 +0100

+++ deskbar-applet-2.22.1/deskbar/ui/CuemiacWindowView.py 2008-04-15 15:27:11.325289000 +0100

@@ -18,12 +18,14 @@

This class is responsible for setting up the GUI.

"""

- def __init__(self, controller, model):

+ def __init__(self, controller, model, applet):

deskbar.interfaces.View.__init__(self, controller, model)

gtk.Window.__init__(self)

self._controller.register_view(self)

self.__small_window_height = None

self._do_clear = True

+ self.applet = applet

+ self.set_screen(applet.get_screen())

self.connect("configure-event", self.__save_window_size)

self.connect("delete-event", self._controller.on_quit)

@@ -171,6 +173,9 @@

def get_toplevel(self):

return self

+ def get_topwindow(self):

+ return self.applet.window

+

def get_entry(self):

return self.entry