From ae1a07aee8a505b7a1708bebb237456f241d9787 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Sat, 08 Sep 2007 22:13:11 +0000 Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar --- diff --git a/NEWS b/NEWS index bd6cbf8..e8ba447 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +* #2909: Make python activities more tolerant to missing metadata properties. (tomeu) +* #2653: Add audio/wav and audio/x-wav as Audio objects. (tomeu) * Support moving of data files written to the datastore using standard Activity write_file() API (dcbw) diff --git a/services/shell/objecttypeservice.py b/services/shell/objecttypeservice.py index 8a04d61..4e806d4 100644 --- a/services/shell/objecttypeservice.py +++ b/services/shell/objecttypeservice.py @@ -40,7 +40,7 @@ class ObjectTypeRegistry(dbus.service.Object): ['image/png', 'image/gif', 'image/jpeg']) self._add_primitive('Audio', _('Audio'), 'audio-x-generic', - ['audio/ogg']) + ['audio/ogg', 'audio/x-wav', 'audio/wav']) self._add_primitive('Video', _('Video'), 'video-x-generic', ['video/ogg', 'application/ogg']) diff --git a/shell/view/clipboardmenu.py b/shell/view/clipboardmenu.py index 1fc4449..35a3a48 100644 --- a/shell/view/clipboardmenu.py +++ b/shell/view/clipboardmenu.py @@ -68,8 +68,7 @@ class ClipboardMenu(Palette): self._remove_item.show() self._open_item = MenuItem(_('Open')) - self._open_item_activate_sid = self._open_item.connect('activate', - self._open_item_activate_cb) + self._open_item.connect('activate', self._open_item_activate_cb) self.menu.append(self._open_item) self._open_item.show() @@ -87,26 +86,20 @@ class ClipboardMenu(Palette): self._update_open_submenu() def _update_open_submenu(self): - submenu = self._open_item.get_submenu() - if submenu: - for item in submenu.get_children(): - submenu.remove(item) - + logging.debug('_update_open_submenu: %r' % self._activities) if self._activities is None or len(self._activities) <= 1: - if self._open_item_activate_sid is None: - self._open_item_activate_sid = self._open_item.connect( - 'activate', - self._open_item_activate_cb) + if self._open_item.get_submenu() is not None: + self._open_item.remove_submenu() return - else: - if self._open_item_activate_sid is not None: - self._open_item.disconnect(self._open_item_activate_sid) - self._open_item_activate_sid = None - if not submenu: + submenu = self._open_item.get_submenu() + if submenu is None: submenu = gtk.Menu() self._open_item.set_submenu(submenu) submenu.show() + else: + for item in submenu.get_children(): + submenu.remove(item) for service_name in self._activities: registry = activity.get_registry() @@ -158,13 +151,15 @@ class ClipboardMenu(Palette): self._update_open_submenu() def _open_item_activate_cb(self, menu_item): - if self._percent < 100: + logging.debug('_open_item_activate_cb') + if self._percent < 100 or menu_item.get_submenu() is not None: return jobject = self._copy_to_journal() jobject.resume(self._activities[0]) jobject.destroy() def _open_submenu_item_activate_cb(self, menu_item, service_name): + logging.debug('_open_submenu_item_activate_cb') if self._percent < 100: return jobject = self._copy_to_journal() @@ -176,6 +171,7 @@ class ClipboardMenu(Palette): cb_service.delete_object(self._object_id) def _journal_item_activate_cb(self, menu_item): + logging.debug('_journal_item_activate_cb') jobject = self._copy_to_journal() jobject.destroy() @@ -186,9 +182,9 @@ class ClipboardMenu(Palette): format = mime.choose_most_significant(obj['FORMATS']) data = cb_service.get_object_data(self._object_id, format) + transfer_ownership = False if format == 'text/uri-list': file_path = urlparse.urlparse(data['DATA']).path - mime_type = mime.get_for_file(file_path) else: if data['ON_DISK']: file_path = urlparse.urlparse(data['DATA']).path @@ -198,7 +194,7 @@ class ClipboardMenu(Palette): os.write(f, data['DATA']) finally: os.close(f) - mime_type = format + transfer_ownership = True jobject = datastore.create() jobject.metadata['title'] = _('Clipboard object: %s.') % obj['NAME'] @@ -206,9 +202,9 @@ class ClipboardMenu(Palette): jobject.metadata['buddies'] = '' jobject.metadata['preview'] = '' jobject.metadata['icon-color'] = profile.get_color().to_string() - jobject.metadata['mime_type'] = mime_type + jobject.metadata['mime_type'] = mime.get_for_file(file_path) jobject.file_path = file_path - datastore.write(jobject) + datastore.write(jobject, transfer_ownership=transfer_ownership) return jobject diff --git a/sugar/activity/activity.py b/sugar/activity/activity.py index a5661cd..f734c61 100644 --- a/sugar/activity/activity.py +++ b/sugar/activity/activity.py @@ -284,6 +284,9 @@ class Activity(Window, gtk.Container): #del self._jobject.metadata['ctime'] del self._jobject.metadata['mtime'] + if not self._jobject.metadata.has_key('title'): + self._jobject.metadata['title'] = '' + try: share_scope = self._jobject.metadata['share-scope'] title = self._jobject.metadata['title'] diff --git a/sugar/activity/bundlebuilder.py b/sugar/activity/bundlebuilder.py index b0e46ab..d2b1a89 100644 --- a/sugar/activity/bundlebuilder.py +++ b/sugar/activity/bundlebuilder.py @@ -230,7 +230,7 @@ def cmd_genpot(bundle_name, manifest): f.close() args = [ 'xgettext', '--join-existing', '--language=Python', - '--keyword=_', '--output=%s' % pot_file ] + '--keyword=_', '--add-comments=TRANS:', '--output=%s' % pot_file ] args += python_files retcode = subprocess.call(args) diff --git a/sugar/datastore/datastore.py b/sugar/datastore/datastore.py index 0be6a2f..d4340fe 100644 --- a/sugar/datastore/datastore.py +++ b/sugar/datastore/datastore.py @@ -138,6 +138,8 @@ class DSObject(object): activityfactory.create(bundle.get_service_name()) else: + if not self.get_activities(): + return if service_name is None: service_name = self.get_activities()[0].service_name -- cgit v0.9.1