[empathy] add EMPATHY_CONTACT_FEATURE_FT



commit cfaa4c875c382545b06162854c286d1b5b3f0497
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Jan 25 10:03:33 2011 +0100

    add EMPATHY_CONTACT_FEATURE_FT

 libempathy-gtk/empathy-chat.c         |    1 +
 libempathy-gtk/empathy-contact-menu.c |    8 +++++---
 libempathy-gtk/empathy-contact-menu.h |    3 ++-
 src/empathy-map-view.c                |    1 +
 4 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 4b3bcb4..bc2f08e 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 c7fd19b..00d83ce 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 4c6d62f..2e02474 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 31fa997..9aa8108 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)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]