aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-main-window.c
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2010-08-25 19:08:02 +0800
committerPhilip Withnall <philip.withnall@collabora.co.uk>2010-08-27 17:23:48 +0800
commit8c812cfbd960392d2acee585c3d7d3030d3e3fa8 (patch)
tree9ec92562302be78a807b5ba7da2ec643afde7f40 /src/empathy-main-window.c
parente2f43f8e42064400f777e52937b845f804331b26 (diff)
downloadgsoc2013-empathy-8c812cfbd960392d2acee585c3d7d3030d3e3fa8.tar
gsoc2013-empathy-8c812cfbd960392d2acee585c3d7d3030d3e3fa8.tar.gz
gsoc2013-empathy-8c812cfbd960392d2acee585c3d7d3030d3e3fa8.tar.bz2
gsoc2013-empathy-8c812cfbd960392d2acee585c3d7d3030d3e3fa8.tar.lz
gsoc2013-empathy-8c812cfbd960392d2acee585c3d7d3030d3e3fa8.tar.xz
gsoc2013-empathy-8c812cfbd960392d2acee585c3d7d3030d3e3fa8.tar.zst
gsoc2013-empathy-8c812cfbd960392d2acee585c3d7d3030d3e3fa8.zip
Add an EmpathyIndividualView feature for receiving Persona drops
This is necessary to avoid Personas being droppable on the main contact list, which makes no sense (for the time being). Helps: bgo#627715
Diffstat (limited to 'src/empathy-main-window.c')
-rw-r--r--src/empathy-main-window.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 0efa4a97d..07725fa3b 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -1673,9 +1673,12 @@ empathy_main_window_init (EmpathyMainWindow *window)
individual_manager);
g_object_unref (individual_manager);
+ /* For the moment, we disallow Persona drops onto the main contact list (e.g. from things such as
+ * the EmpathyPersonaView in the linking dialogue). No code is hooked up to do anything on a Persona
+ * drop, so allowing them would achieve nothing except confusion. */
priv->individual_view = empathy_individual_view_new (
priv->individual_store,
- EMPATHY_INDIVIDUAL_VIEW_FEATURE_ALL,
+ EMPATHY_INDIVIDUAL_VIEW_FEATURE_ALL ^ EMPATHY_INDIVIDUAL_VIEW_FEATURE_PERSONA_DROP,
EMPATHY_INDIVIDUAL_FEATURE_ALL);
priv->butterfly_log_migration_members_changed_id = g_signal_connect (