diff options
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-view.c | 7 | ||||
| -rw-r--r-- | libempathy/empathy-contact-list.c | 12 | ||||
| -rw-r--r-- | libempathy/empathy-contact-list.h | 4 | ||||
| -rw-r--r-- | libempathy/empathy-contact-manager.c | 22 | ||||
| -rw-r--r-- | libempathy/empathy-tp-contact-list.c | 28 |
5 files changed, 73 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c index 498d88721..6e5ab8536 100644 --- a/libempathy-gtk/empathy-contact-list-view.c +++ b/libempathy-gtk/empathy-contact-list-view.c @@ -261,6 +261,7 @@ static const gchar *ui_info = " </popup>" " <popup name='Group'>" " <menuitem action='Rename'/>" + " <menuitem action='Remove'/>" " </popup>" "</ui>"; @@ -1426,6 +1427,12 @@ contact_list_view_action_cb (GtkAction *action, } else if (group && strcmp (name, "Rename") == 0) { } + else if (group && strcmp (name, "Remove") == 0) { + EmpathyContactList *list; + + list = empathy_contact_list_store_get_list_iface (priv->store); + empathy_contact_list_remove_group (list, group); + } g_free (group); if (contact) { diff --git a/libempathy/empathy-contact-list.c b/libempathy/empathy-contact-list.c index 563265267..5164ccf1a 100644 --- a/libempathy/empathy-contact-list.c +++ b/libempathy/empathy-contact-list.c @@ -203,3 +203,15 @@ empathy_contact_list_rename_group (EmpathyContactList *list, } } +void +empathy_contact_list_remove_group (EmpathyContactList *list, + const gchar *group) +{ + g_return_if_fail (EMPATHY_IS_CONTACT_LIST (list)); + g_return_if_fail (group != NULL); + + if (EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove_group) { + EMPATHY_CONTACT_LIST_GET_IFACE (list)->remove_group (list, group); + } +} + diff --git a/libempathy/empathy-contact-list.h b/libempathy/empathy-contact-list.h index 96ab79e98..35575e112 100644 --- a/libempathy/empathy-contact-list.h +++ b/libempathy/empathy-contact-list.h @@ -61,6 +61,8 @@ struct _EmpathyContactListIface { void (*rename_group) (EmpathyContactList *list, const gchar *old_group, const gchar *new_group); + void (*remove_group) (EmpathyContactList *list, + const gchar *group); }; GType empathy_contact_list_get_type (void) G_GNUC_CONST; @@ -84,6 +86,8 @@ void empathy_contact_list_remove_from_group (EmpathyContactList *list, void empathy_contact_list_rename_group (EmpathyContactList *list, const gchar *old_group, const gchar *new_group); +void empathy_contact_list_remove_group (EmpathyContactList *list, + const gchar *group); G_END_DECLS diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c index 219cf8886..d86275048 100644 --- a/libempathy/empathy-contact-manager.c +++ b/libempathy/empathy-contact-manager.c @@ -482,6 +482,27 @@ contact_manager_rename_group (EmpathyContactList *manager, &data); } +static void contact_manager_remove_group_foreach (McAccount *account, + EmpathyTpContactList *list, + const gchar *group) +{ + empathy_contact_list_remove_group (EMPATHY_CONTACT_LIST (list), + group); +} + +static void +contact_manager_remove_group (EmpathyContactList *manager, + const gchar *group) +{ + EmpathyContactManagerPriv *priv = GET_PRIV (manager); + + g_return_if_fail (EMPATHY_IS_CONTACT_MANAGER (manager)); + + g_hash_table_foreach (priv->lists, + (GHFunc) contact_manager_remove_group_foreach, + (gpointer) group); +} + static void contact_manager_iface_init (EmpathyContactListIface *iface) { @@ -494,5 +515,6 @@ contact_manager_iface_init (EmpathyContactListIface *iface) iface->add_to_group = contact_manager_add_to_group; iface->remove_from_group = contact_manager_remove_from_group; iface->rename_group = contact_manager_rename_group; + iface->remove_group = contact_manager_remove_group; } diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c index 805150177..2f366ff10 100644 --- a/libempathy/empathy-tp-contact-list.c +++ b/libempathy/empathy-tp-contact-list.c @@ -981,6 +981,33 @@ tp_contact_list_rename_group (EmpathyContactList *list, } static void +tp_contact_list_remove_group (EmpathyContactList *list, + const gchar *group) +{ + EmpathyTpGroup *tp_group; + GList *members; + + g_return_if_fail (EMPATHY_IS_TP_CONTACT_LIST (list)); + + tp_group = tp_contact_list_find_group (EMPATHY_TP_CONTACT_LIST (list), + group); + + if (!tp_group) { + return; + } + + empathy_debug (DEBUG_DOMAIN, "remove group %s", group); + + /* Remove all members of the group */ + members = empathy_tp_group_get_members (tp_group); + empathy_tp_group_remove_members (tp_group, members, ""); + empathy_tp_group_close (tp_group); + + g_list_foreach (members, (GFunc) g_object_unref, NULL); + g_list_free (members); +} + +static void tp_contact_list_iface_init (EmpathyContactListIface *iface) { iface->add = tp_contact_list_add; @@ -992,5 +1019,6 @@ tp_contact_list_iface_init (EmpathyContactListIface *iface) iface->add_to_group = tp_contact_list_add_to_group; iface->remove_from_group = tp_contact_list_remove_from_group; iface->rename_group = tp_contact_list_rename_group; + iface->remove_group = tp_contact_list_remove_group; } |