]> git.0d.be Git - empathy.git/blobdiff - libempathy-gtk/empathy-contact-widget.c
More flexible API for EmpathyContactWidget, we now have flags to set
[empathy.git] / libempathy-gtk / empathy-contact-widget.c
index b8ed7efb0c9ce3cc754034e32f852ee74f5c89d6..afd434f3f31e0133ba2535904e33ac6ea1b385ff 100644 (file)
 #include <glade/glade.h>
 #include <glib/gi18n.h>
 
+#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-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 (ms) */
+#define ID_CHANGED_TIMEOUT 500
 
 typedef struct {
-       GossipContact   *contact;
-       gboolean         is_user;
-       gboolean         editable;
-       gboolean         changes_made;
-       GtkCellRenderer *renderer;
-
-       GtkWidget       *vbox_contact_widget;
-
-       GtkWidget       *vbox_contact;
-       GtkWidget       *widget_avatar;
-       GtkWidget       *label_id;
-       GtkWidget       *entry_alias;
-       GtkWidget       *widget_alias;
-       GtkWidget       *image_state;
-       GtkWidget       *label_status;
-       GtkWidget       *table_contact;
-       GtkWidget       *hbox_contact;
-
-       GtkWidget       *vbox_groups;
-       GtkWidget       *entry_group;
-       GtkWidget       *button_group;
-       GtkWidget       *treeview_groups;
-
-       GtkWidget       *vbox_details;
-       GtkWidget       *table_details;
-       GtkWidget       *hbox_details_requested;
-
-       GtkWidget       *vbox_client;
-       GtkWidget       *table_client;
-       GtkWidget       *hbow_client_requested;
+       EmpathyContactFactory    *factory;
+       EmpathyContactManager    *manager;
+       EmpathyContact           *contact;
+       EmpathyContactWidgetFlags flags;
+       GtkCellRenderer          *renderer;
+       guint                     widget_id_timeout;
+
+       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                *vbox_avatar;
+
+       /* Groups */
+       GtkWidget                *vbox_groups;
+       GtkWidget                *entry_group;
+       GtkWidget                *button_group;
+       GtkWidget                *treeview_groups;
+
+       /* Details */
+       GtkWidget                *vbox_details;
+       GtkWidget                *table_details;
+       GtkWidget                *hbox_details_requested;
+
+       /* Client */
+       GtkWidget                *vbox_client;
+       GtkWidget                *table_client;
+       GtkWidget                *hbow_client_requested;
 } EmpathyContactWidget;
 
 typedef struct {
@@ -74,47 +93,53 @@ typedef struct {
        GtkTreeIter           found_iter;
 } FindName;
 
-typedef struct {
-       EmpathyContactWidget *information;
-       GList                *list;
-} FindSelected;
-
-static void     contact_widget_destroy_cb                  (GtkWidget             *widget,
-                                                           EmpathyContactWidget  *information);
-static void     contact_widget_contact_setup               (EmpathyContactWidget  *information);
-static void     contact_widget_name_notify_cb              (EmpathyContactWidget  *information);
-static void     contact_widget_presence_notify_cb          (EmpathyContactWidget  *information);
-static void     contact_widget_avatar_notify_cb            (EmpathyContactWidget  *information);
-static void     contact_widget_groups_setup                (EmpathyContactWidget  *information);
-static void     contact_widget_model_setup                 (EmpathyContactWidget  *information);
-static void     contact_widget_model_populate_columns      (EmpathyContactWidget  *information);
-static void     contact_widget_groups_populate_data        (EmpathyContactWidget  *information);
-static void     contact_widget_groups_notify_cb            (EmpathyContactWidget  *information);
-static gboolean contact_widget_model_find_name             (EmpathyContactWidget  *information,
-                                                           const gchar           *name,
-                                                           GtkTreeIter           *iter);
-static gboolean contact_widget_model_find_name_foreach     (GtkTreeModel          *model,
-                                                           GtkTreePath           *path,
-                                                           GtkTreeIter           *iter,
-                                                           FindName              *data);
-static GList *  contact_widget_model_find_selected         (EmpathyContactWidget  *information);
-static gboolean contact_widget_model_find_selected_foreach (GtkTreeModel          *model,
-                                                           GtkTreePath           *path,
-                                                           GtkTreeIter           *iter,
-                                                           FindSelected          *data);
-static void     contact_widget_cell_toggled                (GtkCellRendererToggle *cell,
-                                                           gchar                 *path_string,
-                                                           EmpathyContactWidget  *information);
-static void     contact_widget_entry_alias_changed_cb      (GtkEditable           *editable,
-                                                           EmpathyContactWidget  *information);
-static void     contact_widget_entry_group_changed_cb      (GtkEditable           *editable,
-                                                           EmpathyContactWidget  *information);
-static void     contact_widget_entry_group_activate_cb     (GtkEntry              *entry,
-                                                           EmpathyContactWidget  *information);
-static void     contact_widget_button_group_clicked_cb     (GtkButton             *button,
-                                                           EmpathyContactWidget  *information);
-static void     contact_widget_details_setup               (EmpathyContactWidget  *information);
-static void     contact_widget_client_setup                (EmpathyContactWidget  *information);
+static void     contact_widget_destroy_cb                 (GtkWidget             *widget,
+                                                          EmpathyContactWidget  *information);
+static void     contact_widget_remove_contact             (EmpathyContactWidget  *information);
+static void     contact_widget_set_contact                (EmpathyContactWidget  *information,
+                                                          EmpathyContact         *contact);
+static void     contact_widget_contact_setup              (EmpathyContactWidget  *information);
+static void     contact_widget_contact_update             (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 gboolean contact_widget_entry_alias_focus_event_cb (GtkEditable           *editable,
+                                                          GdkEventFocus         *event,
+                                                          EmpathyContactWidget  *information);
+static void     contact_widget_name_notify_cb             (EmpathyContactWidget  *information);
+static void     contact_widget_presence_notify_cb         (EmpathyContactWidget  *information);
+static void     contact_widget_avatar_notify_cb           (EmpathyContactWidget  *information);
+static void     contact_widget_groups_setup               (EmpathyContactWidget  *information);
+static void     contact_widget_groups_update              (EmpathyContactWidget  *information);
+static void     contact_widget_model_setup                (EmpathyContactWidget  *information);
+static void     contact_widget_model_populate_columns     (EmpathyContactWidget  *information);
+static void     contact_widget_groups_populate_data       (EmpathyContactWidget  *information);
+static void     contact_widget_groups_notify_cb           (EmpathyContactWidget  *information);
+static gboolean contact_widget_model_find_name            (EmpathyContactWidget  *information,
+                                                          const gchar           *name,
+                                                          GtkTreeIter           *iter);
+static gboolean contact_widget_model_find_name_foreach    (GtkTreeModel          *model,
+                                                          GtkTreePath           *path,
+                                                          GtkTreeIter           *iter,
+                                                          FindName              *data);
+static void     contact_widget_cell_toggled               (GtkCellRendererToggle *cell,
+                                                          gchar                 *path_string,
+                                                          EmpathyContactWidget  *information);
+static void     contact_widget_entry_group_changed_cb     (GtkEditable           *editable,
+                                                          EmpathyContactWidget  *information);
+static void     contact_widget_entry_group_activate_cb    (GtkEntry              *entry,
+                                                          EmpathyContactWidget  *information);
+static void     contact_widget_button_group_clicked_cb    (GtkButton             *button,
+                                                          EmpathyContactWidget  *information);
+static void     contact_widget_details_setup              (EmpathyContactWidget  *information);
+static void     contact_widget_details_update             (EmpathyContactWidget  *information);
+static void     contact_widget_client_setup               (EmpathyContactWidget  *information);
+static void     contact_widget_client_update              (EmpathyContactWidget  *information);
 
 enum {
        COL_NAME,
@@ -124,31 +149,27 @@ enum {
 };
 
 GtkWidget *
-empathy_contact_widget_new (GossipContact *contact,
-                           gboolean       editable)
+empathy_contact_widget_new (EmpathyContact           *contact,
+                           EmpathyContactWidgetFlags flags)
 {
        EmpathyContactWidget *information;
        GladeXML             *glade;
-       GossipContact        *user_contact;
-
-       g_return_val_if_fail (GOSSIP_IS_CONTACT (contact), NULL);
 
        information = g_slice_new0 (EmpathyContactWidget);
-       information->contact = g_object_ref (contact);
-       user_contact = gossip_contact_get_user (contact);
-       information->is_user = gossip_contact_equal (contact, user_contact);
-       information->editable = editable;
+       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,
                                       "vbox_contact", &information->vbox_contact,
-                                      "label_id", &information->label_id,
+                                      "hbox_presence", &information->hbox_presence,
+                                      "label_alias", &information->label_alias,
                                       "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,
@@ -161,7 +182,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,
@@ -175,43 +196,20 @@ empathy_contact_widget_new (GossipContact *contact,
                           "EmpathyContactWidget",
                           information);
 
+       /* Create widgets */
        contact_widget_contact_setup (information);
        contact_widget_groups_setup (information);
        contact_widget_details_setup (information);
        contact_widget_client_setup (information);
 
+       contact_widget_set_contact (information, contact);
+
        gtk_widget_show (information->vbox_contact_widget);
 
        return information->vbox_contact_widget;
 }
 
-void
-empathy_contact_widget_save (GtkWidget *widget)
-{
-       EmpathyContactWidget *information;
-       const gchar          *name;
-       GList                *groups;
-
-       g_return_if_fail (GTK_IS_WIDGET (widget));
-
-       information = g_object_get_data (G_OBJECT (widget), "EmpathyContactWidget");
-       if (!information ||
-           !information->editable ||
-           !information->changes_made) {
-               return;
-       }
-
-       name = gtk_entry_get_text (GTK_ENTRY (information->widget_alias));
-       groups = contact_widget_model_find_selected (information);
-
-       gossip_contact_set_name (information->contact, name);
-       gossip_contact_set_groups (information->contact, groups);
-
-       g_list_foreach (groups, (GFunc) g_free, NULL);
-       g_list_free (groups);
-}
-
-GossipContact *
+EmpathyContact *
 empathy_contact_widget_get_contact (GtkWidget *widget)
 {
        EmpathyContactWidget *information;
@@ -230,77 +228,341 @@ static void
 contact_widget_destroy_cb (GtkWidget            *widget,
                           EmpathyContactWidget *information)
 {
-       g_signal_handlers_disconnect_by_func (information->contact,
-                                             contact_widget_name_notify_cb,
-                                             information);
-       g_signal_handlers_disconnect_by_func (information->contact,
-                                             contact_widget_presence_notify_cb,
-                                             information);
-       g_signal_handlers_disconnect_by_func (information->contact,
-                                             contact_widget_avatar_notify_cb,
-                                             information);
-       g_signal_handlers_disconnect_by_func (information->contact,
-                                             contact_widget_groups_notify_cb,
-                                             information);
-
-       g_object_unref (information->contact);
+       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);
 }
 
+static void
+contact_widget_remove_contact (EmpathyContactWidget *information)
+{
+       if (information->contact) {
+               g_signal_handlers_disconnect_by_func (information->contact,
+                                                     contact_widget_name_notify_cb,
+                                                     information);
+               g_signal_handlers_disconnect_by_func (information->contact,
+                                                     contact_widget_presence_notify_cb,
+                                                     information);
+               g_signal_handlers_disconnect_by_func (information->contact,
+                                                     contact_widget_avatar_notify_cb,
+                                                     information);
+               g_signal_handlers_disconnect_by_func (information->contact,
+                                                     contact_widget_groups_notify_cb,
+                                                     information);
+
+               g_object_unref (information->contact);
+               information->contact = NULL;
+       }
+}
+
+static void
+contact_widget_set_contact (EmpathyContactWidget *information,
+                           EmpathyContact        *contact)
+{
+       contact_widget_remove_contact (information);
+       if (contact) {
+               information->contact = g_object_ref (contact);
+       }
+
+       /* Update information for widgets */
+       contact_widget_contact_update (information);
+       contact_widget_groups_update (information);
+       contact_widget_details_update (information);
+       contact_widget_client_update (information);
+}
+
+static gboolean
+contact_widget_can_add_contact_to_account (McAccount *account,
+                                          gpointer   user_data)
+{
+       MissionControl *mc;
+       TpConn         *tp_conn;
+       McProfile      *profile;
+       const gchar    *protocol_name;
+
+       mc = empathy_mission_control_new ();
+       tp_conn = mission_control_get_connection (mc, account, NULL);
+       g_object_unref (mc);
+       if (tp_conn == NULL) {
+               /* Account is disconnected */
+               return FALSE;
+       }
+       g_object_unref (tp_conn);
+
+       profile = mc_account_get_profile (account);
+       protocol_name = mc_profile_get_protocol_name (profile);
+       if (strcmp (protocol_name, "local-xmpp") == 0) {
+               /* We can't add accounts to a XMPP LL connection
+                * FIXME: We should inspect the flags of the contact list group interface
+                */
+               g_object_unref (profile);
+               return FALSE;
+       }
+
+       g_object_unref (profile);
+       return TRUE;
+}
+
+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 (ID_CHANGED_TIMEOUT,
+                              (GSourceFunc) contact_widget_id_activate_timeout,
+                              self);
+}
+
 static void
 contact_widget_contact_setup (EmpathyContactWidget *information)
 {
-       g_signal_connect_swapped (information->contact, "notify::name",
-                                 G_CALLBACK (contact_widget_name_notify_cb),
+       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->flags & EMPATHY_CONTACT_WIDGET_EDIT_ACCOUNT) {
+               information->widget_account = empathy_account_chooser_new ();
+               empathy_account_chooser_set_filter (
+                       EMPATHY_ACCOUNT_CHOOSER (information->widget_account),
+                       contact_widget_can_add_contact_to_account,
+                       NULL);
+
+               g_signal_connect (information->widget_account, "changed",
+                                 G_CALLBACK (contact_widget_account_changed_cb),
                                  information);
-       g_signal_connect_swapped (information->contact, "notify::presence",
-                                 G_CALLBACK (contact_widget_presence_notify_cb),
+       } 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,
+                                  1, 2, 0, 1);
+       gtk_widget_show (information->widget_account);
+
+       /* Setup id label/entry */
+       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_swapped (information->contact, "notify::avatar",
-                                 G_CALLBACK (contact_widget_avatar_notify_cb),
+               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,
+                                  1, 2, 1, 2);
+       gtk_widget_show (information->widget_id);
 
-       /* 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);
-
-       /* Setup alias entry or label */
-       if (information->editable) {
+       /* Setup alias label/entry */
+       if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_ALIAS) {
                information->widget_alias = gtk_entry_new ();
-               g_signal_connect (information->widget_alias, "changed",
-                                 G_CALLBACK (contact_widget_entry_alias_changed_cb),
+               g_signal_connect (information->widget_alias, "focus-out-event",
+                                 G_CALLBACK (contact_widget_entry_alias_focus_event_cb),
                                  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,
-                                  1, 2, 1, 2);
+                                  1, 2, 2, 3);
        gtk_widget_show (information->widget_alias);
+}
+
+static void
+contact_widget_contact_update (EmpathyContactWidget *information)
+{
+       McAccount   *account = NULL;
+       const gchar *id = NULL;
+
+       /* Connect and get info from new contact */
+       if (information->contact) {
+               g_signal_connect_swapped (information->contact, "notify::name",
+                                         G_CALLBACK (contact_widget_name_notify_cb),
+                                         information);
+               g_signal_connect_swapped (information->contact, "notify::presence",
+                                         G_CALLBACK (contact_widget_presence_notify_cb),
+                                         information);
+               g_signal_connect_swapped (information->contact, "notify::avatar",
+                                         G_CALLBACK (contact_widget_avatar_notify_cb),
+                                         information);
+
+               account = empathy_contact_get_account (information->contact);
+               id = empathy_contact_get_id (information->contact);
+       }
+
+       /* Update account widget */
+       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);
+                       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;
+
+                       name = mc_account_get_display_name (account);
+                       gtk_label_set_label (GTK_LABEL (information->widget_account), name);
+               }
+       }
+
+       /* Update id widget */
+       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 ? id : "");
+       }
+       /* Update other widgets */
+       if (information->contact) {
+               contact_widget_name_notify_cb (information);
+               contact_widget_presence_notify_cb (information);
+               contact_widget_avatar_notify_cb (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);
+               gtk_widget_hide (information->hbox_presence);
+               gtk_widget_hide (information->widget_avatar);
+       }
+}
+
+static void
+contact_widget_change_contact (EmpathyContactWidget *information)
+{
+       EmpathyContact *contact;
+       McAccount      *account;
+
+       account = empathy_account_chooser_get_account (EMPATHY_ACCOUNT_CHOOSER (information->widget_account));
+       if (!account) {
+               return;
+       }
+
+       if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_ID) {
+               const gchar *id;
+
+               id = gtk_entry_get_text (GTK_ENTRY (information->widget_id));
+               if (G_STR_EMPTY (id)) {
+                       return;
+               }
 
-       /* Setup id label */
-       gtk_label_set_text (GTK_LABEL (information->label_id),
-                           gossip_contact_get_id (information->contact));
+               contact = empathy_contact_factory_get_from_id (information->factory,
+                                                              account, id);
+       } else {
+               contact = empathy_contact_factory_get_user (information->factory,
+                                                           account);
+       }
+
+       if (contact) {
+               contact_widget_set_contact (information, contact);
+               g_object_unref (contact);
+       }
+}
+
+static void
+contact_widget_avatar_changed_cb (EmpathyAvatarChooser *chooser,
+                                 EmpathyContactWidget *information)
+{
+       McAccount *account;
+       gchar     *data;
+       gsize      size;
+
+       account = empathy_contact_get_account (information->contact);
+       empathy_avatar_chooser_get_image_data (EMPATHY_AVATAR_CHOOSER (information->widget_avatar),
+                                              &data, &size);
+       mc_account_set_avatar_from_data (account, data, size, "png");
+}
+
+static void
+contact_widget_account_changed_cb (GtkComboBox          *widget,
+                                  EmpathyContactWidget *information)
+{
+       contact_widget_change_contact (information);
+}
+
+static gboolean
+contact_widget_id_focus_out_cb (GtkWidget            *widget,
+                               GdkEventFocus        *event,
+                               EmpathyContactWidget *information)
+{
+       contact_widget_change_contact (information);
+       return FALSE;
+}
 
