[istanbul] Fix more issues with XError



commit 4eff499805e2827b748e1d00a22b30163af4565d
Author: Zaheer Merali <zaheermerali gmail com>
Date:   Sat Mar 20 18:03:07 2010 +0100

    Fix more issues with XError

 istanbul/main/gst_player.py  |    1 +
 istanbul/main/save_window.py |    8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/istanbul/main/gst_player.py b/istanbul/main/gst_player.py
index 61a9ce1..112ea9d 100644
--- a/istanbul/main/gst_player.py
+++ b/istanbul/main/gst_player.py
@@ -20,6 +20,7 @@ import pygst
 pygst.require('0.10')
 import gst
 import gst.interfaces
+import gtk
 import locale, gettext
 _ = gettext.gettext
 
diff --git a/istanbul/main/save_window.py b/istanbul/main/save_window.py
index 2f317fd..dc79ce8 100644
--- a/istanbul/main/save_window.py
+++ b/istanbul/main/save_window.py
@@ -253,12 +253,11 @@ class SaveWindow(gtk.Window):
 
         if Preferences().has_gnomevfs():
             import gnomevfs
-            XFER_TARGET_DEFAULT_PERMS = 1 << 12
             try:
                 trysave = gnomevfs.xfer_uri(gnomevfs.URI("file://%s" % self.location), 
                     gnomevfs.URI(self.filechooser.get_uri()), 
                     gnomevfs.XFER_DELETE_ITEMS,
-                    gnomevfs.XFER_ERROR_MODE_ABORT | XFER_TARGET_DEFAULT_PERMS, 
+                    gnomevfs.XFER_ERROR_MODE_ABORT, 
                     gnomevfs.XFER_OVERWRITE_MODE_ABORT)
             except gnomevfs.FileExistsError:
                 dialog = gtk.MessageDialog(self,
@@ -277,7 +276,7 @@ class SaveWindow(gtk.Window):
                         gnomevfs.URI("file://%s" % self.location), 
                         gnomevfs.URI(self.filechooser.get_uri()), 
                         gnomevfs.XFER_DELETE_ITEMS,
-                        gnomevfs.XFER_ERROR_MODE_ABORT | XFER_TARGET_DEFAULT_PERMS, 
+                        gnomevfs.XFER_ERROR_MODE_ABORT, 
                         gnomevfs.XFER_OVERWRITE_MODE_REPLACE)
                     except Exception:
                         dialog = gtk.MessageDialog(self,
@@ -300,10 +299,7 @@ class SaveWindow(gtk.Window):
             import shutil
 
             try:
-                umask = os.umask(0)
-                empty_umask = os.umask(umask)
                 shutil.move(self.location, self.filechooser.get_uri()[7:])
-                os.chmod(self.filechooser.get_uri()[7:], 0777-umask)
             except Exception:
                 dialog = gtk.MessageDialog(self,
                     gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]