Ticket #1452: sugar-1452.patch

File sugar-1452.patch, 2.8 KB (added by alsroot, 15 years ago)
  • extensions/globalkey/screenshot.py

    From 5c894e18a04b54422529b7634861e16b4dd1d21c Mon Sep 17 00:00:00 2001
    From: Aleksey Lim <alsroot@member.fsf.org>
    Date: Thu, 1 Oct 2009 16:30:52 +0000
    Subject: Create temporary files for DS in ~/.sugar #1452
    
    ---
     extensions/globalkey/screenshot.py |    6 ++++--
     src/jarabe/frame/activitiestray.py |    4 +++-
     src/jarabe/frame/clipboardmenu.py  |    4 +++-
     3 files changed, 10 insertions(+), 4 deletions(-)
    
    diff --git a/extensions/globalkey/screenshot.py b/extensions/globalkey/screenshot.py
    index 65de63b..9db0291 100644
    a b import dbus 
    2626
    2727from sugar.datastore import datastore
    2828from sugar.graphics import style
     29from sugar import env
     30
    2931from jarabe.model import shell
    3032
    3133BOUND_KEYS = ['<alt>1', 'Print']
    3234
    3335def handle_key_press(key):
    34     fd, file_path = tempfile.mkstemp(
    35             dir=os.path.join(env.get_profile_path(), 'data'))
     36    tmp_dir = os.path.join(env.get_profile_path(), 'data')
     37    fd, file_path = tempfile.mkstemp(dir=tmp_dir)
    3638    os.close(fd)
    3739
    3840    window = gtk.gdk.get_default_root_window()
  • src/jarabe/frame/activitiestray.py

    diff --git a/src/jarabe/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py
    index d6831b2..3076c1b 100644
    a b from sugar.graphics.menuitem import MenuItem 
    3737from sugar.activity.activityhandle import ActivityHandle
    3838from sugar.activity import activityfactory
    3939from sugar import mime
     40from sugar import env
    4041
    4142from jarabe.model import shell
    4243from jarabe.model import neighborhood
    class IncomingTransferPalette(BaseTransferPalette): 
    771772        if extension is None:
    772773            extension = '.bin'
    773774        fd, file_path = tempfile.mkstemp(suffix=extension,
    774                 prefix=self._sanitize(self.file_transfer.title))
     775                prefix=self._sanitize(self.file_transfer.title),
     776                dir=os.path.join(env.get_profile_path(), 'data'))
    775777        os.close(fd)
    776778        os.unlink(file_path)
    777779
  • src/jarabe/frame/clipboardmenu.py

    diff --git a/src/jarabe/frame/clipboardmenu.py b/src/jarabe/frame/clipboardmenu.py
    index 9b990bb..b998110 100644
    a b from sugar.graphics.icon import Icon 
    2929from sugar.graphics.xocolor import XoColor
    3030from sugar.datastore import datastore
    3131from sugar import mime
     32from sugar import env
    3233
    3334from jarabe.frame import clipboard
    3435from jarabe.journal import misc
    class ClipboardMenu(Palette): 
    194195        jobject.destroy()
    195196
    196197    def _write_to_temp_file(self, data):
    197         f, file_path = tempfile.mkstemp()
     198        tmp_dir = os.path.join(env.get_profile_path(), 'data')
     199        f, file_path = tempfile.mkstemp(dir=tmp_dir)
    198200        try:
    199201            os.write(f, data)
    200202        finally: