diff options
author | Simon Schampijer <simon@schampijer.de> | 2009-01-21 17:01:38 (GMT) |
---|---|---|
committer | Simon Schampijer <simon@schampijer.de> | 2009-01-21 17:01:38 (GMT) |
commit | be8cd3de7e6dea5c50dcba91cb32803a1e1b31b5 (patch) | |
tree | 8176fd6cd9e504f745854fba2827e26899c596ce /src/jarabe/journal/palettes.py | |
parent | f89b32f0c0297ff3375a996631525353bec823a9 (diff) | |
parent | 9e20803bb63c4480fb2b58b5dac51bbef0ed302a (diff) |
Merge branch 'master' of gitorious@git.sugarlabs.org:sugar/mainline
Diffstat (limited to 'src/jarabe/journal/palettes.py')
-rw-r--r-- | src/jarabe/journal/palettes.py | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py index 99db82f..a56d373 100644 --- a/src/jarabe/journal/palettes.py +++ b/src/jarabe/journal/palettes.py @@ -151,18 +151,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() |