diff options
| author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-08-15 10:19:29 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2007-08-15 10:19:29 (GMT) |
| commit | c54fb84b28cca54c7d0cb0355b7a21f3cbabfc4d (patch) | |
| tree | 6511f37709c0feb2bcd2206a76e51bf66cdc436f /services | |
| parent | 43fb1627a7ce9a5e05230699cda7448c44f5c689 (diff) | |
#2543: Offer multiple activities for opening clipboard objects.
Diffstat (limited to 'services')
| -rw-r--r-- | services/shell/clipboardobject.py | 5 | ||||
| -rw-r--r-- | services/shell/clipboardservice.py | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/services/shell/clipboardobject.py b/services/shell/clipboardobject.py index bc51f47..65f3bc5 100644 --- a/services/shell/clipboardobject.py +++ b/services/shell/clipboardobject.py @@ -65,16 +65,15 @@ class ClipboardObject: #return self._get_type_info().get_preview() return '' - def get_activity(self): + def get_activities(self): mime = self.get_mime_type() if not mime: return '' registry = bundleregistry.get_registry() activities = registry.get_activities_for_type(self.get_mime_type()) - # TODO: should we return several activities? if activities: - return activities[0].get_service_name() + return [activity.get_service_name() for activity in activities] else: return '' diff --git a/services/shell/clipboardservice.py b/services/shell/clipboardservice.py index 19958a7..90e1b8e 100644 --- a/services/shell/clipboardservice.py +++ b/services/shell/clipboardservice.py @@ -33,7 +33,7 @@ NAME_KEY = 'NAME' PERCENT_KEY = 'PERCENT' ICON_KEY = 'ICON' PREVIEW_KEY = 'PREVIEW' -ACTIVITY_KEY = 'ACTIVITY' +ACTIVITIES_KEY = 'ACTIVITIES' FORMATS_KEY = 'FORMATS' TYPE_KEY = 'TYPE' @@ -87,7 +87,7 @@ class ClipboardService(dbus.service.Object): PERCENT_KEY: cb_object.get_percent(), ICON_KEY: cb_object.get_icon(), PREVIEW_KEY: cb_object.get_preview(), - ACTIVITY_KEY: cb_object.get_activity()}) + ACTIVITIES_KEY: cb_object.get_activities()}) @dbus.service.method(_CLIPBOARD_DBUS_INTERFACE, in_signature="o", out_signature="") @@ -121,7 +121,7 @@ class ClipboardService(dbus.service.Object): PERCENT_KEY: percent, ICON_KEY: cb_object.get_icon(), PREVIEW_KEY: cb_object.get_preview(), - ACTIVITY_KEY: cb_object.get_activity()}) + ACTIVITIES_KEY: cb_object.get_activities()}) @dbus.service.method(_CLIPBOARD_DBUS_INTERFACE, in_signature="o", out_signature="a{sv}") @@ -142,7 +142,7 @@ class ClipboardService(dbus.service.Object): PERCENT_KEY: cb_object.get_percent(), ICON_KEY: cb_object.get_icon(), PREVIEW_KEY: cb_object.get_preview(), - ACTIVITY_KEY: cb_object.get_activity(), + ACTIVITIES_KEY: cb_object.get_activities(), FORMATS_KEY: format_types} return dbus.Dictionary(result_dict) |