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 |
26 | 26 | |
27 | 27 | from sugar.datastore import datastore |
28 | 28 | from sugar.graphics import style |
| 29 | from sugar import env |
| 30 | |
29 | 31 | from jarabe.model import shell |
30 | 32 | |
31 | 33 | BOUND_KEYS = ['<alt>1', 'Print'] |
32 | 34 | |
33 | 35 | def 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) |
36 | 38 | os.close(fd) |
37 | 39 | |
38 | 40 | window = gtk.gdk.get_default_root_window() |
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 |
37 | 37 | from sugar.activity.activityhandle import ActivityHandle |
38 | 38 | from sugar.activity import activityfactory |
39 | 39 | from sugar import mime |
| 40 | from sugar import env |
40 | 41 | |
41 | 42 | from jarabe.model import shell |
42 | 43 | from jarabe.model import neighborhood |
… |
… |
class IncomingTransferPalette(BaseTransferPalette): |
771 | 772 | if extension is None: |
772 | 773 | extension = '.bin' |
773 | 774 | 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')) |
775 | 777 | os.close(fd) |
776 | 778 | os.unlink(file_path) |
777 | 779 | |
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 |
29 | 29 | from sugar.graphics.xocolor import XoColor |
30 | 30 | from sugar.datastore import datastore |
31 | 31 | from sugar import mime |
| 32 | from sugar import env |
32 | 33 | |
33 | 34 | from jarabe.frame import clipboard |
34 | 35 | from jarabe.journal import misc |
… |
… |
class ClipboardMenu(Palette): |
194 | 195 | jobject.destroy() |
195 | 196 | |
196 | 197 | 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) |
198 | 200 | try: |
199 | 201 | os.write(f, data) |
200 | 202 | finally: |