From 9e20803bb63c4480fb2b58b5dac51bbef0ed302a Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 21 Jan 2009 14:54:18 +0000 Subject: Display a message when the collaboration connection doesn't support file transfer --- (limited to 'src') diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py index 9730dee..19217e3 100644 --- a/src/jarabe/journal/palettes.py +++ b/src/jarabe/journal/palettes.py @@ -145,18 +145,25 @@ class FriendsMenu(gtk.Menu): def __init__(self): gobject.GObject.__init__(self) - friends_model = friends.get_model() - for friend in friends_model: - if friend.is_present(): - menu_item = MenuItem(text_label=friend.get_nick(), - icon_name='computer-xo', - xo_color=friend.get_color()) - menu_item.connect('activate', self.__item_activate_cb, friend) + if filetransfer.file_transfer_available(): + friends_model = friends.get_model() + for friend in friends_model: + if friend.is_present(): + menu_item = MenuItem(text_label=friend.get_nick(), + icon_name='computer-xo', + xo_color=friend.get_color()) + menu_item.connect('activate', self.__item_activate_cb, + friend) + self.append(menu_item) + menu_item.show() + + if not self.get_children(): + menu_item = MenuItem(_('No friends present')) + menu_item.set_sensitive(False) self.append(menu_item) - menu_item.show() - - if not self.get_children(): - menu_item = MenuItem(_('No friends present')) + menu_item.show() + else: + menu_item = MenuItem(_('No valid connection found')) menu_item.set_sensitive(False) self.append(menu_item) menu_item.show() diff --git a/src/jarabe/model/filetransfer.py b/src/jarabe/model/filetransfer.py index 781b4e1..c66a19c 100644 --- a/src/jarabe/model/filetransfer.py +++ b/src/jarabe/model/filetransfer.py @@ -315,11 +315,14 @@ def _monitor_connection(connection): def _connection_addded_cb(conn_watcher, connection): _monitor_connection(connection) +_conn_watcher = None + def init(): - conn_watcher = connection_watcher.ConnectionWatcher() - conn_watcher.connect('connection-added', _connection_addded_cb) + global _conn_watcher + _conn_watcher = connection_watcher.ConnectionWatcher() + _conn_watcher.connect('connection-added', _connection_addded_cb) - for connection in conn_watcher.get_connections(): + for connection in _conn_watcher.get_connections(): _monitor_connection(connection) def start_transfer(buddy, file_name, title, description, mime_type): @@ -327,5 +330,23 @@ def start_transfer(buddy, file_name, title, description, mime_type): description, mime_type) new_file_transfer.send(None, file_transfer=outgoing_file_transfer) +def file_transfer_available(): + for connection in _conn_watcher.get_connections(): + + properties_iface = connection[dbus.PROPERTIES_IFACE] + properties = properties_iface.GetAll(CONNECTION_INTERFACE_REQUESTS) + classes = properties['RequestableChannelClasses'] + for prop, allowed_prop in classes: + + channel_type = prop.get(CHANNEL + '.ChannelType', '') + target_handle_type = prop.get(CHANNEL + '.TargetHandleType', '') + + if len(prop) == 2 and \ + channel_type == CHANNEL_TYPE_FILE_TRANSFER and \ + target_handle_type == CONNECTION_HANDLE_TYPE_CONTACT: + return True + + return False + new_file_transfer = dispatch.Signal() -- cgit v0.9.1