diff options
| author | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-09-11 08:58:28 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-09-11 08:58:28 (GMT) |
| commit | 24f590ac4b9e6af5aee5317721f220a00c4c7fe0 (patch) | |
| tree | 039f05cdecba854a186e75827b1dc011bf6a7cdd /src | |
| parent | a8ae15cc81dd4b689f4ba00fd880c51f33d7bad3 (diff) | |
| parent | 8565fc7bd8ed6241ad2cadebb9de66a822a44cf9 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'src')
| -rw-r--r-- | src/journal/expandedentry.py | 27 | ||||
| -rw-r--r-- | src/journal/journaltoolbox.py | 2 | ||||
| -rw-r--r-- | src/journal/palettes.py | 2 |
3 files changed, 2 insertions, 29 deletions
diff --git a/src/journal/expandedentry.py b/src/journal/expandedentry.py index fd591fa..1524c0e 100644 --- a/src/journal/expandedentry.py +++ b/src/journal/expandedentry.py @@ -310,33 +310,6 @@ class ExpandedEntry(hippo.CanvasBox): return vbox, text_view - def _create_version_list(self): - vbox = hippo.CanvasBox() - vbox.props.spacing = style.DEFAULT_SPACING - # TODO: Enable again when we have versions in the DS - """ - jobjects, count = datastore.find({'uid': self._jobject.object_id}, - sorting=['-mtime']) - for jobject in jobjects: - hbox = hippo.CanvasBox(orientation=hippo.ORIENTATION_HORIZONTAL) - hbox.props.spacing = style.DEFAULT_SPACING - - icon = CanvasIcon(file_name=misc.get_icon_name(jobject), - size=style.SMALL_ICON_SIZE) - if jobject.metadata.has_key('icon-color') and \ - jobject.metadata['icon-color']: - icon.props.xo_color = XoColor(jobject.metadata['icon-color']) - hbox.append(icon) - - date = hippo.CanvasText(text=misc.get_date(jobject), - xalign=hippo.ALIGNMENT_START, - font_desc=style.FONT_NORMAL.get_pango_desc()) - hbox.append(date) - - vbox.append(hbox) - """ - return vbox - def _title_notify_text_cb(self, entry, pspec): if not self._update_title_sid: self._update_title_sid = gobject.timeout_add(1000, diff --git a/src/journal/journaltoolbox.py b/src/journal/journaltoolbox.py index 9b2f487..bfec110 100644 --- a/src/journal/journaltoolbox.py +++ b/src/journal/journaltoolbox.py @@ -353,7 +353,7 @@ class EntryToolbar(gtk.Toolbar): self._clipboard_clear_func_cb) def _clipboard_get_func_cb(self, clipboard, selection_data, info, data): - selection_data.set('text/uri-list', 8, self._jobject.file_path) + selection_data.set_uris(['file://' + self._jobject.file_path]) def _clipboard_clear_func_cb(self, clipboard, data): pass diff --git a/src/journal/palettes.py b/src/journal/palettes.py index b1072b2..f186c68 100644 --- a/src/journal/palettes.py +++ b/src/journal/palettes.py @@ -86,7 +86,7 @@ class ObjectPalette(Palette): self.__clipboard_clear_func_cb) def __clipboard_get_func_cb(self, clipboard, selection_data, info, data): - selection_data.set('text/uri-list', 8, self._jobject.file_path) + selection_data.set_uris(['file://' + self._jobject.file_path]) def __clipboard_clear_func_cb(self, clipboard, data): pass |