Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpg@redhat.com>2007-03-17 11:05:19 (GMT)
committer Marco Pesenti Gritti <mpg@redhat.com>2007-03-17 11:05:19 (GMT)
commit871160390bc342b66537db5e70f2bf13c6c08fc8 (patch)
tree4d2b9c0729b4a73198a708f9810c40974cb72556
parentde4f66b03764fcaad3731d4567c5a324652be1e7 (diff)
parent1656a89381d8449b38410aef38437ee0cf9f3da3 (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity
Conflicts: webview.py
-rwxr-xr-xactivity/activity.info2
-rwxr-xr-xwebtoolbar.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/activity/activity.info b/activity/activity.info
index dcde5ec..ffce5e6 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
[Activity]
name = Web
-activity_version = 10
+activity_version = 11
service_name = org.laptop.WebActivity
icon = activity-web
class = webactivity.WebActivity
diff --git a/webtoolbar.py b/webtoolbar.py
index ad7b783..cc64f14 100755
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -124,6 +124,7 @@ class WebToolbar(Toolbar):
def _save_cb(self, button):
chooser = FileChooserDialog(title=None,
+ parent=self._embed.get_toplevel(),
action=gtk.FILE_CHOOSER_ACTION_SAVE,
buttons=(gtk.STOCK_CANCEL,
gtk.RESPONSE_CANCEL,
@@ -141,6 +142,7 @@ class WebToolbar(Toolbar):
def _open_cb(self, button):
chooser = FileChooserDialog(title=None,
+ parent=self._embed.get_toplevel(),
action=gtk.FILE_CHOOSER_ACTION_OPEN,
buttons=(gtk.STOCK_CANCEL,
gtk.RESPONSE_CANCEL,