]> git.0d.be Git - empathy.git/blobdiff - libempathy-gtk/empathy-contact-widget.c
Add a public method to change the contact showed.
[empathy.git] / libempathy-gtk / empathy-contact-widget.c
index 1446c87f475dd999898bb159c40e4a25fa6eaf62..a03571d9a1562a9d7186163f8f15a958d82bb4f8 100644 (file)
@@ -2,20 +2,19 @@
 /*
  * Copyright (C) 2007 Collabora Ltd.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
 
 #include <libmissioncontrol/mc-account.h>
 
+#include <libempathy/empathy-contact-factory.h>
 #include <libempathy/empathy-contact-manager.h>
+#include <libempathy/empathy-contact-list.h>
+#include <libempathy/empathy-utils.h>
 
 #include "empathy-contact-widget.h"
-#include "gossip-account-chooser.h"
-#include "gossip-ui-utils.h"
+#include "empathy-account-chooser.h"
+#include "empathy-avatar-chooser.h"
+#include "empathy-avatar-image.h"
+#include "empathy-ui-utils.h"
+
+/* Delay before updating the widget when the id entry changed (seconds) */
+#define ID_CHANGED_TIMEOUT 1
 
 typedef struct {
-       GossipContact   *contact;
-       gboolean         is_user;
-       gboolean         editable;
-       gboolean         can_change_contact;
-       GtkCellRenderer *renderer;
+       EmpathyContactFactory    *factory;
+       EmpathyContactManager    *manager;
+       EmpathyContact           *contact;
+       EmpathyContactWidgetFlags flags;
+       GtkCellRenderer          *renderer;
+       guint                     widget_id_timeout;
 
-       GtkWidget       *vbox_contact_widget;
+       GtkWidget                *vbox_contact_widget;
 
        /* Contact */
-       GtkWidget       *vbox_contact;
-       GtkWidget       *widget_avatar;
-       GtkWidget       *widget_account;
-       GtkWidget       *widget_id;
-       GtkWidget       *widget_alias;
-       GtkWidget       *label_alias;
-       GtkWidget       *entry_alias;
-       GtkWidget       *hbox_presence;
-       GtkWidget       *image_state;
-       GtkWidget       *label_status;
-       GtkWidget       *table_contact;
-       GtkWidget       *hbox_contact;
+       GtkWidget                *vbox_contact;
+       GtkWidget                *widget_avatar;
+       GtkWidget                *widget_account;
+       GtkWidget                *widget_id;
+       GtkWidget                *widget_alias;
+       GtkWidget                *label_alias;
+       GtkWidget                *entry_alias;
+       GtkWidget                *hbox_presence;
+       GtkWidget                *image_state;
+       GtkWidget                *label_status;
+       GtkWidget                *table_contact;
+       GtkWidget                *vbox_avatar;
 
        /* Groups */
-       GtkWidget       *vbox_groups;
-       GtkWidget       *entry_group;
-       GtkWidget       *button_group;
-       GtkWidget       *treeview_groups;
+       GtkWidget                *vbox_groups;
+       GtkWidget                *entry_group;
+       GtkWidget                *button_group;
+       GtkWidget                *treeview_groups;
 
        /* Details */
-       GtkWidget       *vbox_details;
-       GtkWidget       *table_details;
-       GtkWidget       *hbox_details_requested;
+       GtkWidget                *vbox_details;
+       GtkWidget                *table_details;
+       GtkWidget                *hbox_details_requested;
 
        /* Client */
-       GtkWidget       *vbox_client;
-       GtkWidget       *table_client;
-       GtkWidget       *hbow_client_requested;
-
+       GtkWidget                *vbox_client;
+       GtkWidget                *table_client;
+       GtkWidget                *hbow_client_requested;
 } EmpathyContactWidget;
 
 typedef struct {
@@ -89,16 +96,18 @@ static void     contact_widget_destroy_cb                 (GtkWidget
                                                           EmpathyContactWidget  *information);
 static void     contact_widget_remove_contact             (EmpathyContactWidget  *information);
 static void     contact_widget_set_contact                (EmpathyContactWidget  *information,
-                                                          GossipContact         *contact);
+                                                          EmpathyContact         *contact);
 static void     contact_widget_contact_setup              (EmpathyContactWidget  *information);
 static void     contact_widget_contact_update             (EmpathyContactWidget  *information);