-       /* Update all widgets */
-       contact_widget_name_notify_cb (information);
-       contact_widget_presence_notify_cb (information);
-       contact_widget_avatar_notify_cb (information);
+static gboolean
+contact_widget_entry_alias_focus_event_cb (GtkEditable          *editable,
+                                          GdkEventFocus        *event,
+                                          EmpathyContactWidget *information)
+{
+       if (information->contact) {
+               const gchar *name;
+
+               name = gtk_entry_get_text (GTK_ENTRY (editable));
+               empathy_contact_factory_set_name (information->factory,
+                                                 information->contact,
+                                                 name);
+       }
+
+       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));
        }
 }
 
@@ -308,9 +570,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);
 
 }
@@ -318,33 +580,48 @@ contact_widget_presence_notify_cb (EmpathyContactWidget *information)
 static void
 contact_widget_avatar_notify_cb (EmpathyContactWidget *information)
 {
-       GdkPixbuf *avatar_pixbuf;
+       EmpathyAvatar *avatar = NULL;
 
-       avatar_pixbuf = gossip_pixbuf_avatar_from_contact_scaled (information->contact,
-                                                                 48, 48);
-
-       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);
+       }
+}
 
+static void
+contact_widget_groups_update (EmpathyContactWidget *information)
+{
+       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);
                contact_widget_groups_populate_data (information);
 
                gtk_widget_show (information->vbox_groups);
+       } else {
+               gtk_widget_hide (information->vbox_groups);
        }
 }
 
@@ -426,41 +703,25 @@ 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                 *groups, *l;
-       GList                 *my_groups = NULL;
-       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);
-       groups = gossip_contact_get_groups (information->contact);
-       g_object_unref (manager);
-
-       for (l = groups; l; l = l->next) {
-               const gchar *group_str;
-
-               group_str = l->data;
-               if (strcmp (group_str, _("Unsorted")) == 0) {
-                       continue;
-               }
-
-               my_groups = g_list_append (my_groups, g_strdup (group_str));
-       }
+       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;
                gboolean     enabled;
 
                group_str = l->data;
-               if (strcmp (group_str, _("Unsorted")) == 0) {
-                       continue;
-               }
 
                enabled = g_list_find_custom (my_groups,
                                              group_str,
@@ -474,10 +735,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 (my_groups);
-
        g_list_free (all_groups);
+       g_list_free (my_groups);
 }
 
 static void
@@ -548,54 +809,6 @@ contact_widget_model_find_name_foreach (GtkTreeModel *model,
        return FALSE;
 }
 
-static GList *
-contact_widget_model_find_selected (EmpathyContactWidget *information)
-{
-       GtkTreeView  *view;
-       GtkTreeModel *model;
-       FindSelected  data;
-
-       data.information = information;
-       data.list = NULL;
-
-       view = GTK_TREE_VIEW (information->treeview_groups);
-       model = gtk_tree_view_get_model (view);
-
-       gtk_tree_model_foreach (model,
-                               (GtkTreeModelForeachFunc) contact_widget_model_find_selected_foreach,
-                               &data);
-
-       return data.list;
-}
-
-static gboolean
-contact_widget_model_find_selected_foreach (GtkTreeModel *model,
-                                           GtkTreePath  *path,
-                                           GtkTreeIter  *iter,
-                                           FindSelected *data)
-{
-       gchar    *name;
-       gboolean  selected;
-
-       gtk_tree_model_get (model, iter,
-                           COL_NAME, &name,
-                           COL_ENABLED, &selected,
-                           -1);
-
-       if (!name) {
-               return FALSE;
-       }
-
-       if (selected) {
-               data->list = g_list_append (data->list, name);
-               return FALSE;
-       }
-
-       g_free (name);
-
-       return FALSE;
-}
-
 static void
 contact_widget_cell_toggled (GtkCellRendererToggle *cell,
                             gchar                 *path_string,
@@ -607,6 +820,7 @@ contact_widget_cell_toggled (GtkCellRendererToggle *cell,
        GtkTreePath  *path;
        GtkTreeIter   iter;
        gboolean      enabled;
+       gchar        *group;
 
        view = GTK_TREE_VIEW (information->treeview_groups);
        model = gtk_tree_view_get_model (view);
@@ -615,21 +829,27 @@ contact_widget_cell_toggled (GtkCellRendererToggle *cell,
        path = gtk_tree_path_new_from_string (path_string);
 
        gtk_tree_model_get_iter (model, &iter, path);
-       gtk_tree_model_get (model, &iter, COL_ENABLED, &enabled, -1);
-
-       enabled ^= 1;
+       gtk_tree_model_get (model, &iter,
+                           COL_ENABLED, &enabled,
+                           COL_NAME, &group,
+                           -1);
 
-       gtk_list_store_set (store, &iter, COL_ENABLED, enabled, -1);
+       gtk_list_store_set (store, &iter, COL_ENABLED, !enabled, -1);
        gtk_tree_path_free (path);
 
-       information->changes_made = TRUE;
-}
+       if (group) {
+               if (enabled) {
+                       empathy_contact_list_remove_from_group (EMPATHY_CONTACT_LIST (information->manager),
+                                                               information->contact,
+                                                               group);
+               } else {
+                       empathy_contact_list_add_to_group (EMPATHY_CONTACT_LIST (information->manager),
+                                                          information->contact,
+                                                          group);
+               }
 
-static void
-contact_widget_entry_alias_changed_cb (GtkEditable           *editable,
-                                      EmpathyContactWidget  *information)
-{
-       information->changes_made = TRUE;
+               g_free (group);
+       }
 }
 
 static void
@@ -677,17 +897,33 @@ contact_widget_button_group_clicked_cb (GtkButton             *button,
                            COL_ENABLED, TRUE,
                            -1);
 
-       information->changes_made = TRUE;
+       empathy_contact_list_add_to_group (EMPATHY_CONTACT_LIST (information->manager),
+                                          information->contact,
+                                          group);
 }
 
 static void
 contact_widget_details_setup (EmpathyContactWidget *information)
+{
+       /* FIXME: Needs new telepathy spec */
+       gtk_widget_hide (information->vbox_details);
+}
+
+static void
+contact_widget_details_update (EmpathyContactWidget *information)
 {
        /* FIXME: Needs new telepathy spec */
 }
 
 static void
 contact_widget_client_setup (EmpathyContactWidget *information)
+{
+       /* FIXME: Needs new telepathy spec */
+       gtk_widget_hide (information->vbox_client);
+}
+
+static void
+contact_widget_client_update (EmpathyContactWidget *information)
 {
        /* FIXME: Needs new telepathy spec */
 }