=== modified file 'fiveadayapplet/__init__.py' --- fiveadayapplet/__init__.py 2008-04-11 16:15:50 +0000 +++ fiveadayapplet/__init__.py 2008-10-07 06:42:15 +0000 @@ -8,6 +8,10 @@ TEAM_FILE = "~/.5-a-day-team" CONFIG_FILE = "~/.5-a-day" -def open_url(url): +def open_url(url, display=None): import os - [fd.close() for fd in os.popen2('/usr/bin/gnome-open %s' % url)] + from subprocess import Popen + env = os.environ + if display is not None: + env["DISPLAY"] = display + p = Popen(["/usr/bin/gnome-open", url], env=env) === modified file 'fiveadayapplet/view.py' --- fiveadayapplet/view.py 2008-07-17 16:05:08 +0000 +++ fiveadayapplet/view.py 2008-10-07 06:52:14 +0000 @@ -77,12 +77,13 @@ about.set_copyright("""Copyright (C) 2008 Markus Korn """) about.set_license(file('/usr/share/common-licenses/GPL-3').read()) about.set_logo(self.about_icon) - + about.set_screen(self.applet.get_screen()) about.run() about.destroy() def do_teams_show(self): dialog = self['dialog_teams'] + dialog.set_screen(self.applet.get_screen()) self['dialog_teams_cancel'].connect("clicked", lambda *args: dialog.response(gtk.RESPONSE_CANCEL)) self['dialog_teams_apply'].connect("clicked", @@ -97,6 +98,7 @@ def do_tags_show(self): dialog = self['dialog_tags'] + dialog.set_screen(self.applet.get_screen()) save = self.controller.tags_model.values self['dialog_tags_cancel'].connect("clicked", lambda *args: dialog.response(gtk.RESPONSE_CANCEL)) @@ -137,21 +139,24 @@ data.remove_tag(entry) def do_wiki_open(self): - fiveadayapplet.open_url("https://wiki.ubuntu.com/5-A-Day") + screen_name = self.applet.get_display().get_name() + fiveadayapplet.open_url("https://wiki.ubuntu.com/5-A-Day", screen_name) def do_stats_open(self): - fiveadayapplet.open_url("http://daniel.holba.ch/5-a-day-stats/") + screen_name = self.applet.get_display().get_name() + fiveadayapplet.open_url("http://daniel.holba.ch/5-a-day-stats/", screen_name) def do_login_show(self): dialog = self['dialog_login'] login = self['entry_login'] join_button = self['button_join'] + screen_name = self.applet.get_display().get_name() self['dialog_cancel'].connect("clicked", lambda *args: dialog.response(gtk.RESPONSE_CANCEL)) self['dialog_apply'].connect("clicked", lambda *args: dialog.response(gtk.RESPONSE_APPLY)) join_button.connect("clicked", - lambda *args: fiveadayapplet.open_url(join_button.get_uri())) + lambda *args: fiveadayapplet.open_url(join_button.get_uri(), screen_name)) dialog.show_all() response = dialog.run()