diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-03-10 20:49:42 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-03-15 16:28:43 +0800 |
| commit | 71ad0f9d2f6a6c35719fbd4d5315ef1104299e7e (patch) | |
| tree | b54055e13805aa6435b28539f94d4d6d286203a2 | |
| parent | 3cab7c229b83bd9668c45a60d562a2e2574dfc49 (diff) | |
| download | gsoc2013-empathy-71ad0f9d2f6a6c35719fbd4d5315ef1104299e7e.tar.gz gsoc2013-empathy-71ad0f9d2f6a6c35719fbd4d5315ef1104299e7e.tar.zst gsoc2013-empathy-71ad0f9d2f6a6c35719fbd4d5315ef1104299e7e.zip | |
factor out group_can_be_modified
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-view.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c index 941207912..b11a20e14 100644 --- a/libempathy-gtk/empathy-contact-list-view.c +++ b/libempathy-gtk/empathy-contact-list-view.c @@ -254,6 +254,22 @@ contact_list_view_drag_got_contact (EmpathyTpContactFactory *factory, } static gboolean +group_can_be_modified (const gchar *name, + gboolean is_fake_group) +{ + /* Real groups can always be modified */ + if (!is_fake_group) + return TRUE; + + /* Only the favorite fake group can be modified so users can + * add/remove favorites using DnD */ + if (!tp_strdiff (name, EMPATHY_CONTACT_LIST_STORE_FAVORITE)) + return TRUE; + + return FALSE; +} + +static gboolean contact_list_view_contact_drag_received (GtkWidget *view, GdkDragContext *context, GtkTreeModel *model, @@ -273,18 +289,15 @@ contact_list_view_contact_drag_received (GtkWidget *view, gchar *new_group = NULL; gchar *old_group = NULL; gboolean success = TRUE; - gboolean is_fake_group; + gboolean new_group_is_fake; priv = GET_PRIV (view); sel_data = (const gchar *) gtk_selection_data_get_data (selection); new_group = empathy_contact_list_store_get_parent_group (model, - path, NULL, &is_fake_group); + path, NULL, &new_group_is_fake); - if (is_fake_group && - tp_strdiff (new_group, EMPATHY_CONTACT_LIST_STORE_FAVORITE)) - /* Fake groups can't be modified. We allow to drag to the favorite fake - * group tough so user can mark contact as favorite using DnD */ + if (!group_can_be_modified (new_group, new_group_is_fake)) return FALSE; /* Get source group information. */ |