-static gboolean contact_widget_update_contact             (EmpathyContactWidget  *information);
+static void     contact_widget_change_contact             (EmpathyContactWidget  *information);
+static void     contact_widget_avatar_changed_cb          (EmpathyAvatarChooser  *chooser,
+                                                          EmpathyContactWidget  *information);
 static void     contact_widget_account_changed_cb         (GtkComboBox           *widget,
                                                           EmpathyContactWidget  *information);
 static gboolean contact_widget_id_focus_out_cb            (GtkWidget             *widget,
                                                           GdkEventFocus         *event,
                                                           EmpathyContactWidget  *information);
-static void     contact_widget_entry_alias_focus_event_cb (GtkEditable           *editable,
+static gboolean contact_widget_entry_alias_focus_event_cb (GtkEditable           *editable,
                                                           GdkEventFocus         *event,
                                                           EmpathyContactWidget  *information);
 static void     contact_widget_name_notify_cb             (EmpathyContactWidget  *information);
@@ -139,26 +148,17 @@ enum {
 };
 
 GtkWidget *
-empathy_contact_widget_new (GossipContact *contact,
-                           gboolean       editable)
+empathy_contact_widget_new (EmpathyContact           *contact,
+                           EmpathyContactWidgetFlags flags)
 {
        EmpathyContactWidget *information;
        GladeXML             *glade;
 
        information = g_slice_new0 (EmpathyContactWidget);
-       information->editable = editable;
-       if (contact) {
-               GossipContact *user_contact;
-       
-               user_contact = gossip_contact_get_user (contact);
-               information->is_user = gossip_contact_equal (contact, user_contact);
-               information->can_change_contact = FALSE;
-       } else {
-               information->is_user = FALSE;
-               information->can_change_contact = TRUE;
-       }
+       information->flags = flags;
+       information->factory = empathy_contact_factory_new ();
 
-       glade = gossip_glade_get_file ("empathy-contact-widget.glade",
+       glade = empathy_glade_get_file ("empathy-contact-widget.glade",
                                       "vbox_contact_widget",
                                       NULL,
                                       "vbox_contact_widget", &information->vbox_contact_widget,
@@ -168,7 +168,7 @@ empathy_contact_widget_new (GossipContact *contact,
                                       "image_state", &information->image_state,
                                       "label_status", &information->label_status,
                                       "table_contact", &information->table_contact,
-                                      "hbox_contact", &information->hbox_contact,
+                                      "vbox_avatar", &information->vbox_avatar,
                                       "vbox_groups", &information->vbox_groups,
                                       "entry_group", &information->entry_group,
                                       "button_group", &information->button_group,
@@ -181,7 +181,7 @@ empathy_contact_widget_new (GossipContact *contact,
                                       "hbox_client_requested", &information->hbow_client_requested,
                                       NULL);
 
-       gossip_glade_connect (glade,
+       empathy_glade_connect (glade,
                              information,
                              "vbox_contact_widget", "destroy", contact_widget_destroy_cb,
                              "entry_group", "changed", contact_widget_entry_group_changed_cb,
@@ -208,7 +208,7 @@ empathy_contact_widget_new (GossipContact *contact,
        return information->vbox_contact_widget;
 }
 
-GossipContact *
+EmpathyContact *
 empathy_contact_widget_get_contact (GtkWidget *widget)
 {
        EmpathyContactWidget *information;
@@ -222,12 +222,61 @@ empathy_contact_widget_get_contact (GtkWidget *widget)
 
        return information->contact;
 }
+
+void
+empathy_contact_widget_set_contact (GtkWidget      *widget,
+                                   EmpathyContact *contact)
+{
+       EmpathyContactWidget *information;
+
+       g_return_if_fail (GTK_IS_WIDGET (widget));
+       g_return_if_fail (EMPATHY_IS_CONTACT (contact));
+
+       information = g_object_get_data (G_OBJECT (widget), "EmpathyContactWidget");
+       if (!information) {
+               return;
+       }
+
+       contact_widget_set_contact (information, contact);
+}
+
+void
+empathy_contact_widget_set_account_filter (GtkWidget                       *widget,
+                                          EmpathyAccountChooserFilterFunc  filter,
+                                          gpointer                         user_data)
+{
+       EmpathyContactWidget  *information;
+       EmpathyAccountChooser *chooser;
+
+       g_return_if_fail (GTK_IS_WIDGET (widget));
+
+       information = g_object_get_data (G_OBJECT (widget), "EmpathyContactWidget");
+       if (!information) {
+               return;
+       }
+
+       chooser = EMPATHY_ACCOUNT_CHOOSER (information->widget_account);
+       if (chooser) {
+               empathy_account_chooser_set_filter (chooser, filter, user_data);
+       }
+}
        
 static void
 contact_widget_destroy_cb (GtkWidget            *widget,
                           EmpathyContactWidget *information)
 {
        contact_widget_remove_contact (information);
+
+       if (information->widget_id_timeout != 0) {
+               g_source_remove (information->widget_id_timeout);
+       }
+       if (information->factory) {
+               g_object_unref (information->factory);
+       }               
+       if (information->manager) {
+               g_object_unref (information->manager);
+       }               
+
        g_slice_free (EmpathyContactWidget, information);
 }
 
@@ -255,8 +304,14 @@ contact_widget_remove_contact (EmpathyContactWidget *information)
 
 static void
 contact_widget_set_contact (EmpathyContactWidget *information,
-                           GossipContact        *contact)
+                           EmpathyContact        *contact)
 {
+       if (contact == information->contact ||
+           (contact && information->contact &&
+            empathy_contact_equal (contact, information->contact))) {
+               return;
+       }
+
        contact_widget_remove_contact (information);
        if (contact) {
                information->contact = g_object_ref (contact);
@@ -269,25 +324,55 @@ contact_widget_set_contact (EmpathyContactWidget *information,
        contact_widget_client_update (information);
 }
 
+static gboolean
+contact_widget_id_activate_timeout (EmpathyContactWidget *self)
+{
+       contact_widget_change_contact (self);
+       return FALSE;
+}
+
+static void
+contact_widget_id_changed_cb (GtkEntry             *entry,
+                              EmpathyContactWidget *self)
+{
+       if (self->widget_id_timeout != 0) {             
+               g_source_remove (self->widget_id_timeout);
+       }
+
+       self->widget_id_timeout =
+               g_timeout_add_seconds (ID_CHANGED_TIMEOUT,
+                                      (GSourceFunc) contact_widget_id_activate_timeout,
+                                      self);
+}
+
 static void
 contact_widget_contact_setup (EmpathyContactWidget *information)
 {
-       /* FIXME: Use GossipAvatarImage if (editable && is_user)  */
-       information->widget_avatar = gtk_image_new ();
-       gtk_box_pack_end (GTK_BOX (information->hbox_contact),
-                         information->widget_avatar,
-                         FALSE, FALSE,
-                         6);
+       if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_AVATAR) {
+               information->widget_avatar = empathy_avatar_chooser_new ();
+               g_signal_connect (information->widget_avatar, "changed",
+                                 G_CALLBACK (contact_widget_avatar_changed_cb),
+                                 information);
+       } else {
+               information->widget_avatar = empathy_avatar_image_new ();
+       }
+       gtk_box_pack_start (GTK_BOX (information->vbox_avatar),
+                           information->widget_avatar,
+                           FALSE, FALSE,
+                           6);
+       gtk_widget_show (information->widget_avatar);
 
        /* Setup account label/chooser */
-       if (information->can_change_contact) {
-               information->widget_account = gossip_account_chooser_new ();
+       if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_ACCOUNT) {
+               information->widget_account = empathy_account_chooser_new ();
+
                g_signal_connect (information->widget_account, "changed",
                                  G_CALLBACK (contact_widget_account_changed_cb),
                                  information);
        } else {
                information->widget_account = gtk_label_new (NULL);
                gtk_label_set_selectable (GTK_LABEL (information->widget_account), TRUE);
+               gtk_misc_set_alignment (GTK_MISC (information->widget_account), 0, 0.5);
        }
        gtk_table_attach_defaults (GTK_TABLE (information->table_contact),
                                   information->widget_account,
@@ -295,14 +380,18 @@ contact_widget_contact_setup (EmpathyContactWidget *information)
        gtk_widget_show (information->widget_account);
 
        /* Setup id label/entry */
-       if (information->can_change_contact) {
+       if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_ID) {
                information->widget_id = gtk_entry_new ();
                g_signal_connect (information->widget_id, "focus-out-event",
                                  G_CALLBACK (contact_widget_id_focus_out_cb),
                                  information);
+               g_signal_connect (information->widget_id, "changed",
+                                 G_CALLBACK (contact_widget_id_changed_cb),
+                                 information);
        } else {
                information->widget_id = gtk_label_new (NULL);
                gtk_label_set_selectable (GTK_LABEL (information->widget_id), TRUE);
+               gtk_misc_set_alignment (GTK_MISC (information->widget_id), 0, 0.5);
        }
        gtk_table_attach_defaults (GTK_TABLE (information->table_contact),
                                   information->widget_id,
@@ -310,7 +399,7 @@ contact_widget_contact_setup (EmpathyContactWidget *information)
        gtk_widget_show (information->widget_id);
 
        /* Setup alias label/entry */
-       if (information->editable) {
+       if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_ALIAS) {
                information->widget_alias = gtk_entry_new ();
                g_signal_connect (information->widget_alias, "focus-out-event",
                                  G_CALLBACK (contact_widget_entry_alias_focus_event_cb),
@@ -318,6 +407,7 @@ contact_widget_contact_setup (EmpathyContactWidget *information)
        } else {
                information->widget_alias = gtk_label_new (NULL);
                gtk_label_set_selectable (GTK_LABEL (information->widget_alias), TRUE);
+               gtk_misc_set_alignment (GTK_MISC (information->widget_alias), 0, 0.5);
        }
        gtk_table_attach_defaults (GTK_TABLE (information->table_contact),
                                   information->widget_alias,
@@ -343,39 +433,37 @@ contact_widget_contact_update (EmpathyContactWidget *information)
                                          G_CALLBACK (contact_widget_avatar_notify_cb),
                                          information);
 
-               account = gossip_contact_get_account (information->contact);
-               id = gossip_contact_get_id (information->contact);
+               account = empathy_contact_get_account (information->contact);
+               id = empathy_contact_get_id (information->contact);
        }
 
        /* Update account widget */
-       if (information->can_change_contact) {
+       if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_ACCOUNT) {
                if (account) {
                        g_signal_handlers_block_by_func (information->widget_account,
                                                         contact_widget_account_changed_cb,
                                                         information);
-                       gossip_account_chooser_set_account (GOSSIP_ACCOUNT_CHOOSER (information->widget_account),
+                       empathy_account_chooser_set_account (EMPATHY_ACCOUNT_CHOOSER (information->widget_account),
                                                            account);
                        g_signal_handlers_unblock_by_func (information->widget_account,
                                                           contact_widget_account_changed_cb,
                                                           information);
                }
-       }
-       else if (account) {
-               const gchar *name;
+       } else {
+               if (account) {
+                       const gchar *name;
 
-               name = mc_account_get_display_name (account);
-               gtk_label_set_label (GTK_LABEL (information->widget_account), name);
+                       name = mc_account_get_display_name (account);
+                       gtk_label_set_label (GTK_LABEL (information->widget_account), name);
+               }
        }
 
        /* Update id widget */
-       if (information->can_change_contact) {
-               if (!G_STR_EMPTY (id)) {
-                       gtk_entry_set_text (GTK_ENTRY (information->widget_id), id);
-               }
+       if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_ID) {
+               gtk_entry_set_text (GTK_ENTRY (information->widget_id), id ? id : "");
        } else {
-               gtk_label_set_label (GTK_LABEL (information->widget_id), id);
+               gtk_label_set_label (GTK_LABEL (information->widget_id), id ? id : "");
        }
-
        /* Update other widgets */
        if (information->contact) {
                contact_widget_name_notify_cb (information);
@@ -385,6 +473,7 @@ contact_widget_contact_update (EmpathyContactWidget *information)
                gtk_widget_show (information->label_alias);
                gtk_widget_show (information->widget_alias);
                gtk_widget_show (information->hbox_presence);
+               gtk_widget_show (information->widget_avatar);
        } else {
                gtk_widget_hide (information->label_alias);
                gtk_widget_hide (information->widget_alias);
@@ -393,37 +482,63 @@ contact_widget_contact_update (EmpathyContactWidget *information)
        }
 }
 
-static gboolean
-contact_widget_update_contact (EmpathyContactWidget *information)
+static void
+contact_widget_change_contact (EmpathyContactWidget *information)
 {
-       McAccount   *account;
-       const gchar *id;
+       EmpathyContact *contact;
+       McAccount      *account;
 
-       account = gossip_account_chooser_get_account (GOSSIP_ACCOUNT_CHOOSER (information->widget_account));
-       id = gtk_entry_get_text (GTK_ENTRY (information->widget_id));
-
-       if (account && !G_STR_EMPTY (id)) {
-               EmpathyContactManager *manager;
-               GossipContact         *contact;
+       account = empathy_account_chooser_get_account (EMPATHY_ACCOUNT_CHOOSER (information->widget_account));
+       if (!account) {
+               return;
+       }
 
-               manager = empathy_contact_manager_new ();
-               contact = empathy_contact_manager_create (manager, account, id);
-               contact_widget_set_contact (information, contact);
+       if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_ID) {
+               const gchar *id;
 
-               if (contact) {
-                       g_object_unref (contact);
+               id = gtk_entry_get_text (GTK_ENTRY (information->widget_id));
+               if (G_STR_EMPTY (id)) {
+                       return;
                }
-               g_object_unref (manager);
+
+               contact = empathy_contact_factory_get_from_id (information->factory,
+                                                              account, id);
+       } else {
+               contact = empathy_contact_factory_get_user (information->factory,
+                                                           account);
        }
 
-       return FALSE;
+       if (contact) {
+               contact_widget_set_contact (information, contact);
+               g_object_unref (contact);
+       }
+}
+
+static void
+contact_widget_avatar_changed_cb (EmpathyAvatarChooser *chooser,
+                                 EmpathyContactWidget *information)
+{
+       if (information->contact &&
+           empathy_contact_is_user (information->contact)) {
+               McAccount   *account;
+               const gchar *data;
+               gsize        size;
+               const gchar *mime_type;
+
+               account = empathy_contact_get_account (information->contact);
+               empathy_avatar_chooser_get_image_data (EMPATHY_AVATAR_CHOOSER (information->widget_avatar),
+                                                      &data, &size, &mime_type);
+               empathy_contact_factory_set_avatar (information->factory,
+                                                   account,
+                                                   data, size, mime_type);
+       }
 }
 
 static void
 contact_widget_account_changed_cb (GtkComboBox          *widget,
                                   EmpathyContactWidget *information)
 {
-       contact_widget_update_contact (information);
+       contact_widget_change_contact (information);
 }
 
 static gboolean
@@ -431,32 +546,36 @@ contact_widget_id_focus_out_cb (GtkWidget            *widget,
                                GdkEventFocus        *event,
                                EmpathyContactWidget *information)
 {
-       contact_widget_update_contact (information);
+       contact_widget_change_contact (information);
        return FALSE;
 }
 
-static void
+static gboolean
 contact_widget_entry_alias_focus_event_cb (GtkEditable          *editable,
                                           GdkEventFocus        *event,
                                           EmpathyContactWidget *information)
 {
        if (information->contact) {
-               const gchar *name;
+               const gchar *alias;
 
-               name = gtk_entry_get_text (GTK_ENTRY (editable));
-               gossip_contact_set_name (information->contact, name);
+               alias = gtk_entry_get_text (GTK_ENTRY (editable));
+               empathy_contact_factory_set_alias (information->factory,
+                                                 information->contact,
+                                                 alias);
        }
+
+       return FALSE;
 }
 
 static void
 contact_widget_name_notify_cb (EmpathyContactWidget *information)
 {
-       if (information->editable) {
+       if (GTK_IS_ENTRY (information->widget_alias)) {
                gtk_entry_set_text (GTK_ENTRY (information->widget_alias),
-                                   gossip_contact_get_name (information->contact));
+                                   empathy_contact_get_name (information->contact));
        } else {
                gtk_label_set_label (GTK_LABEL (information->widget_alias),
-                                    gossip_contact_get_name (information->contact));
+                                    empathy_contact_get_name (information->contact));
        }
 }
 
@@ -464,9 +583,9 @@ static void
 contact_widget_presence_notify_cb (EmpathyContactWidget *information)
 {
        gtk_label_set_text (GTK_LABEL (information->label_status),
-                           gossip_contact_get_status (information->contact));
+                           empathy_contact_get_status (information->contact));
        gtk_image_set_from_icon_name (GTK_IMAGE (information->image_state),
-                                     gossip_icon_name_for_contact (information->contact),
+                                     empathy_icon_name_for_contact (information->contact),
                                      GTK_ICON_SIZE_BUTTON);
 
 }
@@ -474,25 +593,31 @@ contact_widget_presence_notify_cb (EmpathyContactWidget *information)
 static void
 contact_widget_avatar_notify_cb (EmpathyContactWidget *information)
 {
-       GdkPixbuf *avatar_pixbuf;
-
-       avatar_pixbuf = gossip_pixbuf_avatar_from_contact_scaled (information->contact,
-                                                                 48, 48);
+       EmpathyAvatar *avatar = NULL;
 
-       if (avatar_pixbuf) {
-               gtk_image_set_from_pixbuf (GTK_IMAGE (information->widget_avatar),
-                                          avatar_pixbuf);
-               gtk_widget_show  (information->widget_avatar);
-               g_object_unref (avatar_pixbuf);
+       if (information->contact) {
+               avatar = empathy_contact_get_avatar (information->contact);
+       }
+       if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_AVATAR) {
+               g_signal_handlers_block_by_func (information->widget_avatar,
+                                                contact_widget_avatar_changed_cb,
+                                                information);
+               empathy_avatar_chooser_set (EMPATHY_AVATAR_CHOOSER (information->widget_avatar),
+                                           avatar);
+               g_signal_handlers_unblock_by_func (information->widget_avatar,
+                                                  contact_widget_avatar_changed_cb,
+                                                  information);
        } else {
-               gtk_widget_hide  (information->widget_avatar);
+               empathy_avatar_image_set (EMPATHY_AVATAR_IMAGE (information->widget_avatar),
+                                         avatar);
        }
 }
 
 static void
 contact_widget_groups_setup (EmpathyContactWidget *information)
 {
-       if (information->editable) {
+       if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_GROUPS) {
+               information->manager = empathy_contact_manager_new ();
                contact_widget_model_setup (information);
        }
 }
@@ -500,7 +625,8 @@ contact_widget_groups_setup (EmpathyContactWidget *information)
 static void
 contact_widget_groups_update (EmpathyContactWidget *information)
 {
-       if (information->editable && information->contact) {
+       if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_GROUPS &&
+           information->contact) {
                g_signal_connect_swapped (information->contact, "notify::groups",
                                          G_CALLBACK (contact_widget_groups_notify_cb),
                                          information);
@@ -590,21 +716,19 @@ contact_widget_model_populate_columns (EmpathyContactWidget *information)
 static void
 contact_widget_groups_populate_data (EmpathyContactWidget *information)
 {
-       EmpathyContactManager *manager;
-       GtkTreeView           *view;
-       GtkListStore          *store;
-       GtkTreeIter            iter;
-       GList                 *my_groups, *l;
-       GList                 *all_groups;
+       GtkTreeView  *view;
+       GtkListStore *store;
+       GtkTreeIter   iter;
+       GList        *my_groups, *l;
+       GList        *all_groups;
 
        view = GTK_TREE_VIEW (information->treeview_groups);
        store = GTK_LIST_STORE (gtk_tree_view_get_model (view));
        gtk_list_store_clear (store);
 
-       manager = empathy_contact_manager_new ();
-       all_groups = empathy_contact_manager_get_groups (manager);
-       my_groups = gossip_contact_get_groups (information->contact);
-       g_object_unref (manager);
+       all_groups = empathy_contact_list_get_all_groups (EMPATHY_CONTACT_LIST (information->manager));
+       my_groups = empathy_contact_list_get_groups (EMPATHY_CONTACT_LIST (information->manager),
+                                                    information->contact);
 
        for (l = all_groups; l; l = l->next) {
                const gchar *group_str;
@@ -624,7 +748,10 @@ contact_widget_groups_populate_data (EmpathyContactWidget *information)
                                    -1);
        }
 
+       g_list_foreach (all_groups, (GFunc) g_free, NULL);
+       g_list_foreach (my_groups, (GFunc) g_free, NULL);
        g_list_free (all_groups);
+       g_list_free (my_groups);
 }
 
 static void
@@ -725,9 +852,13 @@ contact_widget_cell_toggled (GtkCellRendererToggle *cell,
 
        if (group) {
                if (enabled) {
-                       gossip_contact_remove_group (information->contact, group);
+                       empathy_contact_list_remove_from_group (EMPATHY_CONTACT_LIST (information->manager),
+                                                               information->contact,
+                                                               group);
                } else {
-                       gossip_contact_add_group (information->contact, group); 
+                       empathy_contact_list_add_to_group (EMPATHY_CONTACT_LIST (information->manager),
+                                                          information->contact,
+                                                          group);
                }
 
                g_free (group);
@@ -779,7 +910,9 @@ contact_widget_button_group_clicked_cb (GtkButton             *button,
                            COL_ENABLED, TRUE,
                            -1);
 
-       gossip_contact_add_group (information->contact, group);
+       empathy_contact_list_add_to_group (EMPATHY_CONTACT_LIST (information->manager),
+                                          information->contact,
+                                          group);
 }
 
 static void