From 871160390bc342b66537db5e70f2bf13c6c08fc8 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Sat, 17 Mar 2007 11:05:19 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity

Conflicts:

	webview.py
---
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,
--
cgit v0.9.1