aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy-gtk/empathy-chat.c1
-rw-r--r--libempathy-gtk/empathy-contact-menu.c8
-rw-r--r--libempathy-gtk/empathy-contact-menu.h3
-rw-r--r--src/empathy-map-view.c1
4 files changed, 9 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 4b3bcb427..bc2f08e2d 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -3281,6 +3281,7 @@ empathy_chat_get_contact_menu (EmpathyChat *chat)
menu = empathy_contact_menu_new (priv->remote_contact,
EMPATHY_CONTACT_FEATURE_CALL |
EMPATHY_CONTACT_FEATURE_LOG |
+ EMPATHY_CONTACT_FEATURE_FT |
EMPATHY_CONTACT_FEATURE_INFO);
}
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index c7fd19b09..00d83ce5b 100644
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -97,9 +97,11 @@ empathy_contact_menu_new (EmpathyContact *contact,
gtk_widget_show (item);
/* File transfer */
- item = empathy_contact_file_transfer_menu_item_new (contact);
- gtk_menu_shell_append (shell, item);
- gtk_widget_show (item);
+ if (features & EMPATHY_CONTACT_FEATURE_FT) {
+ item = empathy_contact_file_transfer_menu_item_new (contact);
+ gtk_menu_shell_append (shell, item);
+ gtk_widget_show (item);
+ }
/* Share my desktop */
/* FIXME we should add the "Share my desktop" menu item if Vino is
diff --git a/libempathy-gtk/empathy-contact-menu.h b/libempathy-gtk/empathy-contact-menu.h
index 4c6d62f9d..2e0247420 100644
--- a/libempathy-gtk/empathy-contact-menu.h
+++ b/libempathy-gtk/empathy-contact-menu.h
@@ -36,7 +36,8 @@ typedef enum {
EMPATHY_CONTACT_FEATURE_EDIT = 1 << 3,
EMPATHY_CONTACT_FEATURE_INFO = 1 << 4,
EMPATHY_CONTACT_FEATURE_FAVOURITE = 1 << 5,
- EMPATHY_CONTACT_FEATURE_ALL = (1 << 6) - 1,
+ EMPATHY_CONTACT_FEATURE_FT = 1 << 6,
+ EMPATHY_CONTACT_FEATURE_ALL = (1 << 7) - 1,
} EmpathyContactFeatureFlags;
GtkWidget * empathy_contact_menu_new (EmpathyContact *contact,
diff --git a/src/empathy-map-view.c b/src/empathy-map-view.c
index 31fa997c2..9aa8108ba 100644
--- a/src/empathy-map-view.c
+++ b/src/empathy-map-view.c
@@ -210,6 +210,7 @@ marker_clicked_cb (ChamplainMarker *marker,
EMPATHY_CONTACT_FEATURE_CHAT |
EMPATHY_CONTACT_FEATURE_CALL |
EMPATHY_CONTACT_FEATURE_LOG |
+ EMPATHY_CONTACT_FEATURE_FT |
EMPATHY_CONTACT_FEATURE_INFO);
if (menu == NULL)