Merge remote-tracking branch 'jonny/ft'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 29 Nov 2011 14:56:11 +0000 (15:56 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 29 Nov 2011 14:56:11 +0000 (15:56 +0100)
Conflicts:
libempathy/empathy-tp-file.c

128 files changed:
COPYING
NEWS
configure.ac
data/Makefile.am
data/codec-preferences [deleted file]
data/element-properties [deleted file]
data/org.gnome.Empathy.gschema.xml.in
goa-mc-plugin/mcp-account-manager-goa.c
libempathy-gtk/Makefile.am
libempathy-gtk/empathy-account-widget.c
libempathy-gtk/empathy-bad-password-dialog.c [new file with mode: 0644]
libempathy-gtk/empathy-bad-password-dialog.h [new file with mode: 0644]
libempathy-gtk/empathy-base-password-dialog.c [new file with mode: 0644]
libempathy-gtk/empathy-base-password-dialog.h [new file with mode: 0644]
libempathy-gtk/empathy-call-utils.c
libempathy-gtk/empathy-call-utils.h
libempathy-gtk/empathy-chat-text-view.c
libempathy-gtk/empathy-chat.c
libempathy-gtk/empathy-contact-blocking-dialog.c
libempathy-gtk/empathy-contact-blocking-dialog.ui
libempathy-gtk/empathy-contact-chooser.c
libempathy-gtk/empathy-contact-dialogs.c
libempathy-gtk/empathy-contact-list-store.c [deleted file]
libempathy-gtk/empathy-contact-list-store.h [deleted file]
libempathy-gtk/empathy-contact-list-view.c [deleted file]
libempathy-gtk/empathy-contact-list-view.h [deleted file]
libempathy-gtk/empathy-contact-menu.c
libempathy-gtk/empathy-contact-search-dialog.c
libempathy-gtk/empathy-contact-widget.c
libempathy-gtk/empathy-contactinfo-utils.c
libempathy-gtk/empathy-contactinfo-utils.h
libempathy-gtk/empathy-dialpad-widget.c
libempathy-gtk/empathy-groups-widget.c
libempathy-gtk/empathy-individual-dialogs.c
libempathy-gtk/empathy-individual-linker.c
libempathy-gtk/empathy-individual-menu.c
libempathy-gtk/empathy-individual-menu.h
libempathy-gtk/empathy-individual-store-channel.c [new file with mode: 0644]
libempathy-gtk/empathy-individual-store-channel.h [new file with mode: 0644]
libempathy-gtk/empathy-individual-store-manager.c [new file with mode: 0644]
libempathy-gtk/empathy-individual-store-manager.h [new file with mode: 0644]
libempathy-gtk/empathy-individual-store.c
libempathy-gtk/empathy-individual-store.h
libempathy-gtk/empathy-individual-view.c
libempathy-gtk/empathy-individual-view.h
libempathy-gtk/empathy-individual-widget.c
libempathy-gtk/empathy-live-search.h
libempathy-gtk/empathy-log-window.c
libempathy-gtk/empathy-notify-manager.c
libempathy-gtk/empathy-password-dialog.c
libempathy-gtk/empathy-password-dialog.h
libempathy-gtk/empathy-persona-store.c
libempathy-gtk/empathy-protocol-chooser.c
libempathy-gtk/empathy-spell.c
libempathy-gtk/empathy-theme-boxes.c
libempathy-gtk/empathy-theme-manager.c
libempathy-gtk/empathy-ui-utils.c
libempathy/Makefile.am
libempathy/empathy-account-settings.c
libempathy/empathy-auth-factory.c
libempathy/empathy-auth-factory.h
libempathy/empathy-client-factory.c
libempathy/empathy-connection-aggregator.c [new file with mode: 0644]
libempathy/empathy-connection-aggregator.h [new file with mode: 0644]
libempathy/empathy-contact-list.c
libempathy/empathy-contact-list.h
libempathy/empathy-contact-manager.c
libempathy/empathy-contact-manager.h
libempathy/empathy-contact.c
libempathy/empathy-contact.h
libempathy/empathy-debug.c
libempathy/empathy-ft-handler.c
libempathy/empathy-gsettings.h
libempathy/empathy-individual-manager.c
libempathy/empathy-irc-network-manager.c
libempathy/empathy-server-sasl-handler.c
libempathy/empathy-tls-verifier.c
libempathy/empathy-tp-chat.c
libempathy/empathy-tp-contact-list.c
libempathy/empathy-tp-roomlist.c
libempathy/empathy-tp-streamed-media.c
libempathy/empathy-utils.c
libempathy/empathy-utils.h
m4/gsettings.m4
po/LINGUAS
po/POTFILES.in
po/es.po
po/et.po
po/lt.po
po/my.po [new file with mode: 0644]
po/ro.po
po/sl.po
po/zh_CN.po
po/zh_HK.po
po/zh_TW.po
release.py
src/empathy-account-assistant.c
src/empathy-accounts-dialog.c
src/empathy-audio-sink.c
src/empathy-audio-sink.h
src/empathy-audio-src.c
src/empathy-audio-src.h
src/empathy-auth-client.c
src/empathy-call-handler.c
src/empathy-call-window.c
src/empathy-call-window.h
src/empathy-camera-menu.c
src/empathy-chat-window.c
src/empathy-debug-window.c
src/empathy-ft-manager.c
src/empathy-import-dialog.c
src/empathy-import-utils.c
src/empathy-invite-participant-dialog.c
src/empathy-main-window.c
src/empathy-map-view.c
src/empathy-notifications-approver.c
src/empathy-preferences.c
src/empathy-preferences.ui
src/empathy-streamed-media-handler.c
src/empathy-streamed-media-window.c
src/empathy.c
src/ev-sidebar.c
tests/empathy-chatroom-manager-test.c
tests/empathy-tls-test.c
tests/interactive/Makefile.am
tests/interactive/contact-manager.c [deleted file]
tests/interactive/empathy-logs.c
tools/check-c-style.sh

diff --git a/COPYING b/COPYING
index d60c31a97a544b53039088d14fe9114583c0efc3..623b6258a134210f0b0ada106fdaab7f0370d9c5 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -2,7 +2,7 @@
                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     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
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/NEWS b/NEWS
index 53bf2fdb382e712633d22a747fe43101572b78c6..b3cc0a9e78baa3f580fa8655bc7f0b1582e09815 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,48 @@
+NEW in 3.3.2 (21/11/2011)
+============
+
+Dependencies:
+
+ • telepathy-glib ≥ 0.17.0
+ • telepathy-farsight ≥ 0.0.18
+ • telepathy-farstream ≥ 0.1.2 (optional)
+
+Bugs fixed:
+ - Fixed #662504, Cannot quit empathy (Guillaume Desmottes)
+ - Fixed #646682, Support InsufficientBalance error (Emilio Pozuelo Monfort)
+ - Fixed #652544, Add X-FACEBOOK-PLATFORM and X-MESSENGER-OAUTH2 support (Xavier Claessens)
+ - Fixed #654430, Add support for video control interface to empathy-call (Nicolas Dufresne, Sjoerd Simons)
+ - Fixed #661805, Use tp-glib blocking API (Guillaume Desmottes)
+ - Fixed #662604, In a conversation window, Contact → Add Contact… selects the wrong account (Guillaume Desmottes)
+ - Fixed #662609, EmpathyAccountChooser clean up (Guillaume Desmottes)
+ - Fixed #662727, new-call/new-convo dialogs should listen to capabilities changes (Danielle Madeley)
+ - Fixed #662843, invite dialog looks stupid on IRC (Guillaume Desmottes)
+ - Fixed #662903, Empathy uses deprecated GTK widgets (potential build errors) (Guillaume Desmottes)
+ - Fixed #662995, Fix for misaligned 16x16 app icon (Michael Monreal)
+ - Fixed #663327, Stop using EmpathyContactManager to add and remove contacts (Guillaume Desmottes)
+ - Fixed #663442, Make GOA optional (Danielle Madeley)
+ - Fixed #663563, Shouldn't offer to send socket files (Guillaume Desmottes)
+ - Fixed #663567, Status icon is miss aligned in infobar (Danielle Madeley)
+ - Fixed #663763, Some contact/invidiual misc patches (Guillaume Desmottes)
+ - Fixed #663842, Don't do extra audio-processing for raw Contents (Sjoerd Simons)
+ - Fixed #664313, call-window opens very small the first time (Ken VanDine)
+
+Translations:
+ - Updated cs Translation (Marek Černocký)
+ - Updated de Translation (Christian Kirbach)
+ - Updated et Translation (Mattias Põldaru)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated lt Translation (Algimantas Margevičius)
+ - Updated my Translation (Thura Hlaing)
+ - Updated sl Translation (Matej Urbančič)
+ - Updated tr Translation (Muhammet Kara)
+ - Updated zh_HK Translation (Cheng-Chia Tseng)
+ - Updated zh_TW Translation (Cheng-Chia Tseng)
+
+Documentation translations:
+ - Updated ca Documentation translation (Gil Forcada)
+ - Updated pl Documentation translation (Aleksander Łukasiewicz)
+
 NEW in 3.3.1 (24/10/2011)
 ============
 
index a5050f72e4c370624f1fd821341c6ff6d23247d2..e0e7e43ef695a6c637e76c932bfad10bbf7d744c 100644 (file)
@@ -3,7 +3,7 @@ m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [3])
 m4_define([empathy_minor_version], [3])
-m4_define([empathy_micro_version], [1])
+m4_define([empathy_micro_version], [2])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
@@ -43,8 +43,8 @@ KEYRING_REQUIRED=2.26.0
 GCR_REQUIRED=2.91.4
 LIBCANBERRA_GTK_REQUIRED=0.25
 LIBNOTIFY_REQUIRED=0.7.0
-TELEPATHY_FARSIGHT_REQUIRED=0.0.14
-TELEPATHY_GLIB_REQUIRED=0.16.0
+TELEPATHY_FARSIGHT_REQUIRED=0.0.18
+TELEPATHY_GLIB_REQUIRED=0.17.3
 TELEPATHY_LOGGER=0.2.10
 WEBKIT_REQUIRED=1.3.13
 GOA_REQUIRED=3.3.0
@@ -225,7 +225,7 @@ if test "x$enable_call" != "xno" ; then
    PKG_CHECK_MODULES(EMPATHY_CALL,
    [
       farsight2-0.10
-      telepathy-farstream
+      telepathy-farstream >= 0.1.2
       clutter-1.0 >= $CLUTTER_REQUIRED
       clutter-gtk-1.0
       clutter-gst-1.0
index e6414a805438b541c8466e2a914c7fa6107b2dff..a08ed620d757adbe66667043178631012bdc7577 100644 (file)
@@ -19,11 +19,6 @@ convertdir = $(datarootdir)/GConf/gsettings
 convert_DATA = \
        empathy.convert
 
-streamingprefsdir =  $(datadir)/empathy
-streamingprefs_DATA =          \
-       codec-preferences       \
-       element-properties
-
 servicefiledir = $(datadir)/dbus-1/services
 servicefile_in_files = \
        org.freedesktop.Telepathy.Client.Empathy.Chat.service.in \
@@ -76,7 +71,6 @@ EXTRA_DIST =                          \
        $(desktop_in_files)             \
        $(desktop_DATA)                 \
        $(schemas_DATA)                 \
-       $(streamingprefs_DATA)          \
        $(html_DATA)                    \
        $(clientfile_DATA)              \
        $(servicefile_in_files)         \
diff --git a/data/codec-preferences b/data/codec-preferences
deleted file mode 100644 (file)
index fbd8ad5..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-# Favorite audio codecs
-
-[audio/SPEEX:8000]
-clock-rate=8000
-
-[audio/SPEEX:16000]
-clock-rate=16000
-
-[audio/AMR]
-
-[audio/G729]
-
-[audio/ILBC]
-
-# Disabled audio codecs
-
-[audio/DV]
-id=-1
-
-[audio/MPA]
-id=-1
-
-[audio/VORBIS]
-id=-1
-
-[audio/MP3]
-id=-1
-
-
-# Favorite video codecs
-
-# We like freedom and the future (proof of concept VP8 payloading)
-[video/X-VP8-GST]
-
-# but keep an eye on people living in the past
-[video/H264]
-
-[video/H263]
-
-[video/THEORA]
-
-# Disable the ones we don't want
-[video/JPEG]
-id=-1
-
-[video/DV]
-id=-1
-
-[video/MPV]
-id=-1
diff --git a/data/element-properties b/data/element-properties
deleted file mode 100644 (file)
index 68debc2..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-# Put the desired properties in the style of
-#
-# [element name]
-# prop1=val1
-
-[gstrtpbin]
-latency=100
-
-[x264enc]
-byte-stream=1
-bframes=0
-b-adapt=0
-cabac=0
-dct8x8=0
-bitrate=256
-# tuned for zero latency
-tune=0x4
-profile=1
-speed-preset=3
-sliced-threads=false
-aud=false
-
-[ffenc_h263]
-rtp-payload-size=1
-
-[theoraenc]
-bitrate=256
-
-[vp8enc]
-bitrate=256000
-max-latency=1
-speed=2
-error-resilient=true
-
-# Work around bug in the re-timestamp slaving method in
-# GStreamer (2 is skew)
-[alsasrc]
-slave-method=2
-
-[osssrc]
-slave-method=2
-
-[oss4src]
-slave-method=2
-
-[sunaudiosrc]
-slave-method=2
-
-[rtph264pay]
-config-interval=5
-
-[rtppcmupay]
-ptime-multiple=20000000
-
-[rtppcmapay]
-ptime-multiple=20000000
-
-[gstrtpjitterbuffer]
-do-lost=1
index de57af80c97a192e21f7a20b1c331bb43f9de9b2..f3975fce2980af4794aeb6fad734bc66a600b2fb 100644 (file)
@@ -233,12 +233,6 @@ present them to the user immediately.</_description>
     </key>
   </schema>
   <schema id="org.gnome.Empathy.call" path="/org/gnome/empathy/call/">
-    <key name="volume" type="d">
-      <range min="0" max="150"/>
-      <default>100.0</default>
-      <_summary>Call volume</_summary>
-      <_description>Call volume, as a percentage.</_description>
-    </key>
     <key name="camera-device" type="s">
       <default>''</default>
       <_summary>Camera device</_summary>
index 1185d7ba31ef4a55ce68e5c7e482571698b06975..fd3942eaf359df2be0f1cb553828cc9b7ac9cbe1 100644 (file)
@@ -82,7 +82,7 @@ mcp_account_manager_goa_finalize (GObject *self)
 {
   McpAccountManagerGoaPrivate *priv = GET_PRIVATE (self);
 
-  g_hash_table_destroy (priv->accounts);
+  g_hash_table_unref (priv->accounts);
   g_key_file_free (priv->store);
   g_free (priv->filename);
 
@@ -150,7 +150,7 @@ get_tp_parameters (GoaAccount *account)
   else
     {
       DEBUG ("Unknown account type %s", type);
-      g_hash_table_destroy (params);
+      g_hash_table_unref (params);
       return NULL;
     }
 
@@ -179,7 +179,7 @@ get_tp_account_name (GoaAccount *account)
       (char *) g_hash_table_lookup (params, "protocol"),
       type, id);
 
-  g_hash_table_destroy (params);
+  g_hash_table_unref (params);
 
   return name;
 }
@@ -399,7 +399,7 @@ mcp_account_manager_goa_get (const McpAccountStorage *self,
       while (g_hash_table_iter_next (&iter, &key, &value))
         mcp_account_manager_set_value (am, acct, key, value);
 
-      g_hash_table_destroy (params);
+      g_hash_table_unref (params);
 
       /* Stored properties */
       keys = g_key_file_get_keys (priv->store, acct, &nkeys, NULL);
@@ -439,7 +439,7 @@ mcp_account_manager_goa_get (const McpAccountStorage *self,
 
       mcp_account_manager_set_value (am, acct, key, value);
 
-      g_hash_table_destroy (params);
+      g_hash_table_unref (params);
       g_free (value);
     }
 
index 96ef811b4e2d58c9a28b2a040480b3fe76316a6c..e502736d3618564f4634bc805854547003d5e000 100644 (file)
@@ -33,6 +33,8 @@ libempathy_gtk_handwritten_source =                   \
        empathy-account-widget.c                \
        empathy-avatar-chooser.c                \
        empathy-avatar-image.c                  \
+       empathy-bad-password-dialog.c           \
+       empathy-base-password-dialog.c          \
        empathy-call-utils.c                    \
        empathy-cell-renderer-activatable.c     \
        empathy-cell-renderer-expander.c        \
@@ -43,8 +45,6 @@ libempathy_gtk_handwritten_source =                   \
        empathy-contact-blocking-dialog.c       \
        empathy-contact-dialogs.c               \
        empathy-contact-chooser.c               \
-       empathy-contact-list-store.c            \
-       empathy-contact-list-view.c             \
        empathy-contact-menu.c                  \
        empathy-contactinfo-utils.c             \
        empathy-linking-dialog.c                \
@@ -60,6 +60,8 @@ libempathy_gtk_handwritten_source =                   \
        empathy-individual-linker.c             \
        empathy-individual-menu.c               \
        empathy-individual-store.c              \
+       empathy-individual-store-channel.c              \
+       empathy-individual-store-manager.c              \
        empathy-individual-view.c               \
        empathy-individual-widget.c             \
        empathy-input-text-view.c               \
@@ -100,6 +102,8 @@ libempathy_gtk_headers =                    \
        empathy-account-widget.h                \
        empathy-avatar-chooser.h                \
        empathy-avatar-image.h                  \
+       empathy-bad-password-dialog.h           \
+       empathy-base-password-dialog.h          \
        empathy-call-utils.h                    \
        empathy-cell-renderer-activatable.h     \
        empathy-cell-renderer-expander.h        \
@@ -110,8 +114,6 @@ libempathy_gtk_headers =                    \
        empathy-contact-blocking-dialog.h       \
        empathy-contact-dialogs.h               \
        empathy-contact-chooser.h               \
-       empathy-contact-list-store.h            \
-       empathy-contact-list-view.h             \
        empathy-contact-menu.h                  \
        empathy-linking-dialog.h                \
        empathy-live-search.h                   \
@@ -128,6 +130,8 @@ libempathy_gtk_headers =                    \
        empathy-individual-linker.h             \
        empathy-individual-menu.h               \
        empathy-individual-store.h              \
+       empathy-individual-store-channel.h              \
+       empathy-individual-store-manager.h              \
        empathy-individual-view.h               \
        empathy-individual-widget.h             \
        empathy-input-text-view.h               \
index 33082ba63418c5c2aefca26a4d5e56b4c18b8391..e314ad33fe2e18d915a54cdeb5f61466a3e9b567 100644 (file)
@@ -1172,7 +1172,7 @@ account_widget_build_external (EmpathyAccountWidget *self,
   const gchar *provider, *name = NULL;
   GDesktopAppInfo *desktop_info = NULL;
 
-  self->ui_details->widget = gtk_vbox_new (FALSE, 6);
+  self->ui_details->widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   priv->grid_common_settings = gtk_grid_new ();
 
   provider = tp_account_get_storage_provider (account);
@@ -2190,9 +2190,11 @@ do_constructed (GObject *obj)
       !(storage_restrictions &
         TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS))
     {
-      GtkWidget *hbox = gtk_hbox_new (TRUE, 3);
+      GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
       GtkWidget *image;
 
+      gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
+
       /*  We can't use the stock button as its accelerator ('C') clashes with
        *  the Close button. */
       priv->cancel_button = gtk_button_new ();
diff --git a/libempathy-gtk/empathy-bad-password-dialog.c b/libempathy-gtk/empathy-bad-password-dialog.c
new file mode 100644 (file)
index 0000000..2209ff0
--- /dev/null
@@ -0,0 +1,192 @@
+/*
+ * empathy-bad-password-dialog.c - Source for EmpathyBadPasswordDialog
+ * Copyright (C) 2010 Collabora Ltd.
+ *
+ * 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 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
+ * Lesser General Public License for more details.
+ *
+ * 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
+ */
+
+#include <config.h>
+
+#include "empathy-bad-password-dialog.h"
+
+#include <glib/gi18n-lib.h>
+
+#define DEBUG_FLAG EMPATHY_DEBUG_SASL
+#include <libempathy/empathy-debug.h>
+#include <libempathy/empathy-utils.h>
+
+G_DEFINE_TYPE (EmpathyBadPasswordDialog, empathy_bad_password_dialog,
+    EMPATHY_TYPE_BASE_PASSWORD_DIALOG)
+
+enum {
+  PROP_PASSWORD = 1,
+
+  LAST_PROPERTY,
+};
+
+/* signal enum */
+enum {
+  RETRY,
+  LAST_SIGNAL,
+};
+
+static guint signals[LAST_SIGNAL] = {0};
+
+struct _EmpathyBadPasswordDialogPriv {
+  gchar *password;
+};
+
+static void
+empathy_bad_password_dialog_get_property (GObject *object,
+    guint property_id,
+    GValue *value,
+    GParamSpec *pspec)
+{
+  EmpathyBadPasswordDialog *self = (EmpathyBadPasswordDialog *) object;
+
+  switch (property_id)
+    {
+    case PROP_PASSWORD:
+      g_value_set_string (value, self->priv->password);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+empathy_bad_password_dialog_set_property (GObject *object,
+    guint property_id,
+    const GValue *value,
+    GParamSpec *pspec)
+{
+  EmpathyBadPasswordDialog *self = (EmpathyBadPasswordDialog *) object;
+
+  switch (property_id)
+    {
+    case PROP_PASSWORD:
+      g_assert (self->priv->password == NULL); /* construct only */
+      self->priv->password = g_value_dup_string (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+empathy_bad_password_dialog_finalize (GObject *object)
+{
+  EmpathyBadPasswordDialog *self = (EmpathyBadPasswordDialog *) object;
+
+  tp_clear_pointer (&self->priv->password, g_free);
+
+  G_OBJECT_CLASS (empathy_bad_password_dialog_parent_class)->finalize (object);
+}
+
+static void
+bad_password_dialog_response_cb (GtkDialog *dialog,
+    gint response,
+    gpointer user_data)
+{
+  EmpathyBadPasswordDialog *self = (EmpathyBadPasswordDialog *) dialog;
+  EmpathyBasePasswordDialog *base = (EmpathyBasePasswordDialog *) dialog;
+
+  if (response == GTK_RESPONSE_OK)
+    {
+      const gchar *password;
+
+      password = gtk_entry_get_text (GTK_ENTRY (base->entry));
+
+      g_signal_emit (self, signals[RETRY], 0, base->account, password);
+    }
+
+  gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static void
+empathy_bad_password_dialog_constructed (GObject *object)
+{
+  EmpathyBadPasswordDialog *self = (EmpathyBadPasswordDialog *) object;
+  EmpathyBasePasswordDialog *base = (EmpathyBasePasswordDialog *) object;
+  gchar *text;
+
+  G_OBJECT_CLASS (empathy_bad_password_dialog_parent_class)->constructed (
+      object);
+
+  text = g_strdup_printf (_("Authentification failed for account <b>%s</b>"),
+      tp_account_get_display_name (base->account));
+  gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (self), text);
+  g_free (text);
+
+  if (self->priv->password != NULL)
+    {
+      gtk_entry_set_text (GTK_ENTRY (base->entry), self->priv->password);
+
+      gtk_editable_select_region (GTK_EDITABLE (base->entry), 0, -1);
+    }
+
+  gtk_button_set_label (GTK_BUTTON (base->ok_button), _("Retry"));
+
+  g_signal_connect (self, "response",
+      G_CALLBACK (bad_password_dialog_response_cb), self);
+}
+
+static void
+empathy_bad_password_dialog_init (EmpathyBadPasswordDialog *self)
+{
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+      EMPATHY_TYPE_BAD_PASSWORD_DIALOG, EmpathyBadPasswordDialogPriv);
+}
+
+static void
+empathy_bad_password_dialog_class_init (EmpathyBadPasswordDialogClass *klass)
+{
+  GParamSpec *pspec;
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+  g_type_class_add_private (klass, sizeof (EmpathyBadPasswordDialogPriv));
+
+  oclass->set_property = empathy_bad_password_dialog_set_property;
+  oclass->get_property = empathy_bad_password_dialog_get_property;
+  oclass->finalize = empathy_bad_password_dialog_finalize;
+  oclass->constructed = empathy_bad_password_dialog_constructed;
+
+  pspec = g_param_spec_string ("password", "Password",
+      "The wrong password",
+      NULL,
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (oclass, PROP_PASSWORD, pspec);
+
+  signals[RETRY] = g_signal_new ("retry",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0,
+      NULL, NULL,
+      g_cclosure_marshal_generic,
+      G_TYPE_NONE, 2, TP_TYPE_ACCOUNT, G_TYPE_STRING);
+}
+
+GtkWidget *
+empathy_bad_password_dialog_new (TpAccount *account,
+    const gchar *password)
+{
+  g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
+
+  return g_object_new (EMPATHY_TYPE_BAD_PASSWORD_DIALOG,
+      "account", account,
+      "password", password,
+      NULL);
+}
diff --git a/libempathy-gtk/empathy-bad-password-dialog.h b/libempathy-gtk/empathy-bad-password-dialog.h
new file mode 100644 (file)
index 0000000..5cf1c71
--- /dev/null
@@ -0,0 +1,68 @@
+/*
+ * empathy-bad-password-dialog.h - Header for EmpathyBadPasswordDialog
+ * Copyright (C) 2010 Collabora Ltd.
+ *
+ * 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 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
+ * Lesser General Public License for more details.
+ *
+ * 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
+ */
+
+#ifndef __EMPATHY_BAD_PASSWORD_DIALOG_H__
+#define __EMPATHY_BAD_PASSWORD_DIALOG_H__
+
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+#include <libempathy-gtk/empathy-base-password-dialog.h>
+
+#include <extensions/extensions.h>
+
+G_BEGIN_DECLS
+
+typedef struct _EmpathyBadPasswordDialog EmpathyBadPasswordDialog;
+typedef struct _EmpathyBadPasswordDialogClass EmpathyBadPasswordDialogClass;
+typedef struct _EmpathyBadPasswordDialogPriv EmpathyBadPasswordDialogPriv;
+
+struct _EmpathyBadPasswordDialogClass {
+    EmpathyBasePasswordDialogClass parent_class;
+};
+
+struct _EmpathyBadPasswordDialog {
+    EmpathyBasePasswordDialog parent;
+    EmpathyBadPasswordDialogPriv *priv;
+};
+
+GType empathy_bad_password_dialog_get_type (void);
+
+#define EMPATHY_TYPE_BAD_PASSWORD_DIALOG \
+  (empathy_bad_password_dialog_get_type ())
+#define EMPATHY_BAD_PASSWORD_DIALOG(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_BAD_PASSWORD_DIALOG, \
+    EmpathyBadPasswordDialog))
+#define EMPATHY_BAD_PASSWORD_DIALOG_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_BAD_PASSWORD_DIALOG, \
+  EmpathyBadPasswordDialogClass))
+#define EMPATHY_IS_BAD_PASSWORD_DIALOG(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_BAD_PASSWORD_DIALOG))
+#define EMPATHY_IS_BAD_PASSWORD_DIALOG_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_BAD_PASSWORD_DIALOG))
+#define EMPATHY_BAD_PASSWORD_DIALOG_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_BAD_PASSWORD_DIALOG, \
+  EmpathyBadPasswordDialogClass))
+
+GtkWidget * empathy_bad_password_dialog_new (TpAccount *account,
+    const gchar *password);
+
+G_END_DECLS
+
+#endif /* #ifndef __EMPATHY_BAD_PASSWORD_DIALOG_H__*/
diff --git a/libempathy-gtk/empathy-base-password-dialog.c b/libempathy-gtk/empathy-base-password-dialog.c
new file mode 100644 (file)
index 0000000..be708e8
--- /dev/null
@@ -0,0 +1,302 @@
+/*
+ * empathy-base-password-dialog.c - Source for EmpathyBasePasswordDialog
+ * Copyright (C) 2010 Collabora Ltd.
+ *
+ * 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 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
+ * Lesser General Public License for more details.
+ *
+ * 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
+ */
+
+#include <config.h>
+
+#include "empathy-base-password-dialog.h"
+
+#include <glib/gi18n-lib.h>
+
+#define DEBUG_FLAG EMPATHY_DEBUG_SASL
+#include <libempathy/empathy-debug.h>
+#include <libempathy/empathy-utils.h>
+
+G_DEFINE_TYPE (EmpathyBasePasswordDialog, empathy_base_password_dialog,
+    GTK_TYPE_MESSAGE_DIALOG)
+
+enum {
+  PROP_ACCOUNT = 1,
+
+  LAST_PROPERTY,
+};
+
+struct _EmpathyBasePasswordDialogPriv {
+  gboolean grabbing;
+};
+
+static void
+empathy_base_password_dialog_get_property (GObject *object,
+    guint property_id,
+    GValue *value,
+    GParamSpec *pspec)
+{
+  EmpathyBasePasswordDialog *self = (EmpathyBasePasswordDialog *) object;
+
+  switch (property_id)
+    {
+    case PROP_ACCOUNT:
+      g_value_set_object (value, self->account);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+empathy_base_password_dialog_set_property (GObject *object,
+    guint property_id,
+    const GValue *value,
+    GParamSpec *pspec)
+{
+  EmpathyBasePasswordDialog *self = (EmpathyBasePasswordDialog *) object;
+
+  switch (property_id)
+    {
+    case PROP_ACCOUNT:
+      g_assert (self->account == NULL); /* construct only */
+      self->account = g_value_dup_object (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+empathy_base_password_dialog_dispose (GObject *object)
+{
+  EmpathyBasePasswordDialog *self = (EmpathyBasePasswordDialog *) object;
+
+  tp_clear_object (&self->account);
+
+  G_OBJECT_CLASS (empathy_base_password_dialog_parent_class)->dispose (object);
+}
+
+static void
+clear_icon_released_cb (GtkEntry *entry,
+    GtkEntryIconPosition icon_pos,
+    GdkEvent *event,
+    gpointer user_data)
+{
+  gtk_entry_set_text (entry, "");
+}
+
+static void
+password_entry_changed_cb (GtkEditable *entry,
+    gpointer user_data)
+{
+  EmpathyBasePasswordDialog *self = user_data;
+  const gchar *str;
+
+  str = gtk_entry_get_text (GTK_ENTRY (entry));
+
+  gtk_entry_set_icon_sensitive (GTK_ENTRY (entry),
+      GTK_ENTRY_ICON_SECONDARY, !EMP_STR_EMPTY (str));
+
+  gtk_widget_set_sensitive (self->ok_button,
+      !EMP_STR_EMPTY (str));
+}
+
+static void
+password_entry_activate_cb (GtkEntry *entry,
+    EmpathyBasePasswordDialog *self)
+{
+  gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_OK);
+}
+
+static gboolean
+base_password_dialog_grab_keyboard (GtkWidget *widget,
+    GdkEvent *event,
+    gpointer user_data)
+{
+  EmpathyBasePasswordDialog *self = user_data;
+
+  if (!self->priv->grabbing)
+    {
+      GdkDevice *device = gdk_event_get_device (event);
+
+      if (device != NULL)
+        {
+          GdkGrabStatus status = gdk_device_grab (device,
+              gtk_widget_get_window (widget),
+              GDK_OWNERSHIP_WINDOW,
+              FALSE,
+              GDK_ALL_EVENTS_MASK,
+              NULL,
+              gdk_event_get_time (event));
+
+          if (status != GDK_GRAB_SUCCESS)
+            DEBUG ("Could not grab keyboard; grab status was %u", status);
+          else
+            self->priv->grabbing = TRUE;
+        }
+      else
+        DEBUG ("Could not get the event device!");
+    }
+
+  return FALSE;
+}
+
+static gboolean
+base_password_dialog_ungrab_keyboard (GtkWidget *widget,
+    GdkEvent *event,
+    gpointer user_data)
+{
+  EmpathyBasePasswordDialog *self = user_data;
+
+  if (self->priv->grabbing)
+    {
+      GdkDevice *device = gdk_event_get_device (event);
+
+      if (device != NULL)
+        {
+          gdk_device_ungrab (device, gdk_event_get_time (event));
+          self->priv->grabbing = FALSE;
+        }
+      else
+        DEBUG ("Could not get the event device!");
+    }
+
+  return FALSE;
+}
+
+static gboolean
+base_password_dialog_window_state_changed (GtkWidget *widget,
+    GdkEventWindowState *event,
+    gpointer data)
+{
+  GdkWindowState state = gdk_window_get_state (gtk_widget_get_window (widget));
+
+  if (state & GDK_WINDOW_STATE_WITHDRAWN
+      || state & GDK_WINDOW_STATE_ICONIFIED
+      || state & GDK_WINDOW_STATE_FULLSCREEN
+      || state & GDK_WINDOW_STATE_MAXIMIZED)
+    {
+      base_password_dialog_ungrab_keyboard (widget, (GdkEvent *) event, data);
+    }
+  else
+    {
+      base_password_dialog_grab_keyboard (widget, (GdkEvent *) event, data);
+    }
+
+  return FALSE;
+}
+
+static void
+empathy_base_password_dialog_constructed (GObject *object)
+{
+  EmpathyBasePasswordDialog *self;
+  GtkWidget *icon;
+  GtkBox *box;
+  gchar *text;
+
+  self = EMPATHY_BASE_PASSWORD_DIALOG (object);
+
+  g_assert (self->account != NULL);
+
+  self->priv->grabbing = FALSE;
+
+  /* dialog */
+  gtk_dialog_add_button (GTK_DIALOG (self),
+      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+
+  self->ok_button = gtk_dialog_add_button (GTK_DIALOG (self),
+      GTK_STOCK_OK, GTK_RESPONSE_OK);
+  gtk_widget_set_sensitive (self->ok_button, FALSE);
+
+  text = g_strdup_printf (_("Enter your password for account\n<b>%s</b>"),
+      tp_account_get_display_name (self->account));
+  gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (self), text);
+  g_free (text);
+
+  gtk_window_set_icon_name (GTK_WINDOW (self),
+      GTK_STOCK_DIALOG_AUTHENTICATION);
+
+  box = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self)));
+
+  /* dialog icon */
+  icon = gtk_image_new_from_icon_name (
+      tp_account_get_icon_name (self->account), GTK_ICON_SIZE_DIALOG);
+  gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (self), icon);
+  gtk_widget_show (icon);
+
+  /* entry */
+  self->entry = gtk_entry_new ();
+  gtk_entry_set_visibility (GTK_ENTRY (self->entry), FALSE);
+
+  /* entry clear icon */
+  gtk_entry_set_icon_from_stock (GTK_ENTRY (self->entry),
+      GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+  gtk_entry_set_icon_sensitive (GTK_ENTRY (self->entry),
+      GTK_ENTRY_ICON_SECONDARY, FALSE);
+
+  g_signal_connect (self->entry, "icon-release",
+      G_CALLBACK (clear_icon_released_cb), NULL);
+  g_signal_connect (self->entry, "changed",
+      G_CALLBACK (password_entry_changed_cb), self);
+  g_signal_connect (self->entry, "activate",
+      G_CALLBACK (password_entry_activate_cb), self);
+
+  gtk_box_pack_start (box, self->entry, FALSE, FALSE, 0);
+  gtk_widget_show (self->entry);
+
+  /* remember password ticky box */
+  self->ticky = gtk_check_button_new_with_label (_("Remember password"));
+
+  gtk_box_pack_start (box, self->ticky, FALSE, FALSE, 0);
+
+  g_signal_connect (self, "window-state-event",
+      G_CALLBACK (base_password_dialog_window_state_changed), self);
+  g_signal_connect (self, "map-event",
+      G_CALLBACK (base_password_dialog_grab_keyboard), self);
+  g_signal_connect (self, "unmap-event",
+      G_CALLBACK (base_password_dialog_ungrab_keyboard), self);
+
+  gtk_widget_grab_focus (self->entry);
+
+  gtk_window_set_position (GTK_WINDOW (self), GTK_WIN_POS_CENTER_ALWAYS);
+}
+
+static void
+empathy_base_password_dialog_init (EmpathyBasePasswordDialog *self)
+{
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+      EMPATHY_TYPE_BASE_PASSWORD_DIALOG, EmpathyBasePasswordDialogPriv);
+}
+
+static void
+empathy_base_password_dialog_class_init (EmpathyBasePasswordDialogClass *klass)
+{
+  GParamSpec *pspec;
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+  g_type_class_add_private (klass, sizeof (EmpathyBasePasswordDialogPriv));
+
+  oclass->set_property = empathy_base_password_dialog_set_property;
+  oclass->get_property = empathy_base_password_dialog_get_property;
+  oclass->dispose = empathy_base_password_dialog_dispose;
+  oclass->constructed = empathy_base_password_dialog_constructed;
+
+  pspec = g_param_spec_object ("account", "The TpAccount",
+      "The TpAccount to be used.",
+      TP_TYPE_ACCOUNT,
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (oclass, PROP_ACCOUNT, pspec);
+}
diff --git a/libempathy-gtk/empathy-base-password-dialog.h b/libempathy-gtk/empathy-base-password-dialog.h
new file mode 100644 (file)
index 0000000..c144a66
--- /dev/null
@@ -0,0 +1,71 @@
+/*
+ * empathy-base-password-dialog.h - Header for EmpathyBasePasswordDialog
+ * Copyright (C) 2010 Collabora Ltd.
+ *
+ * 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 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
+ * Lesser General Public License for more details.
+ *
+ * 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
+ */
+
+#ifndef __EMPATHY_BASE_PASSWORD_DIALOG_H__
+#define __EMPATHY_BASE_PASSWORD_DIALOG_H__
+
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+#include <libempathy/empathy-server-sasl-handler.h>
+
+#include <extensions/extensions.h>
+
+G_BEGIN_DECLS
+
+typedef struct _EmpathyBasePasswordDialog EmpathyBasePasswordDialog;
+typedef struct _EmpathyBasePasswordDialogClass EmpathyBasePasswordDialogClass;
+typedef struct _EmpathyBasePasswordDialogPriv EmpathyBasePasswordDialogPriv;
+
+struct _EmpathyBasePasswordDialogClass {
+  GtkMessageDialogClass parent_class;
+};
+
+struct _EmpathyBasePasswordDialog {
+  GtkMessageDialog parent;
+  EmpathyBasePasswordDialogPriv *priv;
+
+  /* protected */
+  TpAccount *account;
+  GtkWidget *entry;
+  GtkWidget *ticky;
+  GtkWidget *ok_button;
+};
+
+GType empathy_base_password_dialog_get_type (void);
+
+#define EMPATHY_TYPE_BASE_PASSWORD_DIALOG \
+  (empathy_base_password_dialog_get_type ())
+#define EMPATHY_BASE_PASSWORD_DIALOG(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_BASE_PASSWORD_DIALOG, \
+    EmpathyBasePasswordDialog))
+#define EMPATHY_BASE_PASSWORD_DIALOG_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_BASE_PASSWORD_DIALOG, \
+  EmpathyBasePasswordDialogClass))
+#define EMPATHY_IS_BASE_PASSWORD_DIALOG(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_BASE_PASSWORD_DIALOG))
+#define EMPATHY_IS_BASE_PASSWORD_DIALOG_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_BASE_PASSWORD_DIALOG))
+#define EMPATHY_BASE_PASSWORD_DIALOG_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_BASE_PASSWORD_DIALOG, \
+  EmpathyBasePasswordDialogClass))
+
+G_END_DECLS
+
+#endif /* #ifndef __EMPATHY_BASE_PASSWORD_DIALOG_H__*/
index adf4987bad0e6b8197c38a97b0eadaf7b5e5b6b1..16526d3544d4e5b6aa945703d257fe9da099605c 100644 (file)
@@ -250,22 +250,28 @@ empathy_call_new_with_streams (const gchar *contact,
 }
 
 void
-empathy_call_set_stream_properties (GstElement *element)
+empathy_call_set_stream_properties (GstElement *element,
+  gboolean echo_cancellation)
 {
   GstStructure *props;
   GSettings *gsettings_call;
-  gboolean echo_cancellation;
+  gboolean echo_cancellation_setting;
 
   gsettings_call = g_settings_new (EMPATHY_PREFS_CALL_SCHEMA);
 
-  echo_cancellation = g_settings_get_boolean (gsettings_call,
+  echo_cancellation_setting = g_settings_get_boolean (gsettings_call,
       EMPATHY_PREFS_CALL_ECHO_CANCELLATION);
 
+  DEBUG ("Echo cancellation: element allowed: %s, user enabled: %s",
+    echo_cancellation ? " yes" : "no",
+    echo_cancellation_setting ? " yes" : "no");
+
+
   props = gst_structure_new ("props",
       PA_PROP_MEDIA_ROLE, G_TYPE_STRING, "phone",
       NULL);
 
-  if (echo_cancellation)
+  if (echo_cancellation && echo_cancellation_setting)
     {
       gst_structure_set (props,
           "filter.want", G_TYPE_STRING, "echo-cancel",
index 87676161c698d176dcb5b92ba7e1dac536fc80c3..8361031002ac3b5df5d3195daae582601bb48b9a 100644 (file)
@@ -40,7 +40,8 @@ GHashTable * empathy_call_create_streamed_media_request (const gchar *contact,
     gboolean initial_audio,
     gboolean initial_video);
 
-void empathy_call_set_stream_properties (GstElement *element);
+void empathy_call_set_stream_properties (GstElement *element,
+    gboolean echo_cancellation);
 
 G_END_DECLS
 
index 24899942712c5b6ffd3879ca023068daf83d3605..c251f1f423d560ff2f1ba2fc7212f0764ea3c7f8 100644 (file)
@@ -151,7 +151,7 @@ chat_text_view_event_cb (EmpathyChatTextView *view,
                return FALSE;
        }
 
-       gdk_window_get_pointer (win, &x, &y, NULL);
+       gdk_window_get_device_position (win, event->device, &x, &y, NULL);
 
        /* Get the iter where the cursor is at */
        gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (view), type,
@@ -286,7 +286,9 @@ chat_text_view_populate_popup (EmpathyChatTextView *view,
        table = gtk_text_buffer_get_tag_table (priv->buffer);
        tag = gtk_text_tag_table_lookup (table, EMPATHY_CHAT_TEXT_VIEW_TAG_LINK);
 
-       gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
+       gdk_window_get_device_position (gtk_widget_get_window (GTK_WIDGET (view)),
+               gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (
+                       gtk_widget_get_display (GTK_WIDGET (view)))), &x, &y, NULL);
 
        gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (view),
                                               GTK_TEXT_WINDOW_WIDGET,
index 09146d896633905842391e49c3254f2395fb95cf..70e35ddad0d4b49e159df8c146463792139e4e64 100644 (file)
@@ -49,8 +49,8 @@
 #include "empathy-chat.h"
 #include "empathy-spell.h"
 #include "empathy-contact-dialogs.h"
-#include "empathy-contact-list-store.h"
-#include "empathy-contact-list-view.h"
+#include "empathy-individual-store-channel.h"
+#include "empathy-individual-view.h"
 #include "empathy-contact-menu.h"
 #include "empathy-input-text-view.h"
 #include "empathy-search-bar.h"
@@ -2331,7 +2331,10 @@ chat_input_populate_popup_cb (GtkTextView *view,
        switch (priv->most_recent_event_type) {
            case GDK_BUTTON_PRESS:
                /* get the location from the pointer */
-               gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
+               gdk_window_get_device_position (gtk_widget_get_window (GTK_WIDGET (view)),
+                       gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (
+                               gtk_widget_get_display (GTK_WIDGET (view)))), &x, &y, NULL);
+
                gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (view),
                                                       GTK_TEXT_WINDOW_WIDGET,
                                                       x, y,
@@ -2725,7 +2728,7 @@ chat_update_contacts_visibility (EmpathyChat *chat,
        }
 
        if (show && priv->contact_list_view == NULL) {
-               EmpathyContactListStore *store;
+               EmpathyIndividualStore *store;
                gint                     min_width;
                GtkAllocation            allocation;
 
@@ -2746,19 +2749,27 @@ chat_update_contacts_visibility (EmpathyChat *chat,
                priv->contacts_visible_id = g_timeout_add (500,
                        chat_contacts_visible_timeout_cb, chat);
 
-               store = empathy_contact_list_store_new (
-                               EMPATHY_CONTACT_LIST (priv->tp_chat));
-               empathy_contact_list_store_set_show_groups (
-                               EMPATHY_CONTACT_LIST_STORE (store), FALSE);
-
-               priv->contact_list_view = GTK_WIDGET (empathy_contact_list_view_new (store,
-                       EMPATHY_CONTACT_LIST_FEATURE_CONTACT_TOOLTIP,
-                       EMPATHY_CONTACT_FEATURE_CHAT |
-                       EMPATHY_CONTACT_FEATURE_CALL |
-                       EMPATHY_CONTACT_FEATURE_LOG |
-                       EMPATHY_CONTACT_FEATURE_INFO));
+               store = EMPATHY_INDIVIDUAL_STORE (
+                               empathy_individual_store_channel_new ((TpChannel *) priv->tp_chat));
+
+               empathy_individual_store_set_show_groups (store, FALSE);
+
+               priv->contact_list_view = GTK_WIDGET (empathy_individual_view_new (store,
+                       EMPATHY_INDIVIDUAL_VIEW_FEATURE_INDIVIDUAL_TOOLTIP,
+                       EMPATHY_INDIVIDUAL_FEATURE_ADD_CONTACT |
+                       EMPATHY_INDIVIDUAL_FEATURE_CHAT |
+                       EMPATHY_INDIVIDUAL_FEATURE_CALL |
+                       EMPATHY_INDIVIDUAL_FEATURE_LOG |
+                       EMPATHY_INDIVIDUAL_FEATURE_INFO));
+
+               empathy_individual_view_set_show_offline (
+                       EMPATHY_INDIVIDUAL_VIEW (priv->contact_list_view), TRUE);
+               empathy_individual_view_set_show_uninteresting (
+                       EMPATHY_INDIVIDUAL_VIEW (priv->contact_list_view), TRUE);
+
                gtk_container_add (GTK_CONTAINER (priv->scrolled_window_contacts),
                                   priv->contact_list_view);
+
                gtk_widget_show (priv->contact_list_view);
                gtk_widget_show (priv->scrolled_window_contacts);
                g_object_unref (store);
@@ -3470,7 +3481,7 @@ chat_prompt_to_save_password (EmpathyChat *self,
        gtk_info_bar_set_message_type (GTK_INFO_BAR (data->info_bar),
                                       GTK_MESSAGE_QUESTION);
 
-       hbox = gtk_hbox_new (FALSE, 5);
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
        gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
 
        /* Add image */
@@ -3664,7 +3675,7 @@ display_password_info_bar (EmpathyChat *self)
 
        content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar));
 
-       hbox = gtk_hbox_new (FALSE, 5);
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
        gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
 
        /* Add image */
index b000e24d4aeef6921a80ee92a99a590dc9f64e55..c28362b7019fadb099232f3e3b2df03b8da7c4f7 100644 (file)
@@ -47,9 +47,6 @@ G_DEFINE_TYPE (EmpathyContactBlockingDialog, empathy_contact_blocking_dialog,
 
 struct _EmpathyContactBlockingDialogPrivate
 {
-  /* a map of all active connections to their 'deny' channel */
-  GHashTable *channels; /* reffed TpConnection* -> reffed TpChannel* */
-
   guint block_account_changed;
 
   GtkListStore *blocked_contacts;
@@ -62,12 +59,14 @@ struct _EmpathyContactBlockingDialogPrivate
   GtkWidget *info_bar;
   GtkWidget *info_bar_label;
   GtkWidget *remove_button;
+
+  TpConnection *current_conn;
 };
 
 enum /* blocked-contacts columns */
 {
   COL_BLOCKED_IDENTIFIER,
-  COL_BLOCKED_HANDLE,
+  COL_BLOCKED_CONTACT,
   N_BLOCKED_COLUMNS
 };
 
@@ -90,13 +89,13 @@ contact_blocking_dialog_filter_account_chooser (TpAccount *account,
     gpointer callback_data,
     gpointer user_data)
 {
-  EmpathyContactBlockingDialog *self = user_data;
   TpConnection *conn = tp_account_get_connection (account);
   gboolean enable;
 
   enable =
     conn != NULL &&
-    g_hash_table_lookup (self->priv->channels, conn) != NULL;
+    tp_proxy_has_interface_by_id (conn,
+      TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING);
 
   callback (enable, callback_data);
 }
@@ -124,7 +123,8 @@ contact_blocking_dialog_refilter_account_chooser (
   conn = empathy_account_chooser_get_connection (chooser);
   enabled = (empathy_account_chooser_get_account (chooser) != NULL &&
              conn != NULL &&
-             g_hash_table_lookup (self->priv->channels, conn) != NULL);
+             tp_proxy_has_interface_by_id (conn,
+               TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING));
 
   if (!enabled)
     DEBUG ("No account selected");
@@ -135,56 +135,63 @@ contact_blocking_dialog_refilter_account_chooser (
   contact_blocking_dialog_account_changed (self->priv->account_chooser, self);
 }
 
-static void contact_blocking_dialog_inspected_handles (TpConnection *,
-    const char **, const GError *, gpointer, GObject *);
-
 static void
-contact_blocking_dialog_add_contacts_to_list (
+contact_blocking_dialog_add_blocked (
     EmpathyContactBlockingDialog *self,
-    TpConnection *conn,
-    GArray *handles)
-{
-  if (handles->len > 0)
-    tp_cli_connection_call_inspect_handles (conn, -1,
-        TP_HANDLE_TYPE_CONTACT, handles,
-        contact_blocking_dialog_inspected_handles,
-        g_boxed_copy (DBUS_TYPE_G_UINT_ARRAY, handles),
-        (GDestroyNotify) g_array_unref, G_OBJECT (self));
-}
-
-static void
-contact_blocking_dialog_inspected_handles (TpConnection *conn,
-    const char **identifiers,
-    const GError *in_error,
-    gpointer user_data,
-    GObject *self)
+    GPtrArray *blocked)
 {
   EmpathyContactBlockingDialogPrivate *priv = GET_PRIVATE (self);
-  GArray *handles = user_data;
   guint i;
 
-  if (in_error != NULL)
+  if (blocked == NULL)
+    return;
+
+  for (i = 0; i < blocked->len; i++)
     {
-      DEBUG ("Failed to inspect handles: %s", in_error->message);
-      return;
+      TpContact *contact = g_ptr_array_index (blocked, i);
+
+      gtk_list_store_insert_with_values (priv->blocked_contacts, NULL, -1,
+          COL_BLOCKED_IDENTIFIER, tp_contact_get_identifier (contact),
+          COL_BLOCKED_CONTACT, contact,
+          -1);
     }
+}
+
+static void
+blocked_contacts_changed_cb (TpConnection *conn,
+    GPtrArray *added,
+    GPtrArray *removed,
+    EmpathyContactBlockingDialog *self)
+{
+  GtkTreeModel *model = GTK_TREE_MODEL (self->priv->blocked_contacts);
+  GtkTreeIter iter;
+  gboolean valid;
+
+  DEBUG ("blocked contacts changed on %s: %u added, %u removed",
+      get_pretty_conn_name (conn), added->len, removed->len);
 
-  DEBUG ("Adding %u identifiers", handles->len);
+  /* add contacts */
+  contact_blocking_dialog_add_blocked (self, added);
 
-  for (i = 0; i < handles->len; i++)
+  /* remove contacts */
+  valid = gtk_tree_model_get_iter_first (model, &iter);
+  while (valid)
     {
-      const char *identifier = identifiers[i];
-      TpHandle handle = g_array_index (handles, TpHandle, i);
+      TpContact *contact;
 
-      gtk_list_store_insert_with_values (priv->blocked_contacts, NULL, -1,
-          COL_BLOCKED_IDENTIFIER, identifier,
-          COL_BLOCKED_HANDLE, handle,
+      gtk_tree_model_get (model, &iter,
+          COL_BLOCKED_CONTACT, &contact,
           -1);
+
+      if (tp_g_ptr_array_contains (removed, contact))
+        valid = gtk_list_store_remove (self->priv->blocked_contacts, &iter);
+      else
+        valid = gtk_tree_model_iter_next (model, &iter);
+
+      g_object_unref (contact);
     }
 }
 
-DECLARE_CALLBACK (contact_blocking_dialog_connection_prepared);
-
 static void
 contact_blocking_dialog_connection_status_changed (TpAccount *account,
     guint old_status,
@@ -201,8 +208,6 @@ contact_blocking_dialog_connection_status_changed (TpAccount *account,
       case TP_CONNECTION_STATUS_DISCONNECTED:
         DEBUG ("Connection %s invalidated", get_pretty_conn_name (conn));
 
-        /* remove the channel from the hash table */
-        g_hash_table_remove (self->priv->channels, conn);
         contact_blocking_dialog_refilter_account_chooser (self);
         break;
 
@@ -212,65 +217,10 @@ contact_blocking_dialog_connection_status_changed (TpAccount *account,
       case TP_CONNECTION_STATUS_CONNECTED:
         DEBUG ("Connection %s reconnected", get_pretty_conn_name (conn));
 
-        tp_proxy_prepare_async (conn, NULL,
-            contact_blocking_dialog_connection_prepared, self);
-    }
-}
-
-static void
-contact_blocking_dialog_deny_channel_members_changed (TpChannel *channel,
-    const char *message,
-    GArray *added,
-    GArray *removed,
-    GArray *local_pending,
-    GArray *remote_pending,
-    TpHandle actor,
-    guint reason,
-    EmpathyContactBlockingDialog *self)
-{
-  TpConnection *conn = tp_channel_borrow_connection (channel);
-  GtkTreeModel *model = GTK_TREE_MODEL (self->priv->blocked_contacts);
-  GtkTreeIter iter;
-  TpIntset *removed_set;
-  gboolean valid;
-
-  /* we only care about changes to the selected connection */
-  /* FIXME: can we compare proxy pointers directly? */
-  if (tp_strdiff (
-        tp_proxy_get_object_path (tp_channel_borrow_connection (channel)),
-        tp_proxy_get_object_path (empathy_account_chooser_get_connection (
-            EMPATHY_ACCOUNT_CHOOSER (self->priv->account_chooser)))))
-    return;
-
-  DEBUG ("deny list changed on %s: %u added, %u removed",
-      get_pretty_conn_name (conn), added->len, removed->len);
-
-  /* add contacts */
-  contact_blocking_dialog_add_contacts_to_list (self, conn, added);
-
-  /* remove contacts */
-  removed_set = tp_intset_from_array (removed);
-
-  valid = gtk_tree_model_get_iter_first (model, &iter);
-  while (valid)
-    {
-      TpHandle handle;
-
-      gtk_tree_model_get (model, &iter,
-          COL_BLOCKED_HANDLE, &handle,
-          -1);
-
-      if (tp_intset_is_member (removed_set, handle))
-        valid = gtk_list_store_remove (self->priv->blocked_contacts, &iter);
-      else
-        valid = gtk_tree_model_iter_next (model, &iter);
+        contact_blocking_dialog_refilter_account_chooser (self);
     }
-
-  tp_intset_destroy (removed_set);
 }
 
-DECLARE_CALLBACK (contact_blocking_dialog_connection_prepared);
-
 static void
 contact_blocking_dialog_am_prepared (GObject *am,
     GAsyncResult *result,
@@ -292,166 +242,100 @@ contact_blocking_dialog_am_prepared (GObject *am,
   for (ptr = accounts; ptr != NULL; ptr = ptr->next)
     {
       TpAccount *account = ptr->data;
-      TpConnection *conn;
 
       tp_g_signal_connect_object (account, "status-changed",
           G_CALLBACK (contact_blocking_dialog_connection_status_changed),
           self, 0);
 
-      conn = tp_account_get_connection (TP_ACCOUNT (account));
-
-      if (conn != NULL)
-        {
-          tp_proxy_prepare_async (conn, NULL,
-              contact_blocking_dialog_connection_prepared, self);
-        }
+      contact_blocking_dialog_refilter_account_chooser (self);
     }
 
   g_list_free (accounts);
 }
 
-static void contact_blocking_dialog_got_deny_channel (TpConnection *,
-    gboolean, const char *, GHashTable *, const GError *, gpointer, GObject *);
-
 static void
-contact_blocking_dialog_connection_prepared (GObject *conn,
-    GAsyncResult *result,
-    gpointer user_data)
+contact_blocking_dialog_set_error (EmpathyContactBlockingDialog *self,
+    const GError *error)
 {
-  EmpathyContactBlockingDialog *self = user_data;
-  GHashTable *request;
-  GError *error = NULL;
+  const char *msg = NULL;
 
-  if (!tp_proxy_prepare_finish (conn, result, &error))
+  if (error->domain == TP_ERRORS)
     {
-      DEBUG ("Failed to prepare connection %s: %s",
-          get_pretty_conn_name ((TpConnection *) conn), error->message);
-      g_error_free (error);
-      return;
+      if (error->code == TP_ERROR_INVALID_HANDLE)
+        msg = _("Unknown or invalid identifier");
+      else if (error->code == TP_ERROR_NOT_AVAILABLE)
+        msg = _("Contact blocking temporarily unavailable");
+      else if (error->code == TP_ERROR_NOT_CAPABLE)
+        msg = _("Contact blocking unavailable");
+      else if (error->code == TP_ERROR_PERMISSION_DENIED)
+        msg = _("Permission Denied");
     }
 
-  /* request the deny channel */
-  request = tp_asv_new (
-      TP_PROP_CHANNEL_CHANNEL_TYPE,
-      G_TYPE_STRING,
-      TP_IFACE_CHANNEL_TYPE_CONTACT_LIST,
-
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
-      G_TYPE_UINT,
-      TP_HANDLE_TYPE_LIST,
-
-      TP_PROP_CHANNEL_TARGET_ID,
-      G_TYPE_STRING,
-      "deny",
-
-      NULL);
-
-  tp_cli_connection_interface_requests_call_ensure_channel (
-      TP_CONNECTION (conn), -1, request,
-      contact_blocking_dialog_got_deny_channel, NULL, NULL, G_OBJECT (self));
+  if (msg == NULL)
+    msg = _("Could not block contact");
 
-  g_hash_table_destroy (request);
+  gtk_label_set_text (GTK_LABEL (self->priv->info_bar_label), msg);
+  gtk_widget_show (self->priv->info_bar);
 }
 
-DECLARE_CALLBACK (contact_blocking_dialog_deny_channel_prepared);
-
 static void
-contact_blocking_dialog_got_deny_channel (TpConnection *conn,
-    gboolean yours,
-    const char *channel_path,
-    GHashTable *props,
-    const GError *in_error,
-    gpointer user_data,
-    GObject *self)
+block_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
 {
-  TpChannel *channel;
+  EmpathyContactBlockingDialog *self = user_data;
   GError *error = NULL;
 
-  const GQuark features[] = {
-      TP_CHANNEL_FEATURE_CORE,
-      TP_CHANNEL_FEATURE_GROUP,
-      0 };
-
-  if (in_error != NULL)
+  if (!tp_contact_block_finish (TP_CONTACT (source), result,
+        &error))
     {
-      DEBUG ("Failed to get 'deny' channel on %s: %s",
-          get_pretty_conn_name (conn), in_error->message);
-      return;
-    }
+      DEBUG ("Error blocking contacts: %s", error->message);
 
-  channel = tp_channel_new_from_properties (conn, channel_path, props, &error);
+      contact_blocking_dialog_set_error (
+          EMPATHY_CONTACT_BLOCKING_DIALOG (self), error);
 
-  if (error != NULL)
-    {
-      DEBUG ("Failed to create channel proxy on %s: %s",
-          get_pretty_conn_name (conn), in_error->message);
       g_error_free (error);
       return;
     }
 
-  tp_proxy_prepare_async (channel, features,
-      contact_blocking_dialog_deny_channel_prepared, self);
+  DEBUG ("Contact blocked");
 }
 
 static void
-contact_blocking_dialog_deny_channel_prepared (GObject *channel,
-    GAsyncResult *result,
-    gpointer user_data)
+block_contact_got_contact (TpConnection *conn,
+    guint n_contacts,
+    TpContact * const *contacts,
+    const gchar * const *requested_ids,
+    GHashTable *failed_id_errors,
+    const GError *error,
+    gpointer user_data,
+    GObject *weak_object)
 {
-  EmpathyContactBlockingDialog *self = user_data;
-  TpConnection *conn;
-  GError *error = NULL;
-
-  if (!tp_proxy_prepare_finish (channel, result, &error))
-    {
-      DEBUG ("Failed to prepare channel %s: %s",
-          tp_proxy_get_object_path (channel), error->message);
-      g_error_free (error);
-      return;
-    }
-
-  conn = tp_channel_borrow_connection (TP_CHANNEL (channel));
+  EmpathyContactBlockingDialog *self =
+    EMPATHY_CONTACT_BLOCKING_DIALOG (weak_object);
+  gchar *id = user_data;
 
-  DEBUG ("Channel %s prepared for connection %s",
-      tp_proxy_get_object_path (channel), get_pretty_conn_name (conn));
-
-  g_hash_table_insert (self->priv->channels,
-      g_object_ref (conn), channel);
-  contact_blocking_dialog_refilter_account_chooser (self);
+  if (error != NULL)
+    goto error;
 
-  tp_g_signal_connect_object (channel, "group-members-changed",
-      G_CALLBACK (contact_blocking_dialog_deny_channel_members_changed),
-      self, 0);
-}
+  error = g_hash_table_lookup (failed_id_errors, id);
+  if (error != NULL)
+    goto error;
 
-static void
-contact_blocking_dialog_set_error (EmpathyContactBlockingDialog *self,
-    const GError *error)
-{
-  const char *msg = NULL;
+  tp_contact_block_async (contacts[0], FALSE, block_cb, self);
+  goto finally;
 
-  if (error->domain == TP_ERRORS)
-    {
-      if (error->code == TP_ERROR_INVALID_HANDLE)
-        msg = _("Unknown or invalid identifier");
-      else if (error->code == TP_ERROR_NOT_AVAILABLE)
-        msg = _("Contact blocking temporarily unavailable");
-      else if (error->code == TP_ERROR_NOT_CAPABLE)
-        msg = _("Contact blocking unavailable");
-      else if (error->code == TP_ERROR_PERMISSION_DENIED)
-        msg = _("Permission Denied");
-    }
+error:
+  DEBUG ("Error getting contact on %s: %s",
+      get_pretty_conn_name (conn), error->message);
 
-  if (msg == NULL)
-    msg = _("Could not block contact");
+  contact_blocking_dialog_set_error (
+      EMPATHY_CONTACT_BLOCKING_DIALOG (self), error);
 
-  gtk_label_set_text (GTK_LABEL (self->priv->info_bar_label), msg);
-  gtk_widget_show (self->priv->info_bar);
+finally:
+  g_free (id);
 }
 
-static void contact_blocking_dialog_add_contact_got_handle (TpConnection *,
-    const GArray *, const GError *, gpointer, GObject *);
-
 static void
 contact_blocking_dialog_add_contact (GtkWidget *widget,
     EmpathyContactBlockingDialog *self)
@@ -466,136 +350,80 @@ contact_blocking_dialog_add_contact (GtkWidget *widget,
   DEBUG ("Looking up handle for '%s' on %s",
       identifiers[0], get_pretty_conn_name (conn));
 
-  tp_cli_connection_call_request_handles (conn, -1,
-      TP_HANDLE_TYPE_CONTACT, identifiers,
-      contact_blocking_dialog_add_contact_got_handle,
-      NULL, NULL, G_OBJECT (self));
+  tp_connection_get_contacts_by_id (conn, 1, identifiers,
+      0, NULL, block_contact_got_contact,
+      g_strdup (identifiers[0]), NULL, G_OBJECT (self));
 
   gtk_entry_set_text (GTK_ENTRY (self->priv->add_contact_entry), "");
   gtk_widget_hide (self->priv->info_bar);
 }
 
 static void
-contact_blocking_dialog_added_contact (TpChannel *, const GError *,
-    gpointer, GObject *);
-
-static void
-contact_blocking_dialog_add_contact_got_handle (TpConnection *conn,
-    const GArray *handles,
-    const GError *in_error,
-    gpointer user_data,
-    GObject *self)
+unblock_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
 {
-  EmpathyContactBlockingDialogPrivate *priv = GET_PRIVATE (self);
-  TpChannel *channel = g_hash_table_lookup (priv->channels, conn);
-
-  if (in_error != NULL)
-    {
-      DEBUG ("Error getting handle on %s: %s",
-          get_pretty_conn_name (conn), in_error->message);
-
-      contact_blocking_dialog_set_error (
-          EMPATHY_CONTACT_BLOCKING_DIALOG (self), in_error);
-
-      return;
-    }
-
-  g_return_if_fail (handles->len == 1);
-
-  DEBUG ("Adding handle %u to deny channel on %s",
-      g_array_index (handles, TpHandle, 0), get_pretty_conn_name (conn));
-
-  tp_cli_channel_interface_group_call_add_members (channel, -1,
-      handles, "",
-      contact_blocking_dialog_added_contact, NULL, NULL, self);
-}
+  EmpathyContactBlockingDialog *self = user_data;
+  GError *error = NULL;
 
-static void
-contact_blocking_dialog_added_contact (TpChannel *channel,
-    const GError *in_error,
-    gpointer user_data,
-    GObject *self)
-{
-  if (in_error != NULL)
+  if (!tp_connection_unblock_contacts_finish (TP_CONNECTION (source), result,
+        &error))
     {
-      DEBUG ("Error adding contact to deny list %s: %s",
-          tp_proxy_get_object_path (channel), in_error->message);
+      DEBUG ("Error unblocking contacts: %s", error->message);
 
       contact_blocking_dialog_set_error (
-          EMPATHY_CONTACT_BLOCKING_DIALOG (self), in_error);
+          EMPATHY_CONTACT_BLOCKING_DIALOG (self), error);
 
+      g_error_free (error);
       return;
     }
 
-  DEBUG ("Contact added to %s", tp_proxy_get_object_path (channel));
+  DEBUG ("Contacts unblocked");
 }
 
-static void
-contact_blocking_dialog_removed_contacts (TpChannel *,
-    const GError *, gpointer, GObject *);
-
 static void
 contact_blocking_dialog_remove_contacts (GtkWidget *button,
     EmpathyContactBlockingDialog *self)
 {
   TpConnection *conn = empathy_account_chooser_get_connection (
       EMPATHY_ACCOUNT_CHOOSER (self->priv->account_chooser));
-  TpChannel *channel = g_hash_table_lookup (self->priv->channels, conn);
   GtkTreeModel *model;
   GList *rows, *ptr;
-  GArray *handles = g_array_new (FALSE, FALSE, sizeof (TpHandle));
+  GPtrArray *contacts;
 
   rows = gtk_tree_selection_get_selected_rows (self->priv->selection, &model);
 
+  contacts = g_ptr_array_new_with_free_func (g_object_unref);
+
   for (ptr = rows; ptr != NULL; ptr = ptr->next)
     {
       GtkTreePath *path = ptr->data;
       GtkTreeIter iter;
-      TpHandle handle;
+      TpContact *contact;
 
       if (!gtk_tree_model_get_iter (model, &iter, path))
         continue;
 
       gtk_tree_model_get (model, &iter,
-          COL_BLOCKED_HANDLE, &handle,
+          COL_BLOCKED_CONTACT, &contact,
           -1);
 
-      g_array_append_val (handles, handle);
+      g_ptr_array_add (contacts, contact);
+
       gtk_tree_path_free (path);
     }
 
   g_list_free (rows);
 
-  if (handles->len > 0)
+  if (contacts->len > 0)
     {
-      DEBUG ("Removing %u handles", handles->len);
-
-      tp_cli_channel_interface_group_call_remove_members (channel, -1,
-          handles, "",
-          contact_blocking_dialog_removed_contacts,
-          NULL, NULL, G_OBJECT (self));
-    }
+      DEBUG ("Unblocking %u contacts", contacts->len);
 
-  g_array_unref (handles);
-}
-
-static void
-contact_blocking_dialog_removed_contacts (TpChannel *channel,
-    const GError *in_error,
-    gpointer user_data,
-    GObject *self)
-{
-  if (in_error != NULL)
-    {
-      DEBUG ("Error removing contacts from deny list: %s", in_error->message);
-
-      contact_blocking_dialog_set_error (
-          EMPATHY_CONTACT_BLOCKING_DIALOG (self), in_error);
-
-      return;
+      tp_connection_unblock_contacts_async (conn, contacts->len,
+          (TpContact * const *) contacts->pdata, unblock_cb, self);
     }
 
-  DEBUG ("Contacts removed");
+  g_ptr_array_unref (contacts);
 }
 
 static void
@@ -604,8 +432,7 @@ contact_blocking_dialog_account_changed (GtkWidget *account_chooser,
 {
   TpConnection *conn = empathy_account_chooser_get_connection (
       EMPATHY_ACCOUNT_CHOOSER (account_chooser));
-  TpChannel *channel;
-  GArray *blocked;
+  GPtrArray *blocked;
   EmpathyContactManager *contact_manager;
   EmpathyTpContactList *contact_list;
   GList *members, *ptr;
@@ -613,29 +440,37 @@ contact_blocking_dialog_account_changed (GtkWidget *account_chooser,
   if (self->priv->block_account_changed > 0)
     return;
 
+  if (conn == self->priv->current_conn)
+    return;
+
   /* clear the lists of contacts */
   gtk_list_store_clear (self->priv->blocked_contacts);
   gtk_list_store_clear (self->priv->completion_contacts);
 
+  if (self->priv->current_conn != NULL)
+    {
+      g_signal_handlers_disconnect_by_func (self->priv->current_conn,
+          blocked_contacts_changed_cb, self);
+
+      g_clear_object (&self->priv->current_conn);
+    }
+
   if (conn == NULL)
     return;
 
   DEBUG ("Account changed: %s", get_pretty_conn_name (conn));
 
-  /* load the deny list */
-  channel = g_hash_table_lookup (self->priv->channels, conn);
+  self->priv->current_conn = g_object_ref (conn);
 
-  if (channel == NULL)
-    return;
-
-  g_return_if_fail (TP_IS_CHANNEL (channel));
+  tp_g_signal_connect_object (conn, "blocked-contacts-changed",
+      G_CALLBACK (blocked_contacts_changed_cb), self, 0);
 
-  blocked = tp_intset_to_array (tp_channel_group_get_members (channel));
+  blocked = tp_connection_get_blocked_contacts (conn);
 
-  DEBUG ("%u contacts on blocked list", blocked->len);
+  DEBUG ("%u contacts blocked on %s",
+      blocked != NULL ? blocked->len : 0, get_pretty_conn_name (conn));
 
-  contact_blocking_dialog_add_contacts_to_list (self, conn, blocked);
-  g_array_unref (blocked);
+  contact_blocking_dialog_add_blocked (self, blocked);
 
   /* load the completion list */
   g_return_if_fail (empathy_contact_manager_initialized ());
@@ -750,7 +585,7 @@ contact_blocking_dialog_dispose (GObject *self)
 {
   EmpathyContactBlockingDialogPrivate *priv = GET_PRIVATE (self);
 
-  tp_clear_pointer (&priv->channels, g_hash_table_destroy);
+  g_clear_object (&priv->current_conn);
 
   G_OBJECT_CLASS (empathy_contact_blocking_dialog_parent_class)->dispose (self);
 }
@@ -778,14 +613,12 @@ empathy_contact_blocking_dialog_init (EmpathyContactBlockingDialog *self)
   GtkEntryCompletion *completion;
   TpAccountManager *am;
   GtkStyleContext *context;
+  TpSimpleClientFactory *factory;
 
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
       EMPATHY_TYPE_CONTACT_BLOCKING_DIALOG,
       EmpathyContactBlockingDialogPrivate);
 
-  self->priv->channels = g_hash_table_new_full (NULL, NULL,
-      g_object_unref, g_object_unref);
-
   gtk_window_set_title (GTK_WINDOW (self), _("Edit Blocked Contacts"));
   gtk_dialog_add_button (GTK_DIALOG (self),
       GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
@@ -833,8 +666,9 @@ empathy_contact_blocking_dialog_init (EmpathyContactBlockingDialog *self)
   /* build the contact entry */
   self->priv->completion_contacts = gtk_list_store_new (N_COMPLETION_COLUMNS,
       G_TYPE_STRING, /* id */
-      G_TYPE_UINT, /* handle */
-      G_TYPE_STRING); /* text */
+      G_TYPE_STRING, /* text */
+      TP_TYPE_CONTACT); /* contact */
+
   completion = gtk_entry_completion_new ();
   gtk_entry_completion_set_model (completion,
       GTK_TREE_MODEL (self->priv->completion_contacts));
@@ -874,6 +708,11 @@ empathy_contact_blocking_dialog_init (EmpathyContactBlockingDialog *self)
 
   /* prepare the account manager */
   am = tp_account_manager_dup ();
+
+  factory = tp_proxy_get_factory (am);
+  tp_simple_client_factory_add_connection_features_varargs (factory,
+      TP_CONNECTION_FEATURE_CONTACT_BLOCKING, NULL);
+
   tp_proxy_prepare_async (am, NULL, contact_blocking_dialog_am_prepared, self);
   g_object_unref (am);
 
index 78dd1cd2dd1e98bc79c710e15ce6cadd76f115fb..25499ac70556fb37b782f495c99dba2ff9da7eab 100644 (file)
@@ -6,8 +6,8 @@
     <columns>
       <!-- column-name identifier -->
       <column type="gchararray"/>
-      <!-- column-name handle -->
-      <column type="guint"/>
+      <!-- column-name contact -->
+      <column type="TpContact"/>
     </columns>
   </object>
   <object class="GtkVBox" id="contents">
index 7a9e7344d3c920481af915254203030da95eb7eb..cba419beac4459d39121ed17116e3a718bc433dd 100644 (file)
@@ -14,6 +14,9 @@
 
 #include "empathy-contact-chooser.h"
 
+#include <libempathy/empathy-utils.h>
+
+#include <libempathy-gtk/empathy-individual-store-manager.h>
 #include <libempathy-gtk/empathy-individual-view.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
@@ -208,11 +211,7 @@ get_contacts_cb (TpConnection *connection,
   EmpathyContactChooser *self =
     (EmpathyContactChooser *) weak_object;
   AddTemporaryIndividualCtx *ctx = user_data;
-  TpAccount *account;
-  TpfPersonaStore *store;
   FolksIndividual *individual;
-  TpfPersona *persona_new;
-  GeeSet *personas;
 
   if (self->priv->add_temp_ctx != ctx)
     /* another request has been started */
@@ -221,17 +220,7 @@ get_contacts_cb (TpConnection *connection,
   if (n_contacts != 1)
     return;
 
-  account = tp_connection_get_account (connection);
-
-  store = tpf_persona_store_new (account);
-  personas = GEE_SET (
-      gee_hash_set_new (FOLKS_TYPE_PERSONA, g_object_ref, g_object_unref,
-      g_direct_hash, g_direct_equal));
-  persona_new = tpf_persona_new (contacts[0], store);
-  gee_collection_add (GEE_COLLECTION (personas),
-      tpf_persona_new (contacts[0], store));
-
-  individual = folks_individual_new (personas);
+  individual =  empathy_create_individual_from_tp_contact (contacts[0]);
 
   /* listen for updates to the capabilities */
   tp_g_signal_connect_object (contacts[0], "notify::capabilities",
@@ -247,10 +236,6 @@ get_contacts_cb (TpConnection *connection,
         gtk_tree_view_get_selection (GTK_TREE_VIEW (self->priv->view)),
         NULL, NULL))
     empathy_individual_view_select_first (self->priv->view);
-
-  g_clear_object (&persona_new);
-  g_clear_object (&personas);
-  g_object_unref (store);
 }
 
 static void
@@ -411,7 +396,8 @@ empathy_contact_chooser_init (EmpathyContactChooser *self)
 
   /* Add the treeview */
   mgr = empathy_individual_manager_dup_singleton ();
-  self->priv->store = empathy_individual_store_new (mgr);
+  self->priv->store = EMPATHY_INDIVIDUAL_STORE (
+      empathy_individual_store_manager_new (mgr));
   g_object_unref (mgr);
 
   empathy_individual_store_set_show_groups (self->priv->store, FALSE);
index 29552cccc186de0f155a8065400e8c41eaaae5fe..1c56a868e75068c54161c40c0e49042ebfbf5a9a 100644 (file)
@@ -30,8 +30,6 @@
 
 #include <telepathy-glib/account-manager.h>
 
-#include <libempathy/empathy-contact-manager.h>
-#include <libempathy/empathy-contact-list.h>
 #include <libempathy/empathy-tp-contact-factory.h>
 #include <libempathy/empathy-utils.h>
 
@@ -67,22 +65,18 @@ subscription_dialog_response_cb (GtkDialog *dialog,
                                 gint       response,
                                 GtkWidget *contact_widget)
 {
-       EmpathyContactManager *manager;
        EmpathyContact        *contact;
 
-       manager = empathy_contact_manager_dup_singleton ();
        contact = empathy_contact_widget_get_contact (contact_widget);
 
        if (response == GTK_RESPONSE_YES) {
-               empathy_contact_list_add (EMPATHY_CONTACT_LIST (manager),
-                                         contact, "");
+               empathy_contact_add_to_contact_list (contact, "");
 
                empathy_contact_set_alias (contact,
                        empathy_contact_widget_get_alias (contact_widget));
        }
        else if (response == GTK_RESPONSE_NO) {
-               empathy_contact_list_remove (EMPATHY_CONTACT_LIST (manager),
-                                            contact, "");
+               empathy_contact_remove_from_contact_list (contact);
        }
        else if (response == GTK_RESPONSE_REJECT) {
                gboolean abusive;
@@ -90,24 +84,22 @@ subscription_dialog_response_cb (GtkDialog *dialog,
                /* confirm the blocking */
                if (empathy_block_contact_dialog_show (GTK_WINDOW (dialog), contact,
                                                       NULL, &abusive)) {
-                       empathy_contact_list_remove (
-                                       EMPATHY_CONTACT_LIST (manager),
-                                       contact, "");
-                       empathy_contact_list_set_blocked (
-                                       EMPATHY_CONTACT_LIST (manager),
-                                       contact, TRUE, abusive);
+                       TpContact *tp_contact;
+
+                       empathy_contact_remove_from_contact_list (contact);
+
+                       tp_contact = empathy_contact_get_tp_contact (contact);
+
+                       tp_contact_block_async (tp_contact, abusive, NULL, NULL);
                } else {
                        /* if they don't confirm, return back to the
                         * first dialog */
-                       goto finally;
+                       return;
                }
        }
 
        subscription_dialogs = g_list_remove (subscription_dialogs, dialog);
        gtk_widget_destroy (GTK_WIDGET (dialog));
-
-finally:
-       g_object_unref (manager);
 }
 
 void
@@ -123,10 +115,7 @@ empathy_subscription_dialog_show (EmpathyContact *contact,
        GtkWidget *block_user_button;
        GList     *l;
        gchar     *filename;
-       EmpathyContactManager *manager;
-       EmpathyContactListFlags flags;
-
-       manager = empathy_contact_manager_dup_singleton ();
+       TpConnection *conn;
 
        g_return_if_fail (EMPATHY_IS_CONTACT (contact));
 
@@ -148,7 +137,7 @@ empathy_subscription_dialog_show (EmpathyContact *contact,
        g_free (filename);
        g_object_unref (gui);
 
-       vbox = gtk_vbox_new (FALSE, 6);
+       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 
        gtk_box_pack_end (GTK_BOX (hbox_subscription), vbox,
                          TRUE, TRUE, 0);
@@ -188,17 +177,16 @@ empathy_subscription_dialog_show (EmpathyContact *contact,
                          G_CALLBACK (subscription_dialog_response_cb),
                          contact_widget);
 
-       flags = empathy_contact_manager_get_flags_for_connection (manager,
-                               empathy_contact_get_connection (contact));
+       conn = empathy_contact_get_connection (contact);
 
-       if (flags & EMPATHY_CONTACT_LIST_CAN_BLOCK)
+       if (tp_proxy_has_interface_by_id (conn,
+               TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING))
                gtk_widget_show (block_user_button);
 
        if (parent) {
                gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
        }
 
-       g_object_unref (manager);
        gtk_widget_show (dialog);
 }
 
@@ -395,7 +383,6 @@ can_add_contact_to_account (TpAccount                                 *account,
                            gpointer                                   callback_data,
                            gpointer                                   user_data)
 {
-       EmpathyContactManager *contact_manager;
        TpConnection          *connection;
        gboolean               result;
 
@@ -405,10 +392,7 @@ can_add_contact_to_account (TpAccount                                 *account,
                return;
        }
 
-       contact_manager = empathy_contact_manager_dup_singleton ();
-       result = empathy_contact_manager_get_flags_for_connection (
-               contact_manager, connection) & EMPATHY_CONTACT_LIST_CAN_ADD;
-       g_object_unref (contact_manager);
+       result = tp_connection_get_can_change_contact_list (connection);
 
        callback (result, callback_data);
 }
@@ -418,20 +402,16 @@ new_contact_response_cb (GtkDialog *dialog,
                         gint       response,
                         GtkWidget *contact_widget)
 {
-       EmpathyContactManager *manager;
        EmpathyContact         *contact;
 
-       manager = empathy_contact_manager_dup_singleton ();
        contact = empathy_contact_widget_get_contact (contact_widget);
 
        if (contact && response == GTK_RESPONSE_OK) {
-               empathy_contact_list_add (EMPATHY_CONTACT_LIST (manager),
-                                         contact, "");
+               empathy_contact_add_to_contact_list (contact, "");
        }
 
        new_contact_dialog = NULL;
        gtk_widget_destroy (GTK_WIDGET (dialog));
-       g_object_unref (manager);
 }
 
 void
@@ -517,15 +497,10 @@ empathy_block_contact_dialog_show (GtkWindow      *parent,
                                   GdkPixbuf      *avatar,
                                   gboolean       *abusive)
 {
-       EmpathyContactManager *manager;
-       EmpathyContactListFlags flags;
        GtkWidget *dialog;
        GtkWidget *abusive_check = NULL;
        int res;
-
-       manager = empathy_contact_manager_dup_singleton ();
-       flags = empathy_contact_manager_get_flags_for_connection (manager,
-                       empathy_contact_get_connection (contact));
+       TpConnection *conn;
 
        dialog = gtk_message_dialog_new (parent,
                        GTK_DIALOG_MODAL,
@@ -549,8 +524,10 @@ empathy_block_contact_dialog_show (GtkWindow      *parent,
                gtk_widget_show (image);
        }
 
+       conn = empathy_contact_get_connection (contact);
+
        /* ask the user if they want to also report the contact as abusive */
-       if (flags & EMPATHY_CONTACT_LIST_CAN_REPORT_ABUSIVE) {
+       if (tp_connection_can_report_abusive (conn)) {
                GtkWidget *vbox;
 
                vbox = gtk_message_dialog_get_message_area (
@@ -574,7 +551,6 @@ empathy_block_contact_dialog_show (GtkWindow      *parent,
        }
 
        gtk_widget_destroy (dialog);
-       g_object_unref (manager);
 
        return res == GTK_RESPONSE_REJECT;
 }
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
deleted file mode 100644 (file)
index ef4c466..0000000
+++ /dev/null
@@ -1,1779 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2005-2007 Imendio AB
- * Copyright (C) 2007-2008 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 program 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.
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- *
- * Authors: Mikael Hallendal <micke@imendio.com>
- *          Martyn Russell <martyn@imendio.com>
- *          Xavier Claessens <xclaesse@gmail.com>
- */
-
-#include "config.h"
-
-#include <string.h>
-
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
-#include <telepathy-glib/util.h>
-
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-tp-chat.h>
-#include <libempathy/empathy-enum-types.h>
-#include <libempathy/empathy-contact-manager.h>
-
-#include "empathy-contact-list-store.h"
-#include "empathy-ui-utils.h"
-#include "empathy-gtk-enum-types.h"
-#include "empathy-images.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
-
-/* Active users are those which have recently changed state
- * (e.g. online, offline or from normal to a busy state).
- */
-
-/* Time in seconds user is shown as active */
-#define ACTIVE_USER_SHOW_TIME 7
-
-/* Time in seconds after connecting which we wait before active users are enabled */
-#define ACTIVE_USER_WAIT_TO_ENABLE_TIME 5
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyContactListStore)
-typedef struct {
-       EmpathyContactList         *list;
-       gboolean                    show_offline;
-       gboolean                    show_avatars;
-       gboolean                    show_groups;
-       gboolean                    is_compact;
-       gboolean                    show_protocols;
-       gboolean                    show_active;
-       EmpathyContactListStoreSort sort_criterium;
-       guint                       inhibit_active;
-       guint                       setup_idle_id;
-       gboolean                    dispose_has_run;
-       GHashTable                  *status_icons;
-       /* Hash: EmpathyContact* -> GQueue (GtkTreeIter *) */
-       GHashTable                  *empathy_contact_cache;
-       /* Hash: char *groupname -> GtkTreeIter * */
-       GHashTable                  *empathy_group_cache;
-} EmpathyContactListStorePriv;
-
-typedef struct {
-       EmpathyContactListStore *store;
-       EmpathyContact          *contact;
-       gboolean                remove;
-       guint                   timeout;
-} ShowActiveData;
-
-static void             contact_list_store_dispose                  (GObject                       *object);
-static void             contact_list_store_get_property              (GObject                       *object,
-                                                                     guint                          param_id,
-                                                                     GValue                        *value,
-                                                                     GParamSpec                    *pspec);
-static void             contact_list_store_set_property              (GObject                       *object,
-                                                                     guint                          param_id,
-                                                                     const GValue                  *value,
-                                                                     GParamSpec                    *pspec);
-static void             contact_list_store_setup                     (EmpathyContactListStore       *store);
-static gboolean         contact_list_store_inibit_active_cb          (EmpathyContactListStore       *store);
-static void             contact_list_store_members_changed_cb        (EmpathyContactList            *list_iface,
-                                                                     EmpathyContact                *contact,
-                                                                     EmpathyContact                *actor,
-                                                                     guint                          reason,
-                                                                     gchar                         *message,
-                                                                     gboolean                       is_member,
-                                                                     EmpathyContactListStore       *store);
-static void             contact_list_store_member_renamed_cb         (EmpathyContactList            *list_iface,
-                                                                     EmpathyContact                *old_contact,
-                                                                     EmpathyContact                *new_contact,
-                                                                     guint                          reason,
-                                                                     gchar                         *message,
-                                                                     EmpathyContactListStore       *store);
-static void             contact_list_store_groups_changed_cb         (EmpathyContactList            *list_iface,
-                                                                     EmpathyContact                *contact,
-                                                                     gchar                         *group,
-                                                                     gboolean                       is_member,
-                                                                     EmpathyContactListStore       *store);
-static void             contact_list_store_add_contact               (EmpathyContactListStore       *store,
-                                                                     EmpathyContact                *contact);
-static void             contact_list_store_remove_contact            (EmpathyContactListStore       *store,
-                                                                     EmpathyContact                *contact);
-static void             contact_list_store_contact_update            (EmpathyContactListStore       *store,
-                                                                     EmpathyContact                *contact);
-static void             contact_list_store_contact_updated_cb        (EmpathyContact                *contact,
-                                                                     GParamSpec                    *param,
-                                                                     EmpathyContactListStore       *store);
-static void             contact_list_store_contact_set_active        (EmpathyContactListStore       *store,
-                                                                     EmpathyContact                *contact,
-                                                                     gboolean                       active,
-                                                                     gboolean                       set_changed);
-static ShowActiveData * contact_list_store_contact_active_new        (EmpathyContactListStore       *store,
-                                                                     EmpathyContact                *contact,
-                                                                     gboolean                       remove);
-static void             contact_list_store_contact_active_free       (ShowActiveData                *data);
-static gboolean         contact_list_store_contact_active_cb         (ShowActiveData                *data);
-static void             contact_list_store_get_group                 (EmpathyContactListStore       *store,
-                                                                     const gchar                   *name,
-                                                                     GtkTreeIter                   *iter_group_to_set,
-                                                                     GtkTreeIter                   *iter_separator_to_set,
-                                                                     gboolean                      *created,
-                                                                     gboolean                      is_fake_group);
-static gint             contact_list_store_state_sort_func           (GtkTreeModel                  *model,
-                                                                     GtkTreeIter                   *iter_a,
-                                                                     GtkTreeIter                   *iter_b,
-                                                                     gpointer                       user_data);
-static gint             contact_list_store_name_sort_func            (GtkTreeModel                  *model,
-                                                                     GtkTreeIter                   *iter_a,
-                                                                     GtkTreeIter                   *iter_b,
-                                                                     gpointer                       user_data);
-static GList *          contact_list_store_find_contact              (EmpathyContactListStore       *store,
-                                                                     EmpathyContact                *contact);
-static gboolean         contact_list_store_update_list_mode_foreach  (GtkTreeModel                  *model,
-                                                                     GtkTreePath                   *path,
-                                                                     GtkTreeIter                   *iter,
-                                                                     EmpathyContactListStore       *store);
-
-enum {
-       PROP_0,
-       PROP_CONTACT_LIST,
-       PROP_SHOW_OFFLINE,
-       PROP_SHOW_AVATARS,
-       PROP_SHOW_PROTOCOLS,
-       PROP_SHOW_GROUPS,
-       PROP_IS_COMPACT,
-       PROP_SORT_CRITERIUM
-};
-
-G_DEFINE_TYPE (EmpathyContactListStore, empathy_contact_list_store, GTK_TYPE_TREE_STORE);
-
-static void
-contact_list_store_chat_state_changed_cb (TpChannel *self,
-                                    guint contact_handle,
-                                    guint state,
-                                    gpointer store)
-{
-       EmpathyContactListStorePriv *priv = GET_PRIV (store);
-       GList *contacts, *l;
-
-       contacts = empathy_contact_list_get_members (priv->list);
-
-       for (l = contacts; l != NULL; l = l->next) {
-               EmpathyContact *contact = EMPATHY_CONTACT (l->data);
-
-               if (empathy_contact_get_handle (contact) == contact_handle) {
-                       contact_list_store_contact_update (store, contact);
-                       break;
-               }
-       }
-
-       g_list_foreach (contacts, (GFunc) g_object_unref, NULL);
-       g_list_free (contacts);
-}
-
-static gboolean
-contact_list_store_iface_setup (gpointer user_data)
-{
-       EmpathyContactListStore     *store = user_data;
-       EmpathyContactListStorePriv *priv = GET_PRIV (store);
-       GList                       *contacts, *l;
-
-       /* Signal connection. */
-       g_signal_connect (priv->list,
-                         "member-renamed",
-                         G_CALLBACK (contact_list_store_member_renamed_cb),
-                         store);
-       g_signal_connect (priv->list,
-                         "members-changed",
-                         G_CALLBACK (contact_list_store_members_changed_cb),
-                         store);
-       g_signal_connect (priv->list,
-                         "groups-changed",
-                         G_CALLBACK (contact_list_store_groups_changed_cb),
-                         store);
-
-       if (EMPATHY_IS_TP_CHAT (priv->list)) {
-                       g_signal_connect (priv->list,
-                                         "chat-state-changed",
-                                         G_CALLBACK (contact_list_store_chat_state_changed_cb),
-                                         store);
-       }
-
-       /* Add contacts already created. */
-       contacts = empathy_contact_list_get_members (priv->list);
-       for (l = contacts; l; l = l->next) {
-               contact_list_store_members_changed_cb (priv->list, l->data,
-                                                      NULL, 0, NULL,
-                                                      TRUE,
-                                                      store);
-
-               g_object_unref (l->data);
-       }
-       g_list_free (contacts);
-
-       priv->setup_idle_id = 0;
-       return FALSE;
-}
-
-
-static void
-contact_list_store_set_contact_list (EmpathyContactListStore *store,
-                                    EmpathyContactList      *list_iface)
-{
-       EmpathyContactListStorePriv *priv = GET_PRIV (store);
-
-       priv->list = g_object_ref (list_iface);
-
-       /* Let a chance to have all properties set before populating */
-       priv->setup_idle_id = g_idle_add (contact_list_store_iface_setup, store);
-}
-
-static void
-empathy_contact_list_store_class_init (EmpathyContactListStoreClass *klass)
-{
-       GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-       object_class->dispose = contact_list_store_dispose;
-       object_class->get_property = contact_list_store_get_property;
-       object_class->set_property = contact_list_store_set_property;
-
-       g_object_class_install_property (object_class,
-                                        PROP_CONTACT_LIST,
-                                        g_param_spec_object ("contact-list",
-                                                             "The contact list iface",
-                                                             "The contact list iface",
-                                                             EMPATHY_TYPE_CONTACT_LIST,
-                                                             G_PARAM_CONSTRUCT_ONLY |
-                                                             G_PARAM_READWRITE));
-       g_object_class_install_property (object_class,
-                                        PROP_SHOW_OFFLINE,
-                                        g_param_spec_boolean ("show-offline",
-                                                              "Show Offline",
-                                                              "Whether contact list should display "
-                                                              "offline contacts",
-                                                              FALSE,
-                                                              G_PARAM_READWRITE));
-        g_object_class_install_property (object_class,
-                                         PROP_SHOW_AVATARS,
-                                         g_param_spec_boolean ("show-avatars",
-                                                               "Show Avatars",
-                                                               "Whether contact list should display "
-                                                               "avatars for contacts",
-                                                               TRUE,
-                                                               G_PARAM_READWRITE));
-        g_object_class_install_property (object_class,
-                                         PROP_SHOW_PROTOCOLS,
-                                         g_param_spec_boolean ("show-protocols",
-                                                               "Show Protocols",
-                                                               "Whether contact list should display "
-                                                               "protocols for contacts",
-                                                               FALSE,
-                                                               G_PARAM_READWRITE));
-        g_object_class_install_property (object_class,
-                                         PROP_SHOW_GROUPS,
-                                         g_param_spec_boolean ("show-groups",
-                                                               "Show Groups",
-                                                               "Whether contact list should display "
-                                                               "contact groups",
-                                                               TRUE,
-                                                               G_PARAM_READWRITE));
-       g_object_class_install_property (object_class,
-                                        PROP_IS_COMPACT,
-                                        g_param_spec_boolean ("is-compact",
-                                                              "Is Compact",
-                                                              "Whether the contact list is in compact mode or not",
-                                                              FALSE,
-                                                              G_PARAM_READWRITE));
-
-       g_object_class_install_property (object_class,
-                                        PROP_SORT_CRITERIUM,
-                                        g_param_spec_enum ("sort-criterium",
-                                                           "Sort citerium",
-                                                           "The sort criterium to use for sorting the contact list",
-                                                           EMPATHY_TYPE_CONTACT_LIST_STORE_SORT,
-                                                           EMPATHY_CONTACT_LIST_STORE_SORT_NAME,
-                                                           G_PARAM_READWRITE));
-
-       g_type_class_add_private (object_class, sizeof (EmpathyContactListStorePriv));
-}
-
-static void
-g_queue_free_full_iter (gpointer data)
-{
-       GQueue *queue = (GQueue *) data;
-       g_queue_foreach (queue, (GFunc) gtk_tree_iter_free, NULL);
-       g_queue_free (queue);
-}
-
-
-static void
-empathy_contact_list_store_init (EmpathyContactListStore *store)
-{
-       EmpathyContactListStorePriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (store,
-               EMPATHY_TYPE_CONTACT_LIST_STORE, EmpathyContactListStorePriv);
-
-       store->priv = priv;
-       priv->show_avatars = TRUE;
-       priv->show_groups = TRUE;
-       priv->show_protocols = FALSE;
-       priv->inhibit_active = g_timeout_add_seconds (ACTIVE_USER_WAIT_TO_ENABLE_TIME,
-                                                     (GSourceFunc) contact_list_store_inibit_active_cb,
-                                                     store);
-       priv->status_icons = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
-       priv->empathy_contact_cache = g_hash_table_new_full (NULL, NULL, NULL,
-               g_queue_free_full_iter);
-       priv->empathy_group_cache = g_hash_table_new_full (g_str_hash,
-               g_str_equal, g_free,
-               (GDestroyNotify) gtk_tree_iter_free);
-       contact_list_store_setup (store);
-}
-
-static void
-contact_list_store_dispose (GObject *object)
-{
-       EmpathyContactListStorePriv *priv = GET_PRIV (object);
-       GList                       *contacts, *l;
-
-       if (priv->dispose_has_run)
-               return;
-       priv->dispose_has_run = TRUE;
-
-       contacts = empathy_contact_list_get_members (priv->list);
-       for (l = contacts; l; l = l->next) {
-               g_signal_handlers_disconnect_by_func (l->data,
-                                                     G_CALLBACK (contact_list_store_contact_updated_cb),
-                                                     object);
-
-               g_object_unref (l->data);
-       }
-       g_list_free (contacts);
-
-       g_signal_handlers_disconnect_by_func (priv->list,
-                                             G_CALLBACK (contact_list_store_member_renamed_cb),
-                                             object);
-       g_signal_handlers_disconnect_by_func (priv->list,
-                                             G_CALLBACK (contact_list_store_members_changed_cb),
-                                             object);
-       g_signal_handlers_disconnect_by_func (priv->list,
-                                             G_CALLBACK (contact_list_store_groups_changed_cb),
-                                             object);
-       g_object_unref (priv->list);
-
-       if (priv->inhibit_active != 0) {
-               g_source_remove (priv->inhibit_active);
-               priv->inhibit_active = 0;
-       }
-
-       if (priv->setup_idle_id != 0) {
-               g_source_remove (priv->setup_idle_id);
-               priv->setup_idle_id = 0;
-       }
-
-       g_hash_table_destroy (priv->status_icons);
-       g_hash_table_destroy (priv->empathy_contact_cache);
-       g_hash_table_destroy (priv->empathy_group_cache);
-       G_OBJECT_CLASS (empathy_contact_list_store_parent_class)->dispose (object);
-}
-
-static void
-contact_list_store_get_property (GObject    *object,
-                                guint       param_id,
-                                GValue     *value,
-                                GParamSpec *pspec)
-{
-       EmpathyContactListStorePriv *priv;
-
-       priv = GET_PRIV (object);
-
-       switch (param_id) {
-       case PROP_CONTACT_LIST:
-               g_value_set_object (value, priv->list);
-               break;
-       case PROP_SHOW_OFFLINE:
-               g_value_set_boolean (value, priv->show_offline);
-               break;
-       case PROP_SHOW_AVATARS:
-               g_value_set_boolean (value, priv->show_avatars);
-               break;
-       case PROP_SHOW_PROTOCOLS:
-               g_value_set_boolean (value, priv->show_protocols);
-               break;
-       case PROP_SHOW_GROUPS:
-               g_value_set_boolean (value, priv->show_groups);
-               break;
-       case PROP_IS_COMPACT:
-               g_value_set_boolean (value, priv->is_compact);
-               break;
-       case PROP_SORT_CRITERIUM:
-               g_value_set_enum (value, priv->sort_criterium);
-               break;
-       default:
-               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-               break;
-       };
-}
-
-static void
-contact_list_store_set_property (GObject      *object,
-                                guint         param_id,
-                                const GValue *value,
-                                GParamSpec   *pspec)
-{
-       switch (param_id) {
-       case PROP_CONTACT_LIST:
-               contact_list_store_set_contact_list (EMPATHY_CONTACT_LIST_STORE (object),
-                                                    g_value_get_object (value));
-               break;
-       case PROP_SHOW_OFFLINE:
-               empathy_contact_list_store_set_show_offline (EMPATHY_CONTACT_LIST_STORE (object),
-                                                           g_value_get_boolean (value));
-               break;
-       case PROP_SHOW_AVATARS:
-               empathy_contact_list_store_set_show_avatars (EMPATHY_CONTACT_LIST_STORE (object),
-                                                           g_value_get_boolean (value));
-               break;
-       case PROP_SHOW_PROTOCOLS:
-               empathy_contact_list_store_set_show_protocols (EMPATHY_CONTACT_LIST_STORE (object),
-                                                           g_value_get_boolean (value));
-               break;
-       case PROP_SHOW_GROUPS:
-               empathy_contact_list_store_set_show_groups (EMPATHY_CONTACT_LIST_STORE (object),
-                                                           g_value_get_boolean (value));
-               break;
-       case PROP_IS_COMPACT:
-               empathy_contact_list_store_set_is_compact (EMPATHY_CONTACT_LIST_STORE (object),
-                                                         g_value_get_boolean (value));
-               break;
-       case PROP_SORT_CRITERIUM:
-               empathy_contact_list_store_set_sort_criterium (EMPATHY_CONTACT_LIST_STORE (object),
-                                                             g_value_get_enum (value));
-               break;
-       default:
-               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-               break;
-       };
-}
-
-EmpathyContactListStore *
-empathy_contact_list_store_new (EmpathyContactList *list_iface)
-{
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (list_iface), NULL);
-
-       return g_object_new (EMPATHY_TYPE_CONTACT_LIST_STORE,
-                            "contact-list", list_iface,
-                            NULL);
-}
-
-EmpathyContactList *
-empathy_contact_list_store_get_list_iface (EmpathyContactListStore *store)
-{
-       EmpathyContactListStorePriv *priv;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store), FALSE);
-
-       priv = GET_PRIV (store);
-
-       return priv->list;
-}
-
-gboolean
-empathy_contact_list_store_get_show_offline (EmpathyContactListStore *store)
-{
-       EmpathyContactListStorePriv *priv;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store), FALSE);
-
-       priv = GET_PRIV (store);
-
-       return priv->show_offline;
-}
-
-void
-empathy_contact_list_store_set_show_offline (EmpathyContactListStore *store,
-                                           gboolean                show_offline)
-{
-       EmpathyContactListStorePriv *priv;
-       GList                      *contacts, *l;
-       gboolean                    show_active;
-
-       g_return_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store));
-
-       priv = GET_PRIV (store);
-
-       priv->show_offline = show_offline;
-       show_active = priv->show_active;
-
-       /* Disable temporarily. */
-       priv->show_active = FALSE;
-
-       contacts = empathy_contact_list_get_members (priv->list);
-       for (l = contacts; l; l = l->next) {
-               contact_list_store_contact_update (store, l->data);
-
-               g_object_unref (l->data);
-       }
-       g_list_free (contacts);
-
-       /* Restore to original setting. */
-       priv->show_active = show_active;
-
-       g_object_notify (G_OBJECT (store), "show-offline");
-}
-
-gboolean
-empathy_contact_list_store_get_show_avatars (EmpathyContactListStore *store)
-{
-       EmpathyContactListStorePriv *priv;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store), TRUE);
-
-       priv = GET_PRIV (store);
-
-       return priv->show_avatars;
-}
-
-void
-empathy_contact_list_store_set_show_avatars (EmpathyContactListStore *store,
-                                           gboolean                show_avatars)
-{
-       EmpathyContactListStorePriv *priv;
-       GtkTreeModel               *model;
-
-       g_return_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store));
-
-       priv = GET_PRIV (store);
-
-       priv->show_avatars = show_avatars;
-
-       model = GTK_TREE_MODEL (store);
-
-       gtk_tree_model_foreach (model,
-                               (GtkTreeModelForeachFunc)
-                               contact_list_store_update_list_mode_foreach,
-                               store);
-
-       g_object_notify (G_OBJECT (store), "show-avatars");
-}
-
-
-gboolean
-empathy_contact_list_store_get_show_protocols (EmpathyContactListStore *store)
-{
-       EmpathyContactListStorePriv *priv;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store), TRUE);
-
-       priv = GET_PRIV (store);
-
-       return priv->show_protocols;
-}
-
-void
-empathy_contact_list_store_set_show_protocols (EmpathyContactListStore *store,
-                                           gboolean                show_protocols)
-{
-       EmpathyContactListStorePriv *priv;
-       GtkTreeModel               *model;
-
-       g_return_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store));
-
-       priv = GET_PRIV (store);
-
-       priv->show_protocols = show_protocols;
-
-       model = GTK_TREE_MODEL (store);
-
-       gtk_tree_model_foreach (model,
-                               (GtkTreeModelForeachFunc)
-                               contact_list_store_update_list_mode_foreach,
-                               store);
-
-       g_object_notify (G_OBJECT (store), "show-protocols");
-}
-
-gboolean
-empathy_contact_list_store_get_show_groups (EmpathyContactListStore *store)
-{
-       EmpathyContactListStorePriv *priv;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store), TRUE);
-
-       priv = GET_PRIV (store);
-
-       return priv->show_groups;
-}
-
-void
-empathy_contact_list_store_set_show_groups (EmpathyContactListStore *store,
-                                           gboolean                 show_groups)
-{
-       EmpathyContactListStorePriv *priv;
-
-       g_return_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store));
-
-       priv = GET_PRIV (store);
-
-       if (priv->show_groups == show_groups) {
-               return;
-       }
-
-       priv->show_groups = show_groups;
-
-       if (priv->setup_idle_id == 0) {
-               /* Remove all contacts and add them back, not optimized but
-                * that's the easy way :)
-                *
-                * This is only done if there's not a pending setup idle
-                * callback, otherwise it will race and the contacts will get
-                * added twice */
-               GList *contacts, *l;
-
-               gtk_tree_store_clear (GTK_TREE_STORE (store));
-
-               /* Also clear the cache */
-               g_hash_table_remove_all (priv->empathy_contact_cache);
-               g_hash_table_remove_all (priv->empathy_group_cache);
-
-               contacts = empathy_contact_list_get_members (priv->list);
-               for (l = contacts; l; l = l->next) {
-                       contact_list_store_members_changed_cb (priv->list,
-                                                              l->data,
-                                                              NULL, 0, NULL,
-                                                              TRUE,
-                                                              store);
-
-                       g_object_unref (l->data);
-               }
-               g_list_free (contacts);
-       }
-
-       g_object_notify (G_OBJECT (store), "show-groups");
-}
-
-gboolean
-empathy_contact_list_store_get_is_compact (EmpathyContactListStore *store)
-{
-       EmpathyContactListStorePriv *priv;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store), TRUE);
-
-       priv = GET_PRIV (store);
-
-       return priv->is_compact;
-}
-
-void
-empathy_contact_list_store_set_is_compact (EmpathyContactListStore *store,
-                                         gboolean                is_compact)
-{
-       EmpathyContactListStorePriv *priv;
-       GtkTreeModel               *model;
-
-       g_return_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store));
-
-       priv = GET_PRIV (store);
-
-       priv->is_compact = is_compact;
-
-       model = GTK_TREE_MODEL (store);
-
-       gtk_tree_model_foreach (model,
-                               (GtkTreeModelForeachFunc)
-                               contact_list_store_update_list_mode_foreach,
-                               store);
-
-       g_object_notify (G_OBJECT (store), "is-compact");
-}
-
-EmpathyContactListStoreSort
-empathy_contact_list_store_get_sort_criterium (EmpathyContactListStore *store)
-{
-       EmpathyContactListStorePriv *priv;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store), 0);
-
-       priv = GET_PRIV (store);
-
-       return priv->sort_criterium;
-}
-
-void
-empathy_contact_list_store_set_sort_criterium (EmpathyContactListStore     *store,
-                                             EmpathyContactListStoreSort  sort_criterium)
-{
-       EmpathyContactListStorePriv *priv;
-
-       g_return_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store));
-
-       priv = GET_PRIV (store);
-
-       priv->sort_criterium = sort_criterium;
-
-       switch (sort_criterium) {
-       case EMPATHY_CONTACT_LIST_STORE_SORT_STATE:
-               gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
-                                                     EMPATHY_CONTACT_LIST_STORE_COL_STATUS,
-                                                     GTK_SORT_ASCENDING);
-               break;
-
-       case EMPATHY_CONTACT_LIST_STORE_SORT_NAME:
-               gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
-                                                     EMPATHY_CONTACT_LIST_STORE_COL_NAME,
-                                                     GTK_SORT_ASCENDING);
-               break;
-
-       default:
-               g_assert_not_reached ();
-       }
-
-       g_object_notify (G_OBJECT (store), "sort-criterium");
-}
-
-gboolean
-empathy_contact_list_store_row_separator_func (GtkTreeModel *model,
-                                             GtkTreeIter  *iter,
-                                             gpointer      data)
-{
-       gboolean is_separator = FALSE;
-
-       g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
-
-       gtk_tree_model_get (model, iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator,
-                           -1);
-
-       return is_separator;
-}
-
-gchar *
-empathy_contact_list_store_get_parent_group (GtkTreeModel *model,
-                                           GtkTreePath  *path,
-                                           gboolean     *path_is_group,
-                                           gboolean     *is_fake_group)
-{
-       GtkTreeIter  parent_iter, iter;
-       gchar       *name = NULL;
-       gboolean     is_group;
-       gboolean     fake;
-
-       g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL);
-
-       if (path_is_group) {
-               *path_is_group = FALSE;
-       }
-
-       if (!gtk_tree_model_get_iter (model, &iter, path)) {
-               return NULL;
-       }
-
-       gtk_tree_model_get (model, &iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
-                           -1);
-
-       if (!is_group) {
-               g_free (name);
-               name = NULL;
-
-               if (!gtk_tree_model_iter_parent (model, &parent_iter, &iter)) {
-                       return NULL;
-               }
-
-               iter = parent_iter;
-
-               gtk_tree_model_get (model, &iter,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, &fake,
-                                   -1);
-               if (!is_group) {
-                       g_free (name);
-                       return NULL;
-               }
-       }
-
-       if (path_is_group) {
-               *path_is_group = TRUE;
-       }
-
-       if (is_fake_group != NULL)
-               *is_fake_group = fake;
-
-       return name;
-}
-
-static void
-contact_list_store_setup (EmpathyContactListStore *store)
-{
-       EmpathyContactListStorePriv *priv;
-       GType types[] = {
-               GDK_TYPE_PIXBUF,      /* Status pixbuf */
-               GDK_TYPE_PIXBUF,      /* Avatar pixbuf */
-               G_TYPE_BOOLEAN,       /* Avatar pixbuf visible */
-               G_TYPE_STRING,        /* Name */
-               G_TYPE_UINT,          /* Presence type */
-               G_TYPE_STRING,        /* Status string */
-               G_TYPE_BOOLEAN,       /* Compact view */
-               EMPATHY_TYPE_CONTACT, /* Contact type */
-               G_TYPE_BOOLEAN,       /* Is group */
-               G_TYPE_BOOLEAN,       /* Is active */
-               G_TYPE_BOOLEAN,       /* Is online */
-               G_TYPE_BOOLEAN,       /* Is separator */
-               G_TYPE_BOOLEAN,       /* Can make audio calls */
-               G_TYPE_BOOLEAN,       /* Can make video calls */
-               EMPATHY_TYPE_CONTACT_LIST_FLAGS, /* Flags */
-               G_TYPE_BOOLEAN,       /* Is a fake group */
-       };
-
-       priv = GET_PRIV (store);
-
-       gtk_tree_store_set_column_types (GTK_TREE_STORE (store),
-                                        EMPATHY_CONTACT_LIST_STORE_COL_COUNT,
-                                        types);
-
-       /* Set up sorting */
-       gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (store),
-                                        EMPATHY_CONTACT_LIST_STORE_COL_NAME,
-                                        contact_list_store_name_sort_func,
-                                        store, NULL);
-       gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (store),
-                                        EMPATHY_CONTACT_LIST_STORE_COL_STATUS,
-                                        contact_list_store_state_sort_func,
-                                        store, NULL);
-
-       priv->sort_criterium = EMPATHY_CONTACT_LIST_STORE_SORT_NAME;
-       empathy_contact_list_store_set_sort_criterium (store, priv->sort_criterium);
-}
-
-static gboolean
-contact_list_store_inibit_active_cb (EmpathyContactListStore *store)
-{
-       EmpathyContactListStorePriv *priv;
-
-       priv = GET_PRIV (store);
-
-       priv->show_active = TRUE;
-       priv->inhibit_active = 0;
-
-       return FALSE;
-}
-
-static void
-contact_list_store_add_contact_and_connect (EmpathyContactListStore *store, EmpathyContact *contact)
-{
-       g_signal_connect (contact, "notify::presence",
-                         G_CALLBACK (contact_list_store_contact_updated_cb),
-                         store);
-       g_signal_connect (contact, "notify::presence-message",
-                         G_CALLBACK (contact_list_store_contact_updated_cb),
-                         store);
-       g_signal_connect (contact, "notify::name",
-                         G_CALLBACK (contact_list_store_contact_updated_cb),
-                         store);
-       g_signal_connect (contact, "notify::avatar",
-                         G_CALLBACK (contact_list_store_contact_updated_cb),
-                         store);
-       g_signal_connect (contact, "notify::capabilities",
-                         G_CALLBACK (contact_list_store_contact_updated_cb),
-                         store);
-
-       contact_list_store_add_contact (store, contact);
-}
-
-static void
-contact_list_store_remove_contact_and_disconnect (EmpathyContactListStore *store, EmpathyContact *contact)
-{
-       g_signal_handlers_disconnect_by_func (contact,
-                                             G_CALLBACK (contact_list_store_contact_updated_cb),
-                                             store);
-
-       contact_list_store_remove_contact (store, contact);
-}
-
-static void
-contact_list_store_members_changed_cb (EmpathyContactList      *list_iface,
-                                      EmpathyContact          *contact,
-                                      EmpathyContact          *actor,
-                                      guint                    reason,
-                                      gchar                   *message,
-                                      gboolean                 is_member,
-                                      EmpathyContactListStore *store)
-{
-       DEBUG ("Contact %s (%d) %s",
-               empathy_contact_get_id (contact),
-               empathy_contact_get_handle (contact),
-               is_member ? "added" : "removed");
-
-       if (is_member) {
-               contact_list_store_add_contact_and_connect (store, contact);
-       } else {
-               contact_list_store_remove_contact_and_disconnect (store, contact);
-       }
-}
-
-static void
-contact_list_store_member_renamed_cb (EmpathyContactList      *list_iface,
-                                     EmpathyContact          *old_contact,
-                                     EmpathyContact          *new_contact,
-                                     guint                    reason,
-                                     gchar                   *message,
-                                     EmpathyContactListStore *store)
-{
-       DEBUG ("Contact %s (%d) renamed to %s (%d)",
-               empathy_contact_get_id (old_contact),
-               empathy_contact_get_handle (old_contact),
-               empathy_contact_get_id (new_contact),
-               empathy_contact_get_handle (new_contact));
-
-       /* add the new contact */
-       contact_list_store_add_contact_and_connect (store, new_contact);
-
-       /* remove old contact */
-       contact_list_store_remove_contact_and_disconnect (store, old_contact);
-}
-
-static void
-contact_list_store_groups_changed_cb (EmpathyContactList      *list_iface,
-                                     EmpathyContact          *contact,
-                                     gchar                   *group,
-                                     gboolean                 is_member,
-                                     EmpathyContactListStore *store)
-{
-       EmpathyContactListStorePriv *priv;
-       gboolean                     show_active;
-
-       priv = GET_PRIV (store);
-
-       DEBUG ("Updating groups for contact %s (%d)",
-               empathy_contact_get_id (contact),
-               empathy_contact_get_handle (contact));
-
-       /* We do this to make sure the groups are correct, if not, we
-        * would have to check the groups already set up for each
-        * contact and then see what has been updated.
-        */
-       show_active = priv->show_active;
-       priv->show_active = FALSE;
-       contact_list_store_remove_contact (store, contact);
-       contact_list_store_add_contact (store, contact);
-       priv->show_active = show_active;
-}
-
-static void
-add_contact_to_store (GtkTreeStore *store,
-                     GtkTreeIter *iter,
-                     GtkTreeIter *parent,
-                     EmpathyContact *contact,
-                     EmpathyContactListFlags flags)
-{
-       EmpathyContactListStorePriv *priv = GET_PRIV (store);
-       GQueue *queue;
-
-       gtk_tree_store_insert_with_values (store, iter, parent, 0,
-                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, empathy_contact_get_alias (contact),
-                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, contact,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, FALSE,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, FALSE,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CAN_AUDIO_CALL,
-                             empathy_contact_get_capabilities (contact) &
-                               EMPATHY_CAPABILITIES_AUDIO,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CAN_VIDEO_CALL,
-                             empathy_contact_get_capabilities (contact) &
-                               EMPATHY_CAPABILITIES_VIDEO,
-                           EMPATHY_CONTACT_LIST_STORE_COL_FLAGS, flags,
-                           -1);
-
-       queue = g_hash_table_lookup (priv->empathy_contact_cache, contact);
-       if (queue) {
-               g_queue_push_tail (queue, gtk_tree_iter_copy (iter));
-       } else {
-               queue = g_queue_new ();
-               g_queue_push_tail (queue, gtk_tree_iter_copy (iter));
-               g_hash_table_insert (priv->empathy_contact_cache, contact,
-                       queue);
-       }
-}
-
-static void
-contact_list_store_add_contact (EmpathyContactListStore *store,
-                               EmpathyContact          *contact)
-{
-       EmpathyContactListStorePriv *priv;
-       GtkTreeIter                 iter;
-       GList                      *groups = NULL, *l;
-       TpConnection               *connection;
-       EmpathyContactListFlags     flags = 0;
-       char                       *protocol_name;
-
-       priv = GET_PRIV (store);
-
-       if (EMP_STR_EMPTY (empathy_contact_get_alias (contact)) ||
-           (!priv->show_offline && !empathy_contact_is_online (contact))) {
-               return;
-       }
-
-       if (priv->show_groups) {
-               groups = empathy_contact_list_get_groups (priv->list, contact);
-       }
-
-       connection = empathy_contact_get_connection (contact);
-       if (EMPATHY_IS_CONTACT_MANAGER (priv->list)) {
-               flags = empathy_contact_manager_get_flags_for_connection (
-                       EMPATHY_CONTACT_MANAGER (priv->list), connection);
-       }
-
-       tp_connection_parse_object_path (connection, &protocol_name, NULL);
-
-       if (!groups) {
-               GtkTreeIter iter_group, *parent;
-
-               parent = &iter_group;
-
-               if (!priv->show_groups) {
-                       parent = NULL;
-               }
-
-               add_contact_to_store (GTK_TREE_STORE (store), &iter, parent,
-                                     contact, flags);
-       }
-
-       g_free (protocol_name);
-
-       /* Else add to each group. */
-       for (l = groups; l; l = l->next) {
-               GtkTreeIter iter_group;
-
-               contact_list_store_get_group (store, l->data, &iter_group, NULL, NULL, FALSE);
-
-               add_contact_to_store (GTK_TREE_STORE (store), &iter, &iter_group, contact, flags);
-               g_free (l->data);
-       }
-       g_list_free (groups);
-
-       contact_list_store_contact_update (store, contact);
-}
-
-static void
-contact_list_store_remove_contact (EmpathyContactListStore *store,
-                                  EmpathyContact          *contact)
-{
-       EmpathyContactListStorePriv *priv = GET_PRIV (store);
-       GtkTreeModel               *model;
-       GList                      *l;
-       GQueue                     *row_refs;
-
-       row_refs = g_hash_table_lookup (priv->empathy_contact_cache, contact);
-       if (!row_refs) {
-               return;
-       }
-
-       /* Clean up model */
-       model = GTK_TREE_MODEL (store);
-
-       for (l = g_queue_peek_head_link (row_refs); l; l = l->next) {
-               GtkTreeIter *iter = l->data;
-               GtkTreeIter parent;
-
-               /* NOTE: it is only <= 2 here because we have
-                * separators after the group name, otherwise it
-                * should be 1.
-                */
-               if (gtk_tree_model_iter_parent (model, &parent, iter) &&
-                   gtk_tree_model_iter_n_children (model, &parent) <= 2) {
-                       gchar *group_name;
-                       gtk_tree_model_get (model, &parent,
-                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, &group_name,
-                           -1);
-                       g_hash_table_remove (priv->empathy_group_cache,
-                               group_name);
-                       gtk_tree_store_remove (GTK_TREE_STORE (store), &parent);
-               } else {
-                       gtk_tree_store_remove (GTK_TREE_STORE (store), iter);
-               }
-       }
-
-       g_hash_table_remove (priv->empathy_contact_cache, contact);
-}
-
-static void
-contact_list_store_contact_update (EmpathyContactListStore *store,
-                                  EmpathyContact          *contact)
-{
-       EmpathyContactListStorePriv *priv;
-       ShowActiveData             *data;
-       GtkTreeModel               *model;
-       GList                      *iters, *l;
-       gboolean                    in_list;
-       gboolean                    should_be_in_list;
-       gboolean                    was_online = TRUE;
-       gboolean                    now_online = FALSE;
-       gboolean                    set_model = FALSE;
-       gboolean                    do_remove = FALSE;
-       gboolean                    do_set_active = FALSE;
-       gboolean                    do_set_refresh = FALSE;
-       gboolean                    show_avatar = FALSE;
-       GdkPixbuf                  *pixbuf_avatar;
-       GdkPixbuf                  *pixbuf_status;
-
-       priv = GET_PRIV (store);
-
-       model = GTK_TREE_MODEL (store);
-
-       iters = contact_list_store_find_contact (store, contact);
-       if (!iters) {
-               in_list = FALSE;
-       } else {
-               in_list = TRUE;
-       }
-
-       /* Get online state now. */
-       now_online = empathy_contact_is_online (contact);
-
-       if (priv->show_offline || now_online) {
-               should_be_in_list = TRUE;
-       } else {
-               should_be_in_list = FALSE;
-       }
-
-       if (!in_list && !should_be_in_list) {
-               /* Nothing to do. */
-               DEBUG ("Contact:'%s' in list:NO, should be:NO",
-                       empathy_contact_get_alias (contact));
-
-               g_list_foreach (iters, (GFunc) gtk_tree_iter_free, NULL);
-               g_list_free (iters);
-               return;
-       }
-       else if (in_list && !should_be_in_list) {
-               DEBUG ("Contact:'%s' in list:YES, should be:NO",
-                       empathy_contact_get_alias (contact));
-
-               if (priv->show_active) {
-                       do_remove = TRUE;
-                       do_set_active = TRUE;
-                       do_set_refresh = TRUE;
-
-                       set_model = TRUE;
-                       DEBUG ("Remove item (after timeout)");
-               } else {
-                       DEBUG ("Remove item (now)!");
-                       contact_list_store_remove_contact (store, contact);
-               }
-       }
-       else if (!in_list && should_be_in_list) {
-               DEBUG ("Contact:'%s' in list:NO, should be:YES",
-                       empathy_contact_get_alias (contact));
-
-               contact_list_store_add_contact (store, contact);
-
-               if (priv->show_active) {
-                       do_set_active = TRUE;
-
-                       DEBUG ("Set active (contact added)");
-               }
-       } else {
-               DEBUG ("Contact:'%s' in list:YES, should be:YES",
-                       empathy_contact_get_alias (contact));
-
-               /* Get online state before. */
-               if (iters && g_list_length (iters) > 0) {
-                       gtk_tree_model_get (model, iters->data,
-                                           EMPATHY_CONTACT_LIST_STORE_COL_IS_ONLINE, &was_online,
-                                           -1);
-               }
-
-               /* Is this really an update or an online/offline. */
-               if (priv->show_active) {
-                       if (was_online != now_online) {
-                               do_set_active = TRUE;
-                               do_set_refresh = TRUE;
-
-                               DEBUG ("Set active (contact updated %s)",
-                                       was_online ? "online  -> offline" :
-                                       "offline -> online");
-                       } else {
-                               /* Was TRUE for presence updates. */
-                               /* do_set_active = FALSE;  */
-                               do_set_refresh = TRUE;
-
-                               DEBUG ("Set active (contact updated)");
-                       }
-               }
-
-               set_model = TRUE;
-       }
-
-       if (priv->show_avatars && !priv->is_compact) {
-               show_avatar = TRUE;
-       }
-       pixbuf_avatar = empathy_pixbuf_avatar_from_contact_scaled (contact, 32, 32);
-       pixbuf_status = contact_list_store_get_contact_status_icon (store, contact);
-       for (l = iters; l && set_model; l = l->next) {
-               gtk_tree_store_set (GTK_TREE_STORE (store), l->data,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS, pixbuf_status,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR, pixbuf_avatar,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR_VISIBLE, show_avatar,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_NAME, empathy_contact_get_alias (contact),
-                                   EMPATHY_CONTACT_LIST_STORE_COL_PRESENCE_TYPE,
-                                     empathy_contact_get_presence (contact),
-                                   EMPATHY_CONTACT_LIST_STORE_COL_STATUS,
-                                     empathy_contact_get_presence_message (contact),
-                                   EMPATHY_CONTACT_LIST_STORE_COL_COMPACT, priv->is_compact,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, FALSE,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_ONLINE, now_online,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, FALSE,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_CAN_AUDIO_CALL,
-                                     empathy_contact_get_capabilities (contact) &
-                                       EMPATHY_CAPABILITIES_AUDIO,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_CAN_VIDEO_CALL,
-                                     empathy_contact_get_capabilities (contact) &
-                                       EMPATHY_CAPABILITIES_VIDEO,
-                                   -1);
-       }
-
-       if (pixbuf_avatar) {
-               g_object_unref (pixbuf_avatar);
-       }
-
-       if (priv->show_active && do_set_active) {
-               contact_list_store_contact_set_active (store, contact, do_set_active, do_set_refresh);
-
-               if (do_set_active) {
-                       data = contact_list_store_contact_active_new (store, contact, do_remove);
-                       data->timeout = g_timeout_add_seconds (ACTIVE_USER_SHOW_TIME,
-                                              (GSourceFunc) contact_list_store_contact_active_cb,
-                                              data);
-               }
-       }
-
-       /* FIXME: when someone goes online then offline quickly, the
-        * first timeout sets the user to be inactive and the second
-        * timeout removes the user from the contact list, really we
-        * should remove the first timeout.
-        */
-       g_list_foreach (iters, (GFunc) gtk_tree_iter_free, NULL);
-       g_list_free (iters);
-}
-
-static void
-contact_list_store_contact_updated_cb (EmpathyContact          *contact,
-                                      GParamSpec              *param,
-                                      EmpathyContactListStore *store)
-{
-       DEBUG ("Contact:'%s' updated, checking roster is in sync...",
-               empathy_contact_get_alias (contact));
-
-       contact_list_store_contact_update (store, contact);
-}
-
-static void
-contact_list_store_contact_set_active (EmpathyContactListStore *store,
-                                      EmpathyContact          *contact,
-                                      gboolean                active,
-                                      gboolean                set_changed)
-{
-       GtkTreeModel               *model;
-       GList                      *iters, *l;
-
-       model = GTK_TREE_MODEL (store);
-
-       iters = contact_list_store_find_contact (store, contact);
-       for (l = iters; l; l = l->next) {
-               GtkTreePath *path;
-
-               gtk_tree_store_set (GTK_TREE_STORE (store), l->data,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_ACTIVE, active,
-                                   -1);
-
-               DEBUG ("Set item %s", active ? "active" : "inactive");
-
-               if (set_changed) {
-                       path = gtk_tree_model_get_path (model, l->data);
-                       gtk_tree_model_row_changed (model, path, l->data);
-                       gtk_tree_path_free (path);
-               }
-       }
-
-       g_list_foreach (iters, (GFunc) gtk_tree_iter_free, NULL);
-       g_list_free (iters);
-
-}
-
-static void
-store_contact_active_invalidated (ShowActiveData *data,
-       GObject *old_object)
-{
-       /* Remove the timeout and free the struct, since the contact or contact
-        * store has disappeared. */
-       g_source_remove (data->timeout);
-
-        if (old_object == (GObject *) data->store)
-               data->store = NULL;
-        else if (old_object == (GObject *) data->contact)
-               data->contact = NULL;
-        else
-               g_assert_not_reached ();
-
-       contact_list_store_contact_active_free (data);
-}
-
-static ShowActiveData *
-contact_list_store_contact_active_new (EmpathyContactListStore *store,
-                                      EmpathyContact          *contact,
-                                      gboolean                remove_)
-{
-       ShowActiveData *data;
-
-       DEBUG ("Contact:'%s' now active, and %s be removed",
-               empathy_contact_get_alias (contact),
-               remove_ ? "WILL" : "WILL NOT");
-
-       data = g_slice_new0 (ShowActiveData);
-
-       /* We don't actually want to force either the IndividualStore or the
-        * Individual to stay alive, since the user could quit Empathy or disable
-        * the account before the contact_active timeout is fired. */
-       g_object_weak_ref (G_OBJECT (store),
-               (GWeakNotify) store_contact_active_invalidated, data);
-       g_object_weak_ref (G_OBJECT (contact),
-               (GWeakNotify) store_contact_active_invalidated, data);
-
-       data->store = store;
-       data->contact = contact;
-       data->remove = remove_;
-       data->timeout = 0;
-
-       return data;
-}
-
-static void
-contact_list_store_contact_active_free (ShowActiveData *data)
-{
-       if (data->store != NULL)
-               g_object_weak_unref (G_OBJECT (data->store),
-                       (GWeakNotify) store_contact_active_invalidated, data);
-
-       if (data->contact != NULL)
-               g_object_weak_unref (G_OBJECT (data->contact),
-                       (GWeakNotify) store_contact_active_invalidated, data);
-
-       g_slice_free (ShowActiveData, data);
-}
-
-static gboolean
-contact_list_store_contact_active_cb (ShowActiveData *data)
-{
-       EmpathyContactListStorePriv *priv;
-
-       priv = GET_PRIV (data->store);
-
-       if (data->remove &&
-           !priv->show_offline &&
-           !empathy_contact_is_online (data->contact)) {
-               DEBUG ("Contact:'%s' active timeout, removing item",
-                       empathy_contact_get_alias (data->contact));
-               contact_list_store_remove_contact (data->store, data->contact);
-       }
-
-       DEBUG ("Contact:'%s' no longer active",
-               empathy_contact_get_alias (data->contact));
-
-       contact_list_store_contact_set_active (data->store,
-                                              data->contact,
-                                              FALSE,
-                                              TRUE);
-
-       contact_list_store_contact_active_free (data);
-
-       return FALSE;
-}
-
-static void
-contact_list_store_get_group (EmpathyContactListStore *store,
-                             const gchar            *name,
-                             GtkTreeIter            *iter_group_to_set,
-                             GtkTreeIter            *iter_separator_to_set,
-                             gboolean               *created,
-                             gboolean               is_fake_group)
-{
-       EmpathyContactListStorePriv *priv = GET_PRIV (store);
-       GtkTreeModel                *model;
-       GtkTreeIter                  iter_group;
-       GtkTreeIter                  iter_separator;
-       GtkTreeIter                 *iter;
-
-       model = GTK_TREE_MODEL (store);
-       iter = g_hash_table_lookup (priv->empathy_group_cache, name);
-
-       if (iter == NULL) {
-               if (created) {
-                       *created = TRUE;
-               }
-
-               gtk_tree_store_insert_with_values (GTK_TREE_STORE (store), &iter_group, NULL, 0,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS, NULL,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_NAME, name,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, TRUE,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_ACTIVE, FALSE,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, FALSE,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, is_fake_group,
-                                   -1);
-
-               g_hash_table_insert (priv->empathy_group_cache,
-                       g_strdup (name), gtk_tree_iter_copy (&iter_group));
-
-               if (iter_group_to_set) {
-                       *iter_group_to_set = iter_group;
-               }
-
-               gtk_tree_store_insert_with_values (GTK_TREE_STORE (store), &iter_separator, &iter_group, 0,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, TRUE,
-                                   -1);
-
-               if (iter_separator_to_set) {
-                       *iter_separator_to_set = iter_separator;
-               }
-       } else {
-               if (created) {
-                       *created = FALSE;
-               }
-
-               if (iter_group_to_set) {
-                       *iter_group_to_set = *iter;
-               }
-
-               iter_separator = *iter;
-
-               if (gtk_tree_model_iter_next (model, &iter_separator)) {
-                       gboolean is_separator;
-
-                       gtk_tree_model_get (model, &iter_separator,
-                                           EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator,
-                                           -1);
-
-                       if (is_separator && iter_separator_to_set) {
-                               *iter_separator_to_set = iter_separator;
-                       }
-               }
-       }
-}
-
-static gint
-compare_separator_and_groups (gboolean is_separator_a,
-                             gboolean is_separator_b,
-                             const gchar *name_a,
-                             const gchar *name_b,
-                             EmpathyContact *contact_a,
-                             EmpathyContact *contact_b,
-                             gboolean fake_group_a,
-                             gboolean fake_group_b)
-{
-       if (is_separator_a || is_separator_b) {
-               /* We have at least one separator */
-               if (is_separator_a) {
-                       return -1;
-               } else if (is_separator_b) {
-                       return 1;
-               }
-       }
-
-       /* One group and one contact */
-       if (!contact_a && contact_b) {
-               return 1;
-       } else if (contact_a && !contact_b) {
-               return -1;
-       } else if (!contact_a && !contact_b) {
-               return g_utf8_collate (name_a, name_b);
-       }
-
-       /* Two contacts, ordering depends of the sorting policy */
-       return 0;
-}
-
-static gint
-contact_list_store_contact_sort (EmpathyContact *contact_a,
-                                EmpathyContact *contact_b)
-{
-       TpAccount *account_a, *account_b;
-       gint ret_val;
-
-       g_return_val_if_fail (contact_a != NULL || contact_b != NULL, 0);
-
-       /* alias */
-       ret_val = g_utf8_collate (empathy_contact_get_alias (contact_a),
-                                 empathy_contact_get_alias (contact_b));
-
-       if (ret_val != 0)
-               goto out;
-
-       /* identifier */
-       ret_val = g_utf8_collate (empathy_contact_get_id (contact_a),
-                                 empathy_contact_get_id (contact_b));
-
-       if (ret_val != 0)
-               goto out;
-
-       account_a = empathy_contact_get_account (contact_a);
-       account_b = empathy_contact_get_account (contact_b);
-
-       /* protocol */
-       ret_val = strcmp (tp_account_get_protocol (account_a),
-                         tp_account_get_protocol (account_b));
-
-       if (ret_val != 0)
-               goto out;
-
-       /* account ID */
-       ret_val = strcmp (tp_proxy_get_object_path (account_a),
-                         tp_proxy_get_object_path (account_b));
-
-out:
-       return ret_val;
-}
-
-static gint
-contact_list_store_state_sort_func (GtkTreeModel *model,
-                                   GtkTreeIter  *iter_a,
-                                   GtkTreeIter  *iter_b,
-                                   gpointer      user_data)
-{
-       gint            ret_val;
-       gchar          *name_a, *name_b;
-       gboolean        is_separator_a, is_separator_b;
-       EmpathyContact *contact_a, *contact_b;
-       gboolean       fake_group_a, fake_group_b;
-
-       gtk_tree_model_get (model, iter_a,
-                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name_a,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact_a,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator_a,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, &fake_group_a,
-                           -1);
-       gtk_tree_model_get (model, iter_b,
-                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name_b,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact_b,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator_b,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, &fake_group_b,
-                           -1);
-
-       if (contact_a == NULL || contact_b == NULL) {
-               ret_val = compare_separator_and_groups (is_separator_a, is_separator_b,
-                       name_a, name_b, contact_a, contact_b, fake_group_a, fake_group_b);
-               goto free_and_out;
-       }
-
-       /* If we managed to get this far, we can start looking at
-        * the presences.
-        */
-       ret_val = -tp_connection_presence_type_cmp_availability (
-               empathy_contact_get_presence (EMPATHY_CONTACT (contact_a)),
-               empathy_contact_get_presence (EMPATHY_CONTACT (contact_b)));
-
-       if (ret_val == 0) {
-               /* Fallback: compare by name et al. */
-               ret_val = contact_list_store_contact_sort (contact_a, contact_b);
-       }
-
-free_and_out:
-       g_free (name_a);
-       g_free (name_b);
-
-       if (contact_a) {
-               g_object_unref (contact_a);
-       }
-
-       if (contact_b) {
-               g_object_unref (contact_b);
-       }
-
-       return ret_val;
-}
-
-static gint
-contact_list_store_name_sort_func (GtkTreeModel *model,
-                                  GtkTreeIter  *iter_a,
-                                  GtkTreeIter  *iter_b,
-                                  gpointer      user_data)
-{
-       gchar         *name_a, *name_b;
-       EmpathyContact *contact_a, *contact_b;
-       gboolean       is_separator_a = FALSE, is_separator_b = FALSE;
-       gint           ret_val;
-       gboolean       fake_group_a, fake_group_b;
-
-       gtk_tree_model_get (model, iter_a,
-                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name_a,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact_a,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator_a,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, &fake_group_a,
-                           -1);
-       gtk_tree_model_get (model, iter_b,
-                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name_b,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact_b,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator_b,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, &fake_group_b,
-                           -1);
-
-       if (contact_a == NULL || contact_b == NULL)
-               ret_val = compare_separator_and_groups (is_separator_a, is_separator_b,
-                       name_a, name_b, contact_a, contact_b, fake_group_a, fake_group_b);
-       else
-               ret_val = contact_list_store_contact_sort (contact_a, contact_b);
-
-       if (contact_a) {
-               g_object_unref (contact_a);
-       }
-
-       if (contact_b) {
-               g_object_unref (contact_b);
-       }
-
-       return ret_val;
-}
-
-static GList *
-contact_list_store_find_contact (EmpathyContactListStore *store,
-                                EmpathyContact          *contact)
-{
-       EmpathyContactListStorePriv *priv = GET_PRIV (store);
-       GQueue                    *row_refs_queue;
-       GList                     *i;
-       GList                     *iters_list = NULL;
-
-       row_refs_queue = g_hash_table_lookup (priv->empathy_contact_cache, contact);
-       if (!row_refs_queue)
-               return NULL;
-
-       for (i = g_queue_peek_head_link (row_refs_queue) ; i != NULL ;
-            i = i->next) {
-               GtkTreeIter *iter = i->data;
-
-               iters_list = g_list_prepend
-                       (iters_list, gtk_tree_iter_copy (iter));
-       }
-
-       return iters_list;
-}
-
-static gboolean
-contact_list_store_update_list_mode_foreach (GtkTreeModel           *model,
-                                            GtkTreePath            *path,
-                                            GtkTreeIter            *iter,
-                                            EmpathyContactListStore *store)
-{
-       EmpathyContactListStorePriv *priv;
-       gboolean                     show_avatar = FALSE;
-       EmpathyContact              *contact;
-       GdkPixbuf                   *pixbuf_status;
-
-       priv = GET_PRIV (store);
-
-       if (priv->show_avatars && !priv->is_compact) {
-               show_avatar = TRUE;
-       }
-
-       gtk_tree_model_get (model, iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
-                           -1);
-
-       if (contact == NULL){
-               return FALSE;
-       }
-       /* get icon from hash_table */
-       pixbuf_status = contact_list_store_get_contact_status_icon (store, contact);
-
-       gtk_tree_store_set (GTK_TREE_STORE (store), iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS, pixbuf_status,
-                           EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR_VISIBLE, show_avatar,
-                           EMPATHY_CONTACT_LIST_STORE_COL_COMPACT, priv->is_compact,
-                           -1);
-
-       return FALSE;
-}
-
-static GdkPixbuf *
-contact_list_store_get_contact_status_icon_with_icon_name (
-                                       EmpathyContactListStore *store,
-                                       EmpathyContact *contact,
-                                       const gchar *status_icon_name)
-{
-       GdkPixbuf                   *pixbuf_status = NULL;
-       EmpathyContactListStorePriv *priv;
-       const gchar                 *protocol_name = NULL;
-       gchar                       *icon_name = NULL;
-
-       priv = GET_PRIV (store);
-
-       if (priv->show_protocols) {
-               protocol_name = empathy_protocol_name_for_contact (contact);
-               icon_name = g_strdup_printf ("%s-%s", status_icon_name, protocol_name);
-       } else {
-               icon_name = g_strdup_printf ("%s", status_icon_name);
-       }
-       pixbuf_status = g_hash_table_lookup (priv->status_icons, icon_name);
-       if (pixbuf_status == NULL) {
-               pixbuf_status = empathy_pixbuf_contact_status_icon_with_icon_name (contact,
-                                   status_icon_name,
-                                   priv->show_protocols);
-               if (pixbuf_status != NULL) {
-                       g_hash_table_insert (priv->status_icons,
-                           g_strdup (icon_name),
-                           pixbuf_status);
-               }
-       }
-
-       g_free (icon_name);
-       return pixbuf_status;
-}
-
-GdkPixbuf *
-contact_list_store_get_contact_status_icon (EmpathyContactListStore *store,
-                                           EmpathyContact *contact)
-{
-       GdkPixbuf                   *pixbuf_status = NULL;
-       EmpathyContactListStorePriv *priv;
-       const gchar                 *status_icon_name = NULL;
-       gboolean                     composing = FALSE;
-
-       priv = GET_PRIV (store);
-
-       if (EMPATHY_IS_TP_CHAT (priv->list)) {
-               if (empathy_tp_chat_get_chat_state (EMPATHY_TP_CHAT (priv->list),
-                     contact) ==
-                       TP_CHANNEL_CHAT_STATE_COMPOSING)
-               composing = TRUE;
-       }
-
-       if (composing) {
-               status_icon_name = EMPATHY_IMAGE_TYPING;
-       } else {
-               status_icon_name = empathy_icon_name_for_contact (contact);
-       }
-
-       if (status_icon_name == NULL)
-               return NULL;
-
-       pixbuf_status = contact_list_store_get_contact_status_icon_with_icon_name (
-                           store,
-                           contact,
-                           status_icon_name);
-
-       return pixbuf_status;
-}
diff --git a/libempathy-gtk/empathy-contact-list-store.h b/libempathy-gtk/empathy-contact-list-store.h
deleted file mode 100644 (file)
index 8e773e6..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2005-2007 Imendio AB
- * Copyright (C) 2007-2008 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 program 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.
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- *
- * Authors: Mikael Hallendal <micke@imendio.com>
- *          Martyn Russell <martyn@imendio.com>
- *          Xavier Claessens <xclaesse@gmail.com>
- */
-
-#ifndef __EMPATHY_CONTACT_LIST_STORE_H__
-#define __EMPATHY_CONTACT_LIST_STORE_H__
-
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-contact-list.h>
-#include <libempathy/empathy-contact.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_CONTACT_LIST_STORE         (empathy_contact_list_store_get_type ())
-#define EMPATHY_CONTACT_LIST_STORE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_CONTACT_LIST_STORE, EmpathyContactListStore))
-#define EMPATHY_CONTACT_LIST_STORE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_CONTACT_LIST_STORE, EmpathyContactListStoreClass))
-#define EMPATHY_IS_CONTACT_LIST_STORE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_CONTACT_LIST_STORE))
-#define EMPATHY_IS_CONTACT_LIST_STORE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_CONTACT_LIST_STORE))
-#define EMPATHY_CONTACT_LIST_STORE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_CONTACT_LIST_STORE, EmpathyContactListStoreClass))
-
-typedef struct _EmpathyContactListStore      EmpathyContactListStore;
-typedef struct _EmpathyContactListStoreClass EmpathyContactListStoreClass;
-
-typedef enum {
-       EMPATHY_CONTACT_LIST_STORE_SORT_STATE,
-       EMPATHY_CONTACT_LIST_STORE_SORT_NAME
-} EmpathyContactListStoreSort;
-
-typedef enum {
-       EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS,
-       EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR,
-       EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR_VISIBLE,
-       EMPATHY_CONTACT_LIST_STORE_COL_NAME,
-       EMPATHY_CONTACT_LIST_STORE_COL_PRESENCE_TYPE,
-       EMPATHY_CONTACT_LIST_STORE_COL_STATUS,
-       EMPATHY_CONTACT_LIST_STORE_COL_COMPACT,
-       EMPATHY_CONTACT_LIST_STORE_COL_CONTACT,
-       EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP,
-       EMPATHY_CONTACT_LIST_STORE_COL_IS_ACTIVE,
-       EMPATHY_CONTACT_LIST_STORE_COL_IS_ONLINE,
-       EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR,
-       EMPATHY_CONTACT_LIST_STORE_COL_CAN_AUDIO_CALL,
-       EMPATHY_CONTACT_LIST_STORE_COL_CAN_VIDEO_CALL,
-       EMPATHY_CONTACT_LIST_STORE_COL_FLAGS,
-       EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP,
-       EMPATHY_CONTACT_LIST_STORE_COL_COUNT,
-} EmpathyContactListStoreCol;
-
-struct _EmpathyContactListStore {
-       GtkTreeStore parent;
-       gpointer priv;
-};
-
-struct _EmpathyContactListStoreClass {
-       GtkTreeStoreClass parent_class;
-};
-
-GType                      empathy_contact_list_store_get_type           (void) G_GNUC_CONST;
-EmpathyContactListStore *  empathy_contact_list_store_new                (EmpathyContactList         *list_iface);
-EmpathyContactList *       empathy_contact_list_store_get_list_iface     (EmpathyContactListStore     *store);
-gboolean                   empathy_contact_list_store_get_show_offline   (EmpathyContactListStore     *store);
-void                       empathy_contact_list_store_set_show_offline   (EmpathyContactListStore     *store,
-                                                                        gboolean                    show_offline);
-gboolean                   empathy_contact_list_store_get_show_avatars   (EmpathyContactListStore     *store);
-void                       empathy_contact_list_store_set_show_avatars   (EmpathyContactListStore     *store,
-                                                                        gboolean                    show_avatars);
-gboolean                   empathy_contact_list_store_get_show_groups   (EmpathyContactListStore     *store);
-void                       empathy_contact_list_store_set_show_groups   (EmpathyContactListStore     *store,
-                                                                        gboolean                    show_groups);
-gboolean                   empathy_contact_list_store_get_is_compact     (EmpathyContactListStore     *store);
-void                       empathy_contact_list_store_set_is_compact     (EmpathyContactListStore     *store,
-                                                                        gboolean                    is_compact);
-gboolean                   empathy_contact_list_store_get_show_protocols   (EmpathyContactListStore     *store);
-void                       empathy_contact_list_store_set_show_protocols   (EmpathyContactListStore     *store,
-                                                                        gboolean                    show_protocols);
-EmpathyContactListStoreSort empathy_contact_list_store_get_sort_criterium (EmpathyContactListStore     *store);
-void                       empathy_contact_list_store_set_sort_criterium (EmpathyContactListStore     *store,
-                                                                        EmpathyContactListStoreSort  sort_criterium);
-gboolean                   empathy_contact_list_store_row_separator_func (GtkTreeModel               *model,
-                                                                        GtkTreeIter                *iter,
-                                                                        gpointer                    data);
-gchar *                    empathy_contact_list_store_get_parent_group   (GtkTreeModel               *model,
-                                                                        GtkTreePath                *path,
-                                                                        gboolean                   *path_is_group,
-                                                                        gboolean                   *is_fake_group);
-GdkPixbuf *                contact_list_store_get_contact_status_icon ( EmpathyContactListStore *store,
-                                                                        EmpathyContact             *contact);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_CONTACT_LIST_STORE_H__ */
-
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
deleted file mode 100644 (file)
index 1d95baf..0000000
+++ /dev/null
@@ -1,2134 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2005-2007 Imendio AB
- * Copyright (C) 2007-2008 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 program 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.
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- *
- * Authors: Mikael Hallendal <micke@imendio.com>
- *          Martyn Russell <martyn@imendio.com>
- *          Xavier Claessens <xclaesse@gmail.com>
- */
-
-#include "config.h"
-
-#include <string.h>
-
-#include <glib/gi18n-lib.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-
-#include <libempathy/empathy-client-factory.h>
-#include <libempathy/empathy-tp-contact-factory.h>
-#include <libempathy/empathy-contact-list.h>
-#include <libempathy/empathy-contact-groups.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-contact-list-view.h"
-#include "empathy-contact-list-store.h"
-#include "empathy-images.h"
-#include "empathy-cell-renderer-expander.h"
-#include "empathy-cell-renderer-text.h"
-#include "empathy-cell-renderer-activatable.h"
-#include "empathy-ui-utils.h"
-#include "empathy-gtk-enum-types.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
-
-/* Active users are those which have recently changed state
- * (e.g. online, offline or from normal to a busy state).
- */
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyContactListView)
-typedef struct {
-       EmpathyContactListStore        *store;
-       GtkTreeRowReference            *drag_row;
-       EmpathyContactListFeatureFlags  list_features;
-       EmpathyContactFeatureFlags      contact_features;
-       GtkWidget                      *tooltip_widget;
-       GtkTargetList                  *file_targets;
-
-       GtkTreeModelFilter             *filter;
-       GtkWidget                      *search_widget;
-} EmpathyContactListViewPriv;
-
-typedef struct {
-       EmpathyContactListView *view;
-       GtkTreePath           *path;
-       guint                  timeout_id;
-} DragMotionData;
-
-typedef struct {
-       EmpathyContactListView *view;
-       EmpathyContact         *contact;
-       gboolean               remove;
-} ShowActiveData;
-
-enum {
-       PROP_0,
-       PROP_STORE,
-       PROP_LIST_FEATURES,
-       PROP_CONTACT_FEATURES,
-};
-
-enum DndDragType {
-       DND_DRAG_TYPE_CONTACT_ID,
-       DND_DRAG_TYPE_URI_LIST,
-       DND_DRAG_TYPE_STRING,
-};
-
-static const GtkTargetEntry drag_types_dest[] = {
-       { "text/path-list",  0, DND_DRAG_TYPE_URI_LIST },
-       { "text/uri-list",   0, DND_DRAG_TYPE_URI_LIST },
-       { "text/contact-id", 0, DND_DRAG_TYPE_CONTACT_ID },
-       { "text/plain",      0, DND_DRAG_TYPE_STRING },
-       { "STRING",          0, DND_DRAG_TYPE_STRING },
-};
-
-static const GtkTargetEntry drag_types_dest_file[] = {
-       { "text/path-list",  0, DND_DRAG_TYPE_URI_LIST },
-       { "text/uri-list",   0, DND_DRAG_TYPE_URI_LIST },
-};
-
-static const GtkTargetEntry drag_types_source[] = {
-       { "text/contact-id", 0, DND_DRAG_TYPE_CONTACT_ID },
-};
-
-enum {
-       DRAG_CONTACT_RECEIVED,
-       LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
-G_DEFINE_TYPE (EmpathyContactListView, empathy_contact_list_view, GTK_TYPE_TREE_VIEW);
-
-static void
-contact_list_view_tooltip_destroy_cb (GtkWidget              *widget,
-                                     EmpathyContactListView *view)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-
-       if (priv->tooltip_widget) {
-               DEBUG ("Tooltip destroyed");
-               g_object_unref (priv->tooltip_widget);
-               priv->tooltip_widget = NULL;
-       }
-}
-
-static gboolean
-contact_list_view_is_visible_contact (EmpathyContactListView *self,
-                                     EmpathyContact *contact)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (self);
-       EmpathyLiveSearch *live = EMPATHY_LIVE_SEARCH (priv->search_widget);
-       const gchar *str;
-       const gchar *p;
-       gchar *dup_str = NULL;
-       gboolean visible;
-
-       g_assert (live != NULL);
-
-       /* check alias name */
-       str = empathy_contact_get_alias (contact);
-       if (empathy_live_search_match (live, str))
-               return TRUE;
-
-       /* check contact id, remove the @server.com part */
-       str = empathy_contact_get_id (contact);
-       p = strstr (str, "@");
-       if (p != NULL)
-               str = dup_str = g_strndup (str, p - str);
-
-       visible = empathy_live_search_match (live, str);
-       g_free (dup_str);
-       if (visible)
-               return TRUE;
-
-       /* FIXME: Add more rules here, we could check phone numbers in
-        * contact's vCard for example. */
-
-       return FALSE;
-}
-
-static gboolean
-contact_list_view_filter_visible_func (GtkTreeModel *model,
-                                      GtkTreeIter  *iter,
-                                      gpointer      user_data)
-{
-       EmpathyContactListView     *self = EMPATHY_CONTACT_LIST_VIEW (user_data);
-       EmpathyContactListViewPriv *priv = GET_PRIV (self);
-       EmpathyContact             *contact = NULL;
-       gboolean                    is_group, is_separator, valid;
-       GtkTreeIter                 child_iter;
-       gboolean                    visible;
-
-       if (priv->search_widget == NULL ||
-           !gtk_widget_get_visible (priv->search_widget))
-               return TRUE;
-
-       gtk_tree_model_get (model, iter,
-               EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-               EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator,
-               EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
-               -1);
-
-       if (contact != NULL) {
-               visible = contact_list_view_is_visible_contact (self, contact);
-               g_object_unref (contact);
-               return visible;
-       }
-
-       if (is_separator) {
-               return TRUE;
-       }
-
-       /* Not a contact, not a separator, must be a group */
-       g_return_val_if_fail (is_group, FALSE);
-
-       /* only show groups which are not empty */
-       for (valid = gtk_tree_model_iter_children (model, &child_iter, iter);
-            valid; valid = gtk_tree_model_iter_next (model, &child_iter)) {
-               gtk_tree_model_get (model, &child_iter,
-                       EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
-                       -1);
-
-               if (contact == NULL)
-                       continue;
-
-               visible = contact_list_view_is_visible_contact (self, contact);
-               g_object_unref (contact);
-
-               /* show group if it has at least one visible contact in it */
-               if (visible)
-                       return TRUE;
-       }
-
-       return FALSE;
-}
-
-static gboolean
-contact_list_view_query_tooltip_cb (EmpathyContactListView *view,
-                                   gint                    x,
-                                   gint                    y,
-                                   gboolean                keyboard_mode,
-                                   GtkTooltip             *tooltip,
-                                   gpointer                user_data)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       EmpathyContact             *contact;
-       GtkTreeModel               *model;
-       GtkTreeIter                 iter;
-       GtkTreePath                *path;
-       static gint                 running = 0;
-       gboolean                    ret = FALSE;
-
-       /* Avoid an infinite loop. See GNOME bug #574377 */
-       if (running > 0) {
-               return FALSE;
-       }
-       running++;
-
-       /* Don't show the tooltip if there's already a popup menu */
-       if (gtk_menu_get_for_attach_widget (GTK_WIDGET (view)) != NULL) {
-               goto OUT;
-       }
-
-       if (!gtk_tree_view_get_tooltip_context (GTK_TREE_VIEW (view), &x, &y,
-                                               keyboard_mode,
-                                               &model, &path, &iter)) {
-               goto OUT;
-       }
-
-       gtk_tree_view_set_tooltip_row (GTK_TREE_VIEW (view), tooltip, path);
-       gtk_tree_path_free (path);
-
-       gtk_tree_model_get (model, &iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
-                           -1);
-       if (!contact) {
-               goto OUT;
-       }
-
-       if (!priv->tooltip_widget) {
-               priv->tooltip_widget = empathy_contact_widget_new (contact,
-                       EMPATHY_CONTACT_WIDGET_FOR_TOOLTIP |
-                       EMPATHY_CONTACT_WIDGET_SHOW_LOCATION);
-               gtk_container_set_border_width (
-                       GTK_CONTAINER (priv->tooltip_widget), 8);
-               g_object_ref (priv->tooltip_widget);
-               g_signal_connect (priv->tooltip_widget, "destroy",
-                                 G_CALLBACK (contact_list_view_tooltip_destroy_cb),
-                                 view);
-               gtk_widget_show (priv->tooltip_widget);
-       } else {
-               empathy_contact_widget_set_contact (priv->tooltip_widget,
-                                                   contact);
-       }
-
-       gtk_tooltip_set_custom (tooltip, priv->tooltip_widget);
-       ret = TRUE;
-
-       g_object_unref (contact);
-OUT:
-       running--;
-
-       return ret;
-}
-
-typedef struct {
-       gchar *new_group;
-       gchar *old_group;
-       GdkDragAction action;
-} DndGetContactData;
-
-static void
-contact_list_view_dnd_get_contact_free (DndGetContactData *data)
-{
-       g_free (data->new_group);
-       g_free (data->old_group);
-       g_slice_free (DndGetContactData, data);
-}
-
-static void
-contact_list_view_drag_got_contact (TpConnection            *connection,
-                                   EmpathyContact          *contact,
-                                   const GError            *error,
-                                   gpointer                 user_data,
-                                   GObject                 *view)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       DndGetContactData          *data = user_data;
-       EmpathyContactList         *list;
-
-       if (error != NULL) {
-               DEBUG ("Error: %s", error->message);
-               return;
-       }
-
-       DEBUG ("contact %s (%d) dragged from '%s' to '%s'",
-               empathy_contact_get_id (contact),
-               empathy_contact_get_handle (contact),
-               data->old_group, data->new_group);
-
-       list = empathy_contact_list_store_get_list_iface (priv->store);
-
-       if (data->new_group) {
-               empathy_contact_list_add_to_group (list, contact, data->new_group);
-       }
-       if (data->old_group && data->action == GDK_ACTION_MOVE) {
-               empathy_contact_list_remove_from_group (list, contact, data->old_group);
-       }
-}
-
-static gboolean
-contact_list_view_contact_drag_received (GtkWidget         *view,
-                                        GdkDragContext    *context,
-                                        GtkTreeModel      *model,
-                                        GtkTreePath       *path,
-                                        GtkSelectionData  *selection)
-{
-       EmpathyContactListViewPriv *priv;
-       EmpathyClientFactory       *factory;
-       TpConnection               *connection = NULL;
-       TpAccount                  *account = NULL;
-       DndGetContactData          *data;
-       GtkTreePath                *source_path;
-       const gchar   *sel_data;
-       gchar        **strv = NULL;
-       const gchar   *account_id = NULL;
-       const gchar   *contact_id = NULL;
-       gchar         *new_group = NULL;
-       gchar         *old_group = NULL;
-       gboolean       new_group_is_fake, old_group_is_fake = TRUE;
-
-       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, &new_group_is_fake);
-
-       /* Get source group information. */
-       if (priv->drag_row) {
-               source_path = gtk_tree_row_reference_get_path (priv->drag_row);
-               if (source_path) {
-                       old_group = empathy_contact_list_store_get_parent_group (
-                                                                                model, source_path, NULL, &old_group_is_fake);
-                       gtk_tree_path_free (source_path);
-               }
-       }
-
-       if (!tp_strdiff (old_group, new_group)) {
-               g_free (new_group);
-               g_free (old_group);
-               return FALSE;
-       }
-
-       factory = empathy_client_factory_dup ();
-       strv = g_strsplit (sel_data, ":", 2);
-       if (g_strv_length (strv) == 2) {
-               account_id = strv[0];
-               contact_id = strv[1];
-               account = tp_simple_client_factory_ensure_account (
-                               TP_SIMPLE_CLIENT_FACTORY (factory),
-                               account_id, NULL, NULL);
-       }
-       if (account) {
-               connection = tp_account_get_connection (account);
-       }
-
-       if (!connection) {
-               DEBUG ("Failed to get connection for account '%s'", account_id);
-               g_free (new_group);
-               g_free (old_group);
-               g_object_unref (factory);
-               return FALSE;
-       }
-
-       data = g_slice_new0 (DndGetContactData);
-       data->new_group = new_group;
-       data->old_group = old_group;
-       data->action = gdk_drag_context_get_selected_action (context);
-
-       /* FIXME: We should probably wait for the cb before calling
-        * gtk_drag_finish */
-       empathy_tp_contact_factory_get_from_id (connection, contact_id,
-                                               contact_list_view_drag_got_contact,
-                                               data, (GDestroyNotify) contact_list_view_dnd_get_contact_free,
-                                               G_OBJECT (view));
-       g_strfreev (strv);
-       g_object_unref (factory);
-
-       return TRUE;
-}
-
-static gboolean
-contact_list_view_file_drag_received (GtkWidget         *view,
-                                     GdkDragContext    *context,
-                                     GtkTreeModel      *model,
-                                     GtkTreePath       *path,
-                                     GtkSelectionData  *selection)
-{
-       GtkTreeIter     iter;
-       const gchar    *sel_data;
-       EmpathyContact *contact;
-
-       sel_data = (const gchar *) gtk_selection_data_get_data (selection);
-
-       gtk_tree_model_get_iter (model, &iter, path);
-       gtk_tree_model_get (model, &iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
-                           -1);
-       if (!contact) {
-               return FALSE;
-       }
-
-       empathy_send_file_from_uri_list (contact, sel_data);
-
-       g_object_unref (contact);
-
-       return TRUE;
-}
-
-static void
-contact_list_view_drag_data_received (GtkWidget         *view,
-                                     GdkDragContext    *context,
-                                     gint               x,
-                                     gint               y,
-                                     GtkSelectionData  *selection,
-                                     guint              info,
-                                     guint              time_)
-{
-       GtkTreeModel               *model;
-       gboolean                    is_row;
-       GtkTreeViewDropPosition     position;
-       GtkTreePath                *path;
-       gboolean                    success = TRUE;
-
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
-
-       /* Get destination group information. */
-       is_row = gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (view),
-                                                   x,
-                                                   y,
-                                                   &path,
-                                                   &position);
-       if (!is_row) {
-               success = FALSE;
-       }
-       else if (info == DND_DRAG_TYPE_CONTACT_ID || info == DND_DRAG_TYPE_STRING) {
-               success = contact_list_view_contact_drag_received (view,
-                                                                  context,
-                                                                  model,
-                                                                  path,
-                                                                  selection);
-       }
-       else if (info == DND_DRAG_TYPE_URI_LIST) {
-               success = contact_list_view_file_drag_received (view,
-                                                               context,
-                                                               model,
-                                                               path,
-                                                               selection);
-       }
-
-       gtk_tree_path_free (path);
-       gtk_drag_finish (context, success, FALSE, GDK_CURRENT_TIME);
-}
-
-static gboolean
-contact_list_view_drag_motion_cb (DragMotionData *data)
-{
-       gtk_tree_view_expand_row (GTK_TREE_VIEW (data->view),
-                                 data->path,
-                                 FALSE);
-
-       data->timeout_id = 0;
-
-       return FALSE;
-}
-
-static gboolean
-contact_list_view_drag_motion (GtkWidget      *widget,
-                              GdkDragContext *context,
-                              gint            x,
-                              gint            y,
-                              guint           time_)
-{
-       EmpathyContactListViewPriv *priv;
-       GtkTreeModel               *model;
-       GdkAtom                target;
-       GtkTreeIter            iter;
-       static DragMotionData *dm = NULL;
-       GtkTreePath           *path;
-       gboolean               is_row;
-       gboolean               is_different = FALSE;
-       gboolean               cleanup = TRUE;
-       gboolean               retval = TRUE;
-
-       priv = GET_PRIV (EMPATHY_CONTACT_LIST_VIEW (widget));
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
-
-       is_row = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget),
-                                               x,
-                                               y,
-                                               &path,
-                                               NULL,
-                                               NULL,
-                                               NULL);
-
-       cleanup &= (!dm);
-
-       if (is_row) {
-               cleanup &= (dm && gtk_tree_path_compare (dm->path, path) != 0);
-               is_different = (!dm || (dm && gtk_tree_path_compare (dm->path, path) != 0));
-       } else {
-               cleanup &= FALSE;
-       }
-
-       if (path == NULL) {
-               /* Coordinates don't point to an actual row, so make sure the pointer
-                  and highlighting don't indicate that a drag is possible.
-                */
-               gdk_drag_status (context, GDK_ACTION_DEFAULT, time_);
-               gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget), NULL, 0);
-               return FALSE;
-       }
-       target = gtk_drag_dest_find_target (widget, context, priv->file_targets);
-       gtk_tree_model_get_iter (model, &iter, path);
-
-       if (target == GDK_NONE) {
-               /* If target == GDK_NONE, then we don't have a target that can be
-                  dropped on a contact.  This means a contact drag.  If we're
-                  pointing to a group, highlight it.  Otherwise, if the contact
-                  we're pointing to is in a group, highlight that.  Otherwise,
-                  set the drag position to before the first row for a drag into
-                  the "non-group" at the top.
-                */
-               GtkTreeIter  group_iter;
-               gboolean     is_group;
-               GtkTreePath *group_path;
-               gtk_tree_model_get (model, &iter,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-                                   -1);
-               if (is_group) {
-                       group_iter = iter;
-               }
-               else {
-                       if (gtk_tree_model_iter_parent (model, &group_iter, &iter))
-                               gtk_tree_model_get (model, &group_iter,
-                                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-                                                   -1);
-               }
-               if (is_group) {
-                       gdk_drag_status (context, GDK_ACTION_MOVE, time_);
-                       group_path = gtk_tree_model_get_path (model, &group_iter);
-                       gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget),
-                                                        group_path,
-                                                        GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
-                       gtk_tree_path_free (group_path);
-               }
-               else {
-                       group_path = gtk_tree_path_new_first ();
-                       gdk_drag_status (context, GDK_ACTION_MOVE, time_);
-                       gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget),
-                                                        group_path,
-                                                        GTK_TREE_VIEW_DROP_BEFORE);
-               }
-       }
-       else {
-               /* This is a file drag, and it can only be dropped on contacts,
-                  not groups.
-                */
-               EmpathyContact *contact;
-               gtk_tree_model_get (model, &iter,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
-                                   -1);
-               if (contact != NULL &&
-                   empathy_contact_is_online (contact) &&
-                   (empathy_contact_get_capabilities (contact) & EMPATHY_CAPABILITIES_FT)) {
-                       gdk_drag_status (context, GDK_ACTION_COPY, time_);
-                       gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget),
-                                                        path,
-                                                        GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
-                       g_object_unref (contact);
-               }
-               else {
-                       gdk_drag_status (context, 0, time_);
-                       gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget), NULL, 0);
-                       retval = FALSE;
-               }
-       }
-
-       if (!is_different && !cleanup) {
-               return retval;
-       }
-
-       if (dm) {
-               gtk_tree_path_free (dm->path);
-               if (dm->timeout_id) {
-                       g_source_remove (dm->timeout_id);
-               }
-
-               g_free (dm);
-
-               dm = NULL;
-       }
-
-       if (!gtk_tree_view_row_expanded (GTK_TREE_VIEW (widget), path)) {
-               dm = g_new0 (DragMotionData, 1);
-
-               dm->view = EMPATHY_CONTACT_LIST_VIEW (widget);
-               dm->path = gtk_tree_path_copy (path);
-
-               dm->timeout_id = g_timeout_add_seconds (1,
-                       (GSourceFunc) contact_list_view_drag_motion_cb,
-                       dm);
-       }
-
-       return retval;
-}
-
-static void
-contact_list_view_drag_begin (GtkWidget      *widget,
-                             GdkDragContext *context)
-{
-       EmpathyContactListViewPriv *priv;
-       GtkTreeSelection          *selection;
-       GtkTreeModel              *model;
-       GtkTreePath               *path;
-       GtkTreeIter                iter;
-
-       priv = GET_PRIV (widget);
-
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
-       if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
-               return;
-       }
-
-       GTK_WIDGET_CLASS (empathy_contact_list_view_parent_class)->drag_begin (widget,
-                                                                             context);
-
-       path = gtk_tree_model_get_path (model, &iter);
-       priv->drag_row = gtk_tree_row_reference_new (model, path);
-       gtk_tree_path_free (path);
-}
-
-static void
-contact_list_view_drag_data_get (GtkWidget        *widget,
-                                GdkDragContext   *context,
-                                GtkSelectionData *selection,
-                                guint             info,
-                                guint             time_)
-{
-       EmpathyContactListViewPriv *priv;
-       GtkTreePath                *src_path;
-       GtkTreeIter                 iter;
-       GtkTreeModel               *model;
-       EmpathyContact             *contact;
-       TpAccount                  *account;
-       const gchar                *contact_id;
-       const gchar                *account_id;
-       gchar                      *str;
-
-       priv = GET_PRIV (widget);
-
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
-       if (!priv->drag_row) {
-               return;
-       }
-
-       src_path = gtk_tree_row_reference_get_path (priv->drag_row);
-       if (!src_path) {
-               return;
-       }
-
-       if (!gtk_tree_model_get_iter (model, &iter, src_path)) {
-               gtk_tree_path_free (src_path);
-               return;
-       }
-
-       gtk_tree_path_free (src_path);
-
-       contact = empathy_contact_list_view_dup_selected (EMPATHY_CONTACT_LIST_VIEW (widget));
-       if (!contact) {
-               return;
-       }
-
-       account = empathy_contact_get_account (contact);
-       account_id = tp_proxy_get_object_path (account);
-       contact_id = empathy_contact_get_id (contact);
-       g_object_unref (contact);
-       str = g_strconcat (account_id, ":", contact_id, NULL);
-
-       if (info == DND_DRAG_TYPE_CONTACT_ID) {
-               gtk_selection_data_set (selection,
-                                       gdk_atom_intern ("text/contact-id", FALSE), 8,
-                                       (guchar *) str, strlen (str) + 1);
-       }
-
-       g_free (str);
-}
-
-static void
-contact_list_view_drag_end (GtkWidget      *widget,
-                           GdkDragContext *context)
-{
-       EmpathyContactListViewPriv *priv;
-
-       priv = GET_PRIV (widget);
-
-       GTK_WIDGET_CLASS (empathy_contact_list_view_parent_class)->drag_end (widget,
-                                                                           context);
-
-       if (priv->drag_row) {
-               gtk_tree_row_reference_free (priv->drag_row);
-               priv->drag_row = NULL;
-       }
-}
-
-static gboolean
-contact_list_view_drag_drop (GtkWidget      *widget,
-                            GdkDragContext *drag_context,
-                            gint            x,
-                            gint            y,
-                            guint           time_)
-{
-       return FALSE;
-}
-
-typedef struct {
-       EmpathyContactListView *view;
-       guint                   button;
-       guint32                 time;
-} MenuPopupData;
-
-static void
-menu_deactivate_cb (GtkMenuShell *menushell,
-                   gpointer user_data)
-{
-       /* FIXME: we shouldn't have to disconnec the signal (bgo #641327) */
-       g_signal_handlers_disconnect_by_func (menushell,
-               menu_deactivate_cb, user_data);
-
-       gtk_menu_detach (GTK_MENU (menushell));
-}
-
-static gboolean
-contact_list_view_popup_menu_idle_cb (gpointer user_data)
-{
-       MenuPopupData *data = user_data;
-       GtkWidget     *menu;
-
-       menu = empathy_contact_list_view_get_contact_menu (data->view);
-       if (!menu) {
-               menu = empathy_contact_list_view_get_group_menu (data->view);
-       }
-
-       if (menu) {
-               gtk_menu_attach_to_widget (GTK_MENU (menu),
-                                          GTK_WIDGET (data->view), NULL);
-               gtk_widget_show (menu);
-               gtk_menu_popup (GTK_MENU (menu),
-                               NULL, NULL, NULL, NULL,
-                               data->button, data->time);
-
-               /* menu is initially unowned but gtk_menu_attach_to_widget () taked its
-                * floating ref. We can either wait that the treeview releases its ref
-                * when it will be destroyed (when leaving Empathy) or explicitely
-                * detach the menu when it's not displayed any more.
-                * We go for the latter as we don't want to keep useless menus in memory
-                * during the whole lifetime of Empathy. */
-               g_signal_connect (menu, "deactivate", G_CALLBACK (menu_deactivate_cb),
-                       NULL);
-       }
-
-       g_slice_free (MenuPopupData, data);
-
-       return FALSE;
-}
-
-static gboolean
-contact_list_view_button_press_event_cb (EmpathyContactListView *view,
-                                        GdkEventButton         *event,
-                                        gpointer                user_data)
-{
-       if (event->button == 3) {
-               MenuPopupData *data;
-
-               data = g_slice_new (MenuPopupData);
-               data->view = view;
-               data->button = event->button;
-               data->time = event->time;
-               g_idle_add (contact_list_view_popup_menu_idle_cb, data);
-       }
-
-       return FALSE;
-}
-
-static gboolean
-contact_list_view_key_press_event_cb (EmpathyContactListView *view,
-                                     GdkEventKey            *event,
-                                     gpointer                user_data)
-{
-       if (event->keyval == GDK_KEY_Menu) {
-               MenuPopupData *data;
-
-               data = g_slice_new (MenuPopupData);
-               data->view = view;
-               data->button = 0;
-               data->time = event->time;
-               g_idle_add (contact_list_view_popup_menu_idle_cb, data);
-       }
-
-       return FALSE;
-}
-
-static void
-contact_list_view_row_activated (GtkTreeView       *view,
-                                GtkTreePath       *path,
-                                GtkTreeViewColumn *column)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       EmpathyContact             *contact;
-       GtkTreeModel               *model;
-       GtkTreeIter                 iter;
-
-       if (!(priv->contact_features & EMPATHY_CONTACT_FEATURE_CHAT)) {
-               return;
-       }
-
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
-       gtk_tree_model_get_iter (model, &iter, path);
-       gtk_tree_model_get (model, &iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
-                           -1);
-
-       if (contact) {
-               DEBUG ("Starting a chat");
-               empathy_chat_with_contact (contact,
-                       empathy_get_current_action_time ());
-               g_object_unref (contact);
-       }
-}
-
-static void
-contact_list_view_call_activated_cb (
-    EmpathyCellRendererActivatable *cell,
-    const gchar                    *path_string,
-    EmpathyContactListView         *view)
-{
-       GtkWidget *menu;
-       GtkTreeModel *model;
-       GtkTreeIter iter;
-       EmpathyContact *contact;
-       GdkEventButton *event;
-       GtkMenuShell *shell;
-       GtkWidget *item;
-
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
-       if (!gtk_tree_model_get_iter_from_string (model, &iter, path_string))
-               return;
-
-       gtk_tree_model_get (model, &iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
-                           -1);
-       if (contact == NULL)
-               return;
-
-       event = (GdkEventButton *) gtk_get_current_event ();
-
-       menu = empathy_context_menu_new (GTK_WIDGET (view));
-       shell = GTK_MENU_SHELL (menu);
-
-       /* audio */
-       item = empathy_contact_audio_call_menu_item_new (contact);
-       gtk_menu_shell_append (shell, item);
-       gtk_widget_show (item);
-
-       /* video */
-       item = empathy_contact_video_call_menu_item_new (contact);
-       gtk_menu_shell_append (shell, item);
-       gtk_widget_show (item);
-
-       gtk_widget_show (menu);
-       gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
-                       event->button, event->time);
-
-       g_object_unref (contact);
-}
-
-static void
-contact_list_view_cell_set_background (EmpathyContactListView *view,
-                                      GtkCellRenderer        *cell,
-                                      gboolean                is_group,
-                                      gboolean                is_active)
-{
-       if (!is_group && is_active) {
-               GdkRGBA color;
-               GtkStyleContext *style;
-
-               style = gtk_widget_get_style_context (GTK_WIDGET (view));
-
-               gtk_style_context_get_background_color (style, GTK_STATE_FLAG_SELECTED,
-        &color);
-
-               /* Here we take the current theme colour and add it to
-                * the colour for white and average the two. This
-                * gives a colour which is inline with the theme but
-                * slightly whiter.
-                */
-               empathy_make_color_whiter (&color);
-
-               g_object_set (cell,
-                             "cell-background-rgba", &color,
-                             NULL);
-       } else {
-               g_object_set (cell,
-                             "cell-background-rgba", NULL,
-                             NULL);
-       }
-}
-
-static void
-contact_list_view_pixbuf_cell_data_func (GtkTreeViewColumn      *tree_column,
-                                        GtkCellRenderer        *cell,
-                                        GtkTreeModel           *model,
-                                        GtkTreeIter            *iter,
-                                        EmpathyContactListView *view)
-{
-       GdkPixbuf *pixbuf;
-       gboolean   is_group;
-       gboolean   is_active;
-
-       gtk_tree_model_get (model, iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_ACTIVE, &is_active,
-                           EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS, &pixbuf,
-                           -1);
-
-       g_object_set (cell,
-                     "visible", !is_group,
-                     "pixbuf", pixbuf,
-                     NULL);
-
-       if (pixbuf != NULL) {
-               g_object_unref (pixbuf);
-       }
-
-       contact_list_view_cell_set_background (view, cell, is_group, is_active);
-}
-
-static void
-contact_list_view_group_icon_cell_data_func (GtkTreeViewColumn     *tree_column,
-                                            GtkCellRenderer       *cell,
-                                            GtkTreeModel          *model,
-                                            GtkTreeIter           *iter,
-                                            EmpathyContactListView *view)
-{
-       GdkPixbuf *pixbuf = NULL;
-       gboolean is_group;
-       gchar *name;
-
-       gtk_tree_model_get (model, iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
-                           -1);
-
-       if (!is_group)
-               goto out;
-
-out:
-       g_object_set (cell,
-                     "visible", pixbuf != NULL,
-                     "pixbuf", pixbuf,
-                     NULL);
-
-       if (pixbuf != NULL)
-               g_object_unref (pixbuf);
-
-       g_free (name);
-}
-
-static void
-contact_list_view_audio_call_cell_data_func (
-                                      GtkTreeViewColumn      *tree_column,
-                                      GtkCellRenderer        *cell,
-                                      GtkTreeModel           *model,
-                                      GtkTreeIter            *iter,
-                                      EmpathyContactListView *view)
-{
-       gboolean is_group;
-       gboolean is_active;
-       gboolean can_audio, can_video;
-
-       gtk_tree_model_get (model, iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_ACTIVE, &is_active,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CAN_AUDIO_CALL, &can_audio,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CAN_VIDEO_CALL, &can_video,
-                           -1);
-
-       g_object_set (cell,
-                     "visible", !is_group && (can_audio || can_video),
-                     "icon-name", can_video? EMPATHY_IMAGE_VIDEO_CALL : EMPATHY_IMAGE_VOIP,
-                     NULL);
-
-       contact_list_view_cell_set_background (view, cell, is_group, is_active);
-}
-
-static void
-contact_list_view_avatar_cell_data_func (GtkTreeViewColumn      *tree_column,
-                                        GtkCellRenderer        *cell,
-                                        GtkTreeModel           *model,
-                                        GtkTreeIter            *iter,
-                                        EmpathyContactListView *view)
-{
-       GdkPixbuf *pixbuf;
-       gboolean   show_avatar;
-       gboolean   is_group;
-       gboolean   is_active;
-
-       gtk_tree_model_get (model, iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR, &pixbuf,
-                           EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR_VISIBLE, &show_avatar,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_ACTIVE, &is_active,
-                           -1);
-
-       g_object_set (cell,
-                     "visible", !is_group && show_avatar,
-                     "pixbuf", pixbuf,
-                     NULL);
-
-       if (pixbuf) {
-               g_object_unref (pixbuf);
-       }
-
-       contact_list_view_cell_set_background (view, cell, is_group, is_active);
-}
-
-static void
-contact_list_view_text_cell_data_func (GtkTreeViewColumn      *tree_column,
-                                      GtkCellRenderer        *cell,
-                                      GtkTreeModel           *model,
-                                      GtkTreeIter            *iter,
-                                      EmpathyContactListView *view)
-{
-       gboolean is_group;
-       gboolean is_active;
-
-       gtk_tree_model_get (model, iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_ACTIVE, &is_active,
-                           -1);
-
-       contact_list_view_cell_set_background (view, cell, is_group, is_active);
-}
-
-static void
-contact_list_view_expander_cell_data_func (GtkTreeViewColumn      *column,
-                                          GtkCellRenderer        *cell,
-                                          GtkTreeModel           *model,
-                                          GtkTreeIter            *iter,
-                                          EmpathyContactListView *view)
-{
-       gboolean is_group;
-       gboolean is_active;
-
-       gtk_tree_model_get (model, iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_ACTIVE, &is_active,
-                           -1);
-
-       if (gtk_tree_model_iter_has_child (model, iter)) {
-               GtkTreePath *path;
-               gboolean     row_expanded;
-
-               path = gtk_tree_model_get_path (model, iter);
-               row_expanded = gtk_tree_view_row_expanded (GTK_TREE_VIEW (gtk_tree_view_column_get_tree_view (column)), path);
-               gtk_tree_path_free (path);
-
-               g_object_set (cell,
-                             "visible", TRUE,
-                             "expander-style", row_expanded ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED,
-                             NULL);
-       } else {
-               g_object_set (cell, "visible", FALSE, NULL);
-       }
-
-       contact_list_view_cell_set_background (view, cell, is_group, is_active);
-}
-
-static void
-contact_list_view_row_expand_or_collapse_cb (EmpathyContactListView *view,
-                                            GtkTreeIter            *iter,
-                                            GtkTreePath            *path,
-                                            gpointer                user_data)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       GtkTreeModel               *model;
-       gchar                      *name;
-       gboolean                    expanded;
-
-       if (!(priv->list_features & EMPATHY_CONTACT_LIST_FEATURE_GROUPS_SAVE)) {
-               return;
-       }
-
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
-
-       gtk_tree_model_get (model, iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
-                           -1);
-
-       expanded = GPOINTER_TO_INT (user_data);
-       empathy_contact_group_set_expanded (name, expanded);
-
-       g_free (name);
-}
-
-static gboolean
-contact_list_view_start_search_cb (EmpathyContactListView *view,
-                                  gpointer                data)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-
-       if (priv->search_widget == NULL)
-               return FALSE;
-
-       if (gtk_widget_get_visible (GTK_WIDGET (priv->search_widget)))
-               gtk_widget_grab_focus (GTK_WIDGET (priv->search_widget));
-       else
-               gtk_widget_show (GTK_WIDGET (priv->search_widget));
-
-       return TRUE;
-}
-
-static void
-contact_list_view_search_text_notify_cb (EmpathyLiveSearch      *search,
-                                        GParamSpec             *pspec,
-                                        EmpathyContactListView *view)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       GtkTreePath *path;
-       GtkTreeViewColumn *focus_column;
-       GtkTreeModel *model;
-       GtkTreeIter iter;
-       gboolean set_cursor = FALSE;
-
-       gtk_tree_model_filter_refilter (priv->filter);
-
-       /* Set cursor on the first contact. If it is already set on a group,
-        * set it on its first child contact. Note that first child of a group
-        * is its separator, that's why we actually set to the 2nd
-        */
-
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
-       gtk_tree_view_get_cursor (GTK_TREE_VIEW (view), &path, &focus_column);
-
-       if (path == NULL) {
-               path = gtk_tree_path_new_from_string ("0:1");
-               set_cursor = TRUE;
-       } else if (gtk_tree_path_get_depth (path) < 2) {
-               gboolean is_group;
-
-               gtk_tree_model_get_iter (model, &iter, path);
-               gtk_tree_model_get (model, &iter,
-                       EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-                       -1);
-
-               if (is_group) {
-                       gtk_tree_path_down (path);
-                       gtk_tree_path_next (path);
-                       set_cursor = TRUE;
-               }
-       }
-
-       if (set_cursor) {
-               /* FIXME: Workaround for GTK bug #621651, we have to make sure
-                * the path is valid. */
-               if (gtk_tree_model_get_iter (model, &iter, path)) {
-                       gtk_tree_view_set_cursor (GTK_TREE_VIEW (view), path,
-                               focus_column, FALSE);
-               }
-       }
-
-       gtk_tree_path_free (path);
-}
-
-static void
-contact_list_view_search_activate_cb (GtkWidget *search,
-                                     EmpathyContactListView *view)
-{
-       GtkTreePath *path;
-       GtkTreeViewColumn *focus_column;
-
-       gtk_tree_view_get_cursor (GTK_TREE_VIEW (view), &path, &focus_column);
-       if (path != NULL) {
-               gtk_tree_view_row_activated (GTK_TREE_VIEW (view), path,
-                       focus_column);
-               gtk_tree_path_free (path);
-
-               gtk_widget_hide (search);
-       }
-}
-
-static gboolean
-contact_list_view_search_key_navigation_cb (GtkWidget *search,
-                                           GdkEvent *event,
-                                           EmpathyContactListView *view)
-{
-       GdkEvent *new_event;
-       gboolean ret = FALSE;
-
-       new_event = gdk_event_copy (event);
-       gtk_widget_grab_focus (GTK_WIDGET (view));
-       ret = gtk_widget_event (GTK_WIDGET (view), new_event);
-       gtk_widget_grab_focus (search);
-
-       gdk_event_free (new_event);
-
-       return ret;
-}
-
-static void
-contact_list_view_search_hide_cb (EmpathyLiveSearch      *search,
-                                 EmpathyContactListView *view)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       GtkTreeModel               *model;
-       GtkTreeIter                 iter;
-       gboolean                    valid = FALSE;
-
-       /* block expand or collapse handlers, they would write the
-        * expand or collapsed setting to file otherwise */
-       g_signal_handlers_block_by_func (view,
-               contact_list_view_row_expand_or_collapse_cb,
-               GINT_TO_POINTER (TRUE));
-       g_signal_handlers_block_by_func (view,
-               contact_list_view_row_expand_or_collapse_cb,
-               GINT_TO_POINTER (FALSE));
-
-       /* restore which groups are expanded and which are not */
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
-       for (valid = gtk_tree_model_get_iter_first (model, &iter);
-            valid; valid = gtk_tree_model_iter_next (model, &iter)) {
-               gboolean      is_group;
-               gchar        *name = NULL;
-               GtkTreePath  *path;
-
-               gtk_tree_model_get (model, &iter,
-                       EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
-                       EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-                       -1);
-
-               if (!is_group) {
-                       g_free (name);
-                       continue;
-               }
-
-               path = gtk_tree_model_get_path (model, &iter);
-               if ((priv->list_features & EMPATHY_CONTACT_LIST_FEATURE_GROUPS_SAVE) == 0 ||
-                   empathy_contact_group_get_expanded (name)) {
-                       gtk_tree_view_expand_row (GTK_TREE_VIEW (view), path,
-                               TRUE);
-               } else {
-                       gtk_tree_view_collapse_row (GTK_TREE_VIEW (view), path);
-               }
-
-               gtk_tree_path_free (path);
-               g_free (name);
-       }
-
-       /* unblock expand or collapse handlers */
-       g_signal_handlers_unblock_by_func (view,
-               contact_list_view_row_expand_or_collapse_cb,
-               GINT_TO_POINTER (TRUE));
-       g_signal_handlers_unblock_by_func (view,
-               contact_list_view_row_expand_or_collapse_cb,
-               GINT_TO_POINTER (FALSE));
-}
-
-static void
-contact_list_view_search_show_cb (EmpathyLiveSearch      *search,
-                                 EmpathyContactListView *view)
-{
-       /* block expand or collapse handlers during expand all, they would
-        * write the expand or collapsed setting to file otherwise */
-       g_signal_handlers_block_by_func (view,
-               contact_list_view_row_expand_or_collapse_cb,
-               GINT_TO_POINTER (TRUE));
-
-       gtk_tree_view_expand_all (GTK_TREE_VIEW (view));
-
-       g_signal_handlers_unblock_by_func (view,
-               contact_list_view_row_expand_or_collapse_cb,
-               GINT_TO_POINTER (TRUE));
-}
-
-typedef struct {
-       EmpathyContactListView *view;
-       GtkTreeRowReference *row_ref;
-       gboolean expand;
-} ExpandData;
-
-static gboolean
-contact_list_view_expand_idle_cb (gpointer user_data)
-{
-       ExpandData *data = user_data;
-       GtkTreePath *path;
-
-       path = gtk_tree_row_reference_get_path (data->row_ref);
-       if (path == NULL)
-               goto done;
-
-       g_signal_handlers_block_by_func (data->view,
-               contact_list_view_row_expand_or_collapse_cb,
-               GINT_TO_POINTER (data->expand));
-
-       if (data->expand) {
-               gtk_tree_view_expand_row (GTK_TREE_VIEW (data->view), path,
-                   TRUE);
-       } else {
-               gtk_tree_view_collapse_row (GTK_TREE_VIEW (data->view), path);
-       }
-       gtk_tree_path_free (path);
-
-       g_signal_handlers_unblock_by_func (data->view,
-               contact_list_view_row_expand_or_collapse_cb,
-               GINT_TO_POINTER (data->expand));
-
-done:
-       g_object_unref (data->view);
-       gtk_tree_row_reference_free (data->row_ref);
-       g_slice_free (ExpandData, data);
-
-       return FALSE;
-}
-
-static void
-contact_list_view_row_has_child_toggled_cb (GtkTreeModel           *model,
-                                           GtkTreePath            *path,
-                                           GtkTreeIter            *iter,
-                                           EmpathyContactListView *view)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       gboolean  is_group = FALSE;
-       gchar    *name = NULL;
-       ExpandData *data;
-
-       gtk_tree_model_get (model, iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
-                           -1);
-
-       if (!is_group || EMP_STR_EMPTY (name)) {
-               g_free (name);
-               return;
-       }
-
-       data = g_slice_new0 (ExpandData);
-       data->view = g_object_ref (view);
-       data->row_ref = gtk_tree_row_reference_new (model, path);
-       data->expand =
-               (priv->list_features & EMPATHY_CONTACT_LIST_FEATURE_GROUPS_SAVE) == 0 ||
-               (priv->search_widget != NULL && gtk_widget_get_visible (priv->search_widget)) ||
-               empathy_contact_group_get_expanded (name);
-
-       /* FIXME: It doesn't work to call gtk_tree_view_expand_row () from within
-        * gtk_tree_model_filter_refilter () */
-       g_idle_add (contact_list_view_expand_idle_cb, data);
-
-       g_free (name);
-}
-
-static void
-contact_list_view_verify_group_visibility (EmpathyContactListView *view,
-                                          GtkTreePath            *path)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       GtkTreeModel *model;
-       GtkTreePath *parent_path;
-       GtkTreeIter parent_iter;
-
-       if (gtk_tree_path_get_depth (path) < 2)
-               return;
-
-       /* A group row is visible if and only if at least one if its child is
-        * visible. So when a row is inserted/deleted/changed in the base model,
-        * that could modify the visibility of its parent in the filter model.
-        */
-
-       model = GTK_TREE_MODEL (priv->store);
-       parent_path = gtk_tree_path_copy (path);
-       gtk_tree_path_up (parent_path);
-       if (gtk_tree_model_get_iter (model, &parent_iter, parent_path)) {
-               /* This tells the filter to verify the visibility of that row,
-                * and show/hide it if necessary */
-               gtk_tree_model_row_changed (GTK_TREE_MODEL (priv->store),
-                       parent_path, &parent_iter);
-       }
-       gtk_tree_path_free (parent_path);
-}
-
-static void
-contact_list_view_store_row_changed_cb (GtkTreeModel           *model,
-                                       GtkTreePath            *path,
-                                       GtkTreeIter            *iter,
-                                       EmpathyContactListView *view)
-{
-       contact_list_view_verify_group_visibility (view, path);
-}
-
-static void
-contact_list_view_store_row_deleted_cb (GtkTreeModel           *model,
-                                       GtkTreePath            *path,
-                                       EmpathyContactListView *view)
-{
-       contact_list_view_verify_group_visibility (view, path);
-}
-
-static void
-contact_list_view_constructed (GObject *object)
-{
-       EmpathyContactListView     *view = EMPATHY_CONTACT_LIST_VIEW (object);
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       GtkCellRenderer            *cell;
-       GtkTreeViewColumn          *col;
-
-       priv->filter = GTK_TREE_MODEL_FILTER (gtk_tree_model_filter_new (
-                       GTK_TREE_MODEL (priv->store), NULL));
-       gtk_tree_model_filter_set_visible_func (priv->filter,
-                       contact_list_view_filter_visible_func,
-                       view, NULL);
-
-       g_signal_connect (priv->filter, "row-has-child-toggled",
-                         G_CALLBACK (contact_list_view_row_has_child_toggled_cb),
-                         view);
-
-       gtk_tree_view_set_model (GTK_TREE_VIEW (view),
-                                GTK_TREE_MODEL (priv->filter));
-
-       tp_g_signal_connect_object (priv->store, "row-changed",
-               G_CALLBACK (contact_list_view_store_row_changed_cb),
-               view, 0);
-       tp_g_signal_connect_object (priv->store, "row-inserted",
-               G_CALLBACK (contact_list_view_store_row_changed_cb),
-               view, 0);
-       tp_g_signal_connect_object (priv->store, "row-deleted",
-               G_CALLBACK (contact_list_view_store_row_deleted_cb),
-               view, 0);
-
-       /* Setup view */
-       /* Setting reorderable is a hack that gets us row previews as drag icons
-          for free.  We override all the drag handlers.  It's tricky to get the
-          position of the drag icon right in drag_begin.  GtkTreeView has special
-          voodoo for it, so we let it do the voodoo that he do.
-        */
-       g_object_set (view,
-                     "headers-visible", FALSE,
-                     "reorderable", TRUE,
-                     "show-expanders", FALSE,
-                     NULL);
-
-       col = gtk_tree_view_column_new ();
-
-       /* State */
-       cell = gtk_cell_renderer_pixbuf_new ();
-       gtk_tree_view_column_pack_start (col, cell, FALSE);
-       gtk_tree_view_column_set_cell_data_func (
-               col, cell,
-               (GtkTreeCellDataFunc) contact_list_view_pixbuf_cell_data_func,
-               view, NULL);
-
-       g_object_set (cell,
-                     "xpad", 5,
-                     "ypad", 1,
-                     "visible", FALSE,
-                     NULL);
-
-       /* Group icon */
-       cell = gtk_cell_renderer_pixbuf_new ();
-       gtk_tree_view_column_pack_start (col, cell, FALSE);
-       gtk_tree_view_column_set_cell_data_func (
-               col, cell,
-               (GtkTreeCellDataFunc) contact_list_view_group_icon_cell_data_func,
-               view, NULL);
-
-       g_object_set (cell,
-                     "xpad", 0,
-                     "ypad", 0,
-                     "visible", FALSE,
-                     "width", 16,
-                     "height", 16,
-                     NULL);
-
-       /* Name */
-       cell = empathy_cell_renderer_text_new ();
-       gtk_tree_view_column_pack_start (col, cell, TRUE);
-       gtk_tree_view_column_set_cell_data_func (
-               col, cell,
-               (GtkTreeCellDataFunc) contact_list_view_text_cell_data_func,
-               view, NULL);
-
-       gtk_tree_view_column_add_attribute (col, cell,
-                                           "name", EMPATHY_CONTACT_LIST_STORE_COL_NAME);
-       gtk_tree_view_column_add_attribute (col, cell,
-                                           "text", EMPATHY_CONTACT_LIST_STORE_COL_NAME);
-       gtk_tree_view_column_add_attribute (col, cell,
-                                           "presence-type", EMPATHY_CONTACT_LIST_STORE_COL_PRESENCE_TYPE);
-       gtk_tree_view_column_add_attribute (col, cell,
-                                           "status", EMPATHY_CONTACT_LIST_STORE_COL_STATUS);
-       gtk_tree_view_column_add_attribute (col, cell,
-                                           "is_group", EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP);
-       gtk_tree_view_column_add_attribute (col, cell,
-                                           "compact", EMPATHY_CONTACT_LIST_STORE_COL_COMPACT);
-
-       /* Audio Call Icon */
-       cell = empathy_cell_renderer_activatable_new ();
-       gtk_tree_view_column_pack_start (col, cell, FALSE);
-       gtk_tree_view_column_set_cell_data_func (
-               col, cell,
-               (GtkTreeCellDataFunc) contact_list_view_audio_call_cell_data_func,
-               view, NULL);
-
-       g_object_set (cell,
-                     "visible", FALSE,
-                     NULL);
-
-       g_signal_connect (cell, "path-activated",
-                         G_CALLBACK (contact_list_view_call_activated_cb),
-                         view);
-
-       /* Avatar */
-       cell = gtk_cell_renderer_pixbuf_new ();
-       gtk_tree_view_column_pack_start (col, cell, FALSE);
-       gtk_tree_view_column_set_cell_data_func (
-               col, cell,
-               (GtkTreeCellDataFunc) contact_list_view_avatar_cell_data_func,
-               view, NULL);
-
-       g_object_set (cell,
-                     "xpad", 0,
-                     "ypad", 0,
-                     "visible", FALSE,
-                     "width", 32,
-                     "height", 32,
-                     NULL);
-
-       /* Expander */
-       cell = empathy_cell_renderer_expander_new ();
-       gtk_tree_view_column_pack_end (col, cell, FALSE);
-       gtk_tree_view_column_set_cell_data_func (
-               col, cell,
-               (GtkTreeCellDataFunc) contact_list_view_expander_cell_data_func,
-               view, NULL);
-
-       /* Actually add the column now we have added all cell renderers */
-       gtk_tree_view_append_column (GTK_TREE_VIEW (view), col);
-}
-
-static void
-contact_list_view_set_list_features (EmpathyContactListView         *view,
-                                    EmpathyContactListFeatureFlags  features)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       gboolean                    has_tooltip;
-
-       g_return_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view));
-
-       priv->list_features = features;
-
-       /* Update DnD source/dest */
-       if (features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_DRAG) {
-               gtk_drag_source_set (GTK_WIDGET (view),
-                                    GDK_BUTTON1_MASK,
-                                    drag_types_source,
-                                    G_N_ELEMENTS (drag_types_source),
-                                    GDK_ACTION_MOVE | GDK_ACTION_COPY);
-       } else {
-               gtk_drag_source_unset (GTK_WIDGET (view));
-
-       }
-
-       if (features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_DROP) {
-               gtk_drag_dest_set (GTK_WIDGET (view),
-                                  GTK_DEST_DEFAULT_ALL,
-                                  drag_types_dest,
-                                  G_N_ELEMENTS (drag_types_dest),
-                                  GDK_ACTION_MOVE | GDK_ACTION_COPY);
-       } else {
-               /* FIXME: URI could still be droped depending on FT feature */
-               gtk_drag_dest_unset (GTK_WIDGET (view));
-       }
-
-       /* Update has-tooltip */
-       has_tooltip = (features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_TOOLTIP) != 0;
-       gtk_widget_set_has_tooltip (GTK_WIDGET (view), has_tooltip);
-}
-
-static void
-contact_list_view_dispose (GObject *object)
-{
-       EmpathyContactListView *view = EMPATHY_CONTACT_LIST_VIEW (object);
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-
-       if (priv->store) {
-               g_object_unref (priv->store);
-               priv->store = NULL;
-       }
-       if (priv->filter) {
-               g_object_unref (priv->filter);
-               priv->filter = NULL;
-       }
-       if (priv->tooltip_widget) {
-               gtk_widget_destroy (priv->tooltip_widget);
-               priv->tooltip_widget = NULL;
-       }
-       if (priv->file_targets) {
-               gtk_target_list_unref (priv->file_targets);
-               priv->file_targets = NULL;
-       }
-
-       empathy_contact_list_view_set_live_search (view, NULL);
-
-       G_OBJECT_CLASS (empathy_contact_list_view_parent_class)->dispose (object);
-}
-
-static void
-contact_list_view_get_property (GObject    *object,
-                               guint       param_id,
-                               GValue     *value,
-                               GParamSpec *pspec)
-{
-       EmpathyContactListViewPriv *priv;
-
-       priv = GET_PRIV (object);
-
-       switch (param_id) {
-       case PROP_STORE:
-               g_value_set_object (value, priv->store);
-               break;
-       case PROP_LIST_FEATURES:
-               g_value_set_flags (value, priv->list_features);
-               break;
-       case PROP_CONTACT_FEATURES:
-               g_value_set_flags (value, priv->contact_features);
-               break;
-       default:
-               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-               break;
-       };
-}
-
-static void
-contact_list_view_set_property (GObject      *object,
-                               guint         param_id,
-                               const GValue *value,
-                               GParamSpec   *pspec)
-{
-       EmpathyContactListView     *view = EMPATHY_CONTACT_LIST_VIEW (object);
-       EmpathyContactListViewPriv *priv = GET_PRIV (object);
-
-       switch (param_id) {
-       case PROP_STORE:
-               priv->store = g_value_dup_object (value);
-               break;
-       case PROP_LIST_FEATURES:
-               contact_list_view_set_list_features (view, g_value_get_flags (value));
-               break;
-       case PROP_CONTACT_FEATURES:
-               priv->contact_features = g_value_get_flags (value);
-               break;
-       default:
-               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-               break;
-       };
-}
-
-static void
-empathy_contact_list_view_class_init (EmpathyContactListViewClass *klass)
-{
-       GObjectClass     *object_class = G_OBJECT_CLASS (klass);
-       GtkWidgetClass   *widget_class = GTK_WIDGET_CLASS (klass);
-       GtkTreeViewClass *tree_view_class = GTK_TREE_VIEW_CLASS (klass);
-
-       object_class->constructed        = contact_list_view_constructed;
-       object_class->dispose            = contact_list_view_dispose;
-       object_class->get_property       = contact_list_view_get_property;
-       object_class->set_property       = contact_list_view_set_property;
-
-       widget_class->drag_data_received = contact_list_view_drag_data_received;
-       widget_class->drag_drop          = contact_list_view_drag_drop;
-       widget_class->drag_begin         = contact_list_view_drag_begin;
-       widget_class->drag_data_get      = contact_list_view_drag_data_get;
-       widget_class->drag_end           = contact_list_view_drag_end;
-       widget_class->drag_motion        = contact_list_view_drag_motion;
-
-       /* We use the class method to let user of this widget to connect to
-        * the signal and stop emission of the signal so the default handler
-        * won't be called. */
-       tree_view_class->row_activated = contact_list_view_row_activated;
-
-       signals[DRAG_CONTACT_RECEIVED] =
-               g_signal_new ("drag-contact-received",
-                             G_OBJECT_CLASS_TYPE (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_generic,
-                             G_TYPE_NONE,
-                             3, EMPATHY_TYPE_CONTACT, G_TYPE_STRING, G_TYPE_STRING);
-
-       g_object_class_install_property (object_class,
-                                        PROP_STORE,
-                                        g_param_spec_object ("store",
-                                                            "The store of the view",
-                                                            "The store of the view",
-                                                             EMPATHY_TYPE_CONTACT_LIST_STORE,
-                                                             G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
-       g_object_class_install_property (object_class,
-                                        PROP_LIST_FEATURES,
-                                        g_param_spec_flags ("list-features",
-                                                            "Features of the view",
-                                                            "Flags for all enabled features",
-                                                             EMPATHY_TYPE_CONTACT_LIST_FEATURE_FLAGS,
-                                                             EMPATHY_CONTACT_LIST_FEATURE_NONE,
-                                                             G_PARAM_READWRITE));
-       g_object_class_install_property (object_class,
-                                        PROP_CONTACT_FEATURES,
-                                        g_param_spec_flags ("contact-features",
-                                                            "Features of the contact menu",
-                                                            "Flags for all enabled features for the menu",
-                                                             EMPATHY_TYPE_CONTACT_FEATURE_FLAGS,
-                                                             EMPATHY_CONTACT_FEATURE_NONE,
-                                                             G_PARAM_READWRITE));
-
-       g_type_class_add_private (object_class, sizeof (EmpathyContactListViewPriv));
-}
-
-static void
-empathy_contact_list_view_init (EmpathyContactListView *view)
-{
-       EmpathyContactListViewPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (view,
-               EMPATHY_TYPE_CONTACT_LIST_VIEW, EmpathyContactListViewPriv);
-
-       view->priv = priv;
-
-       /* Get saved group states. */
-       empathy_contact_groups_get_all ();
-
-       gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (view),
-                                             empathy_contact_list_store_row_separator_func,
-                                             NULL, NULL);
-
-       /* Set up drag target lists. */
-       priv->file_targets = gtk_target_list_new (drag_types_dest_file,
-                                                 G_N_ELEMENTS (drag_types_dest_file));
-
-       /* Connect to tree view signals rather than override. */
-       g_signal_connect (view, "button-press-event",
-                         G_CALLBACK (contact_list_view_button_press_event_cb),
-                         NULL);
-       g_signal_connect (view, "key-press-event",
-                         G_CALLBACK (contact_list_view_key_press_event_cb),
-                         NULL);
-       g_signal_connect (view, "row-expanded",
-                         G_CALLBACK (contact_list_view_row_expand_or_collapse_cb),
-                         GINT_TO_POINTER (TRUE));
-       g_signal_connect (view, "row-collapsed",
-                         G_CALLBACK (contact_list_view_row_expand_or_collapse_cb),
-                         GINT_TO_POINTER (FALSE));
-       g_signal_connect (view, "query-tooltip",
-                         G_CALLBACK (contact_list_view_query_tooltip_cb),
-                         NULL);
-}
-
-EmpathyContactListView *
-empathy_contact_list_view_new (EmpathyContactListStore        *store,
-                              EmpathyContactListFeatureFlags  list_features,
-                              EmpathyContactFeatureFlags      contact_features)
-{
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store), NULL);
-
-       return g_object_new (EMPATHY_TYPE_CONTACT_LIST_VIEW,
-                            "store", store,
-                            "contact-features", contact_features,
-                            "list-features", list_features,
-                            NULL);
-}
-
-EmpathyContact *
-empathy_contact_list_view_dup_selected (EmpathyContactListView *view)
-{
-       GtkTreeSelection          *selection;
-       GtkTreeIter                iter;
-       GtkTreeModel              *model;
-       EmpathyContact             *contact;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
-
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
-       if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
-               return NULL;
-       }
-
-       gtk_tree_model_get (model, &iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
-                           -1);
-
-       return contact;
-}
-
-EmpathyContactListFlags
-empathy_contact_list_view_get_flags (EmpathyContactListView *view)
-{
-       GtkTreeSelection          *selection;
-       GtkTreeIter                iter;
-       GtkTreeModel              *model;
-       EmpathyContactListFlags    flags;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), 0);
-
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
-       if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
-               return 0;
-       }
-
-       gtk_tree_model_get (model, &iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_FLAGS, &flags,
-                           -1);
-
-       return flags;
-}
-
-gchar *
-empathy_contact_list_view_get_selected_group (EmpathyContactListView *view,
-                                             gboolean *is_fake_group)
-{
-       GtkTreeSelection          *selection;
-       GtkTreeIter                iter;
-       GtkTreeModel              *model;
-       gboolean                   is_group;
-       gchar                     *name;
-       gboolean                   fake;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
-
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
-       if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
-               return NULL;
-       }
-
-       gtk_tree_model_get (model, &iter,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
-                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
-                           EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, &fake,
-                           -1);
-
-       if (!is_group) {
-               g_free (name);
-               return NULL;
-       }
-
-       if (is_fake_group != NULL)
-               *is_fake_group = fake;
-
-       return name;
-}
-
-static gboolean
-contact_list_view_remove_dialog_show (GtkWindow   *parent,
-                                     const gchar *message,
-                                     const gchar *secondary_text)
-{
-       GtkWidget *dialog;
-       gboolean res;
-
-       dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL,
-                                        GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
-                                        "%s", message);
-       gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-                               GTK_STOCK_CANCEL, GTK_RESPONSE_NO,
-                               GTK_STOCK_DELETE, GTK_RESPONSE_YES,
-                               NULL);
-       gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                                 "%s", secondary_text);
-
-       gtk_widget_show (dialog);
-
-       res = gtk_dialog_run (GTK_DIALOG (dialog));
-       gtk_widget_destroy (dialog);
-
-       return (res == GTK_RESPONSE_YES);
-}
-
-static void
-contact_list_view_group_remove_activate_cb (GtkMenuItem            *menuitem,
-                                           EmpathyContactListView *view)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       gchar                      *group;
-
-       group = empathy_contact_list_view_get_selected_group (view, NULL);
-       if (group) {
-               gchar     *text;
-               GtkWindow *parent;
-
-               text = g_strdup_printf (_("Do you really want to remove the group '%s'?"), group);
-               parent = empathy_get_toplevel_window (GTK_WIDGET (view));
-               if (contact_list_view_remove_dialog_show (parent, _("Removing group"), text)) {
-                       EmpathyContactList *list;
-
-                       list = empathy_contact_list_store_get_list_iface (priv->store);
-                       empathy_contact_list_remove_group (list, group);
-               }
-
-               g_free (text);
-       }
-
-       g_free (group);
-}
-
-GtkWidget *
-empathy_contact_list_view_get_group_menu (EmpathyContactListView *view)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       gchar                      *group;
-       GtkWidget                  *menu;
-       GtkWidget                  *item;
-       GtkWidget                  *image;
-       gboolean                   is_fake_group;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
-
-       if (!(priv->list_features & (EMPATHY_CONTACT_LIST_FEATURE_GROUPS_RENAME |
-                                    EMPATHY_CONTACT_LIST_FEATURE_GROUPS_REMOVE))) {
-               return NULL;
-       }
-
-       group = empathy_contact_list_view_get_selected_group (view, &is_fake_group);
-       if (!group || is_fake_group) {
-               /* We can't alter fake groups */
-               return NULL;
-       }
-
-       menu = gtk_menu_new ();
-
-       /* FIXME: Not implemented yet
-       if (priv->features & EMPATHY_CONTACT_LIST_FEATURE_GROUPS_RENAME) {
-               item = gtk_menu_item_new_with_mnemonic (_("Re_name"));
-               gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-               gtk_widget_show (item);
-               g_signal_connect (item, "activate",
-                                 G_CALLBACK (contact_list_view_group_rename_activate_cb),
-                                 view);
-       }*/
-
-       if (priv->list_features & EMPATHY_CONTACT_LIST_FEATURE_GROUPS_REMOVE) {
-               item = gtk_image_menu_item_new_with_mnemonic (_("_Remove"));
-               image = gtk_image_new_from_icon_name (GTK_STOCK_REMOVE,
-                                                     GTK_ICON_SIZE_MENU);
-               gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-               gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-               gtk_widget_show (item);
-               g_signal_connect (item, "activate",
-                                 G_CALLBACK (contact_list_view_group_remove_activate_cb),
-                                 view);
-       }
-
-       g_free (group);
-
-       return menu;
-}
-
-static void
-contact_list_view_remove_activate_cb (GtkMenuItem            *menuitem,
-                                     EmpathyContactListView *view)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       EmpathyContact             *contact;
-
-       contact = empathy_contact_list_view_dup_selected (view);
-
-       if (contact) {
-               gchar     *text;
-               GtkWindow *parent;
-
-               parent = empathy_get_toplevel_window (GTK_WIDGET (view));
-               text = g_strdup_printf (_("Do you really want to remove the contact '%s'?"),
-                                       empathy_contact_get_alias (contact));
-               if (contact_list_view_remove_dialog_show (parent, _("Removing contact"), text)) {
-                       EmpathyContactList *list;
-
-                       list = empathy_contact_list_store_get_list_iface (priv->store);
-                       empathy_contact_list_remove (list, contact, "");
-               }
-
-               g_free (text);
-               g_object_unref (contact);
-       }
-}
-
-GtkWidget *
-empathy_contact_list_view_get_contact_menu (EmpathyContactListView *view)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-       EmpathyContact             *contact;
-       GtkWidget                  *menu;
-       GtkWidget                  *item;
-       GtkWidget                  *image;
-       EmpathyContactListFlags     flags;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_VIEW (view), NULL);
-
-       contact = empathy_contact_list_view_dup_selected (view);
-       if (!contact) {
-               return NULL;
-       }
-       flags = empathy_contact_list_view_get_flags (view);
-
-       menu = empathy_contact_menu_new (contact, priv->contact_features);
-
-       /* Remove contact */
-       if (priv->list_features & EMPATHY_CONTACT_LIST_FEATURE_CONTACT_REMOVE &&
-           flags & EMPATHY_CONTACT_LIST_CAN_REMOVE) {
-               /* create the menu if required, or just add a separator */
-               if (!menu) {
-                       menu = gtk_menu_new ();
-               } else {
-                       item = gtk_separator_menu_item_new ();
-                       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-                       gtk_widget_show (item);
-               }
-
-               /* Remove */
-               item = gtk_image_menu_item_new_with_mnemonic (_("_Remove"));
-               image = gtk_image_new_from_icon_name (GTK_STOCK_REMOVE,
-                                                     GTK_ICON_SIZE_MENU);
-               gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-               gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-               gtk_widget_show (item);
-               g_signal_connect (item, "activate",
-                                 G_CALLBACK (contact_list_view_remove_activate_cb),
-                                 view);
-       }
-
-       g_object_unref (contact);
-
-       return menu;
-}
-
-void
-empathy_contact_list_view_set_live_search (EmpathyContactListView *view,
-                                          EmpathyLiveSearch      *search)
-{
-       EmpathyContactListViewPriv *priv = GET_PRIV (view);
-
-       /* remove old handlers if old search was not null */
-       if (priv->search_widget != NULL) {
-               g_signal_handlers_disconnect_by_func (view,
-                       contact_list_view_start_search_cb,
-                       NULL);
-
-               g_signal_handlers_disconnect_by_func (priv->search_widget,
-                       contact_list_view_search_text_notify_cb,
-                       view);
-               g_signal_handlers_disconnect_by_func (priv->search_widget,
-                       contact_list_view_search_activate_cb,
-                       view);
-               g_signal_handlers_disconnect_by_func (priv->search_widget,
-                       contact_list_view_search_key_navigation_cb,
-                       view);
-               g_signal_handlers_disconnect_by_func (priv->search_widget,
-                       contact_list_view_search_hide_cb,
-                       view);
-               g_signal_handlers_disconnect_by_func (priv->search_widget,
-                       contact_list_view_search_show_cb,
-                       view);
-               g_object_unref (priv->search_widget);
-               priv->search_widget = NULL;
-       }
-
-       /* connect handlers if new search is not null */
-       if (search != NULL) {
-               priv->search_widget = g_object_ref (search);
-
-               g_signal_connect (view, "start-interactive-search",
-                                 G_CALLBACK (contact_list_view_start_search_cb),
-                                 NULL);
-
-               g_signal_connect (priv->search_widget, "notify::text",
-                       G_CALLBACK (contact_list_view_search_text_notify_cb),
-                       view);
-               g_signal_connect (priv->search_widget, "activate",
-                       G_CALLBACK (contact_list_view_search_activate_cb),
-                       view);
-               g_signal_connect (priv->search_widget, "key-navigation",
-                       G_CALLBACK (contact_list_view_search_key_navigation_cb),
-                       view);
-               g_signal_connect (priv->search_widget, "hide",
-                       G_CALLBACK (contact_list_view_search_hide_cb),
-                       view);
-               g_signal_connect (priv->search_widget, "show",
-                       G_CALLBACK (contact_list_view_search_show_cb),
-                       view);
-       }
-}
diff --git a/libempathy-gtk/empathy-contact-list-view.h b/libempathy-gtk/empathy-contact-list-view.h
deleted file mode 100644 (file)
index 97e78d3..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2005-2007 Imendio AB
- * Copyright (C) 2007-2008 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 program 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.
- *
- * 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., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- *
- * Authors: Mikael Hallendal <micke@imendio.com>
- *          Martyn Russell <martyn@imendio.com>
- *          Xavier Claessens <xclaesse@gmail.com>
- */
-
-#ifndef __EMPATHY_CONTACT_LIST_VIEW_H__
-#define __EMPATHY_CONTACT_LIST_VIEW_H__
-
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-contact.h>
-#include <libempathy/empathy-enum-types.h>
-
-#include "empathy-contact-list-store.h"
-#include "empathy-live-search.h"
-#include "empathy-contact-menu.h"
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_CONTACT_LIST_VIEW         (empathy_contact_list_view_get_type ())
-#define EMPATHY_CONTACT_LIST_VIEW(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_CONTACT_LIST_VIEW, EmpathyContactListView))
-#define EMPATHY_CONTACT_LIST_VIEW_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_CONTACT_LIST_VIEW, EmpathyContactListViewClass))
-#define EMPATHY_IS_CONTACT_LIST_VIEW(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_CONTACT_LIST_VIEW))
-#define EMPATHY_IS_CONTACT_LIST_VIEW_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_CONTACT_LIST_VIEW))
-#define EMPATHY_CONTACT_LIST_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_CONTACT_LIST_VIEW, EmpathyContactListViewClass))
-
-typedef struct _EmpathyContactListView      EmpathyContactListView;
-typedef struct _EmpathyContactListViewClass EmpathyContactListViewClass;
-
-typedef enum {
-       EMPATHY_CONTACT_LIST_FEATURE_NONE = 0,
-       EMPATHY_CONTACT_LIST_FEATURE_GROUPS_SAVE = 1 << 0,
-       EMPATHY_CONTACT_LIST_FEATURE_GROUPS_RENAME = 1 << 1,
-       EMPATHY_CONTACT_LIST_FEATURE_GROUPS_REMOVE = 1 << 2,
-       EMPATHY_CONTACT_LIST_FEATURE_CONTACT_REMOVE = 1 << 3,
-       EMPATHY_CONTACT_LIST_FEATURE_CONTACT_DROP = 1 << 4,
-       EMPATHY_CONTACT_LIST_FEATURE_CONTACT_DRAG = 1 << 5,
-       EMPATHY_CONTACT_LIST_FEATURE_CONTACT_TOOLTIP = 1 << 6,
-       EMPATHY_CONTACT_LIST_FEATURE_ALL = (1 << 7) - 1,
-} EmpathyContactListFeatureFlags;
-
-struct _EmpathyContactListView {
-       GtkTreeView parent;
-       gpointer priv;
-};
-
-struct _EmpathyContactListViewClass {
-       GtkTreeViewClass parent_class;
-};
-
-GType                      empathy_contact_list_view_get_type           (void) G_GNUC_CONST;
-EmpathyContactListView *   empathy_contact_list_view_new                (EmpathyContactListStore        *store,
-                                                                        EmpathyContactListFeatureFlags  list_features,
-                                                                        EmpathyContactFeatureFlags      contact_features);
-EmpathyContact *           empathy_contact_list_view_dup_selected       (EmpathyContactListView         *view);
-EmpathyContactListFlags    empathy_contact_list_view_get_flags          (EmpathyContactListView         *view);
-gchar *                    empathy_contact_list_view_get_selected_group (EmpathyContactListView         *view,
-                                                                        gboolean *is_fake_group);
-GtkWidget *                empathy_contact_list_view_get_contact_menu   (EmpathyContactListView         *view);
-GtkWidget *                empathy_contact_list_view_get_group_menu     (EmpathyContactListView         *view);
-void                       empathy_contact_list_view_set_live_search    (EmpathyContactListView         *view,
-                                                                        EmpathyLiveSearch              *search);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_CONTACT_LIST_VIEW_H__ */
-
index 07def6078ea9d50d4f39f1e12370525893673f0b..dd9ea5c1689212c124fca50f432a10fbda8aa9d1 100644 (file)
@@ -174,7 +174,6 @@ empathy_contact_add_menu_item_new (EmpathyContact *contact)
        TpConnection *connection;
        GList *l, *members;
        gboolean found = FALSE;
-       EmpathyContactListFlags flags;
 
        g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
@@ -185,12 +184,8 @@ empathy_contact_add_menu_item_new (EmpathyContact *contact)
        manager = empathy_contact_manager_dup_singleton ();
        connection = empathy_contact_get_connection (contact);
 
-       flags = empathy_contact_manager_get_flags_for_connection (manager,
-                       connection);
-
-       if (!(flags & EMPATHY_CONTACT_LIST_CAN_ADD)) {
+       if (!tp_connection_get_can_change_contact_list (connection))
                return NULL;
-       }
 
        members = empathy_contact_list_get_members (EMPATHY_CONTACT_LIST (manager));
        for (l = members; l; l = l->next) {
@@ -226,8 +221,8 @@ empathy_contact_block_menu_item_toggled (GtkCheckMenuItem *item,
                                         EmpathyContact   *contact)
 {
        static guint block_signal = 0;
-       EmpathyContactManager *manager;
        gboolean blocked, abusive;
+       TpContact *tp_contact;
 
        if (block_signal > 0)
                return;
@@ -252,10 +247,12 @@ empathy_contact_block_menu_item_toggled (GtkCheckMenuItem *item,
                        return;
        }
 
-       manager = empathy_contact_manager_dup_singleton ();
-       empathy_contact_list_set_blocked (EMPATHY_CONTACT_LIST (manager),
-                                         contact, blocked, abusive);
-       g_object_unref (manager);
+       tp_contact = empathy_contact_get_tp_contact (contact);
+
+       if (blocked)
+               tp_contact_block_async (tp_contact, abusive, NULL, NULL);
+       else
+               tp_contact_unblock_async (tp_contact, NULL, NULL);
 
        /* update the toggle with the blocked status */
        block_signal++;
@@ -267,34 +264,27 @@ static GtkWidget *
 empathy_contact_block_menu_item_new (EmpathyContact *contact)
 {
        GtkWidget *item;
-       EmpathyContactManager *manager;
        TpConnection *connection;
-       EmpathyContactListFlags flags;
-       gboolean blocked;
+       TpContact *tp_contact;
 
        g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
-       manager = empathy_contact_manager_dup_singleton ();
-
        if (!empathy_contact_manager_initialized ()) {
                return NULL;
        }
 
        connection = empathy_contact_get_connection (contact);
 
-       flags = empathy_contact_manager_get_flags_for_connection (manager,
-                       connection);
-
-       if (!(flags & EMPATHY_CONTACT_LIST_CAN_BLOCK)) {
+       if (!tp_proxy_has_interface_by_id (connection,
+               TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING))
                return NULL;
-       }
 
        item = gtk_check_menu_item_new_with_mnemonic (_("_Block Contact"));
-       blocked = empathy_contact_list_get_blocked (
-                       EMPATHY_CONTACT_LIST (manager),
-                       contact);
 
-       gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), blocked);
+       tp_contact = empathy_contact_get_tp_contact (contact);
+
+       gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item),
+                       tp_contact_is_blocked (tp_contact));
 
        g_signal_connect (item, "toggled",
                        G_CALLBACK (empathy_contact_block_menu_item_toggled),
@@ -525,7 +515,6 @@ contact_edit_menu_item_activate_cb (EmpathyContact *contact)
 GtkWidget *
 empathy_contact_edit_menu_item_new (EmpathyContact *contact)
 {
-       EmpathyContactManager *manager;
        GtkWidget *item;
        GtkWidget *image;
        gboolean enable = FALSE;
@@ -534,17 +523,12 @@ empathy_contact_edit_menu_item_new (EmpathyContact *contact)
 
        if (empathy_contact_manager_initialized ()) {
                TpConnection *connection;
-               EmpathyContactListFlags flags;
 
-               manager = empathy_contact_manager_dup_singleton ();
                connection = empathy_contact_get_connection (contact);
-               flags = empathy_contact_manager_get_flags_for_connection (
-                               manager, connection);
-
-               enable = (flags & EMPATHY_CONTACT_LIST_CAN_ALIAS ||
-                         flags & EMPATHY_CONTACT_LIST_CAN_GROUP);
 
-               g_object_unref (manager);
+               enable = (tp_connection_can_set_contact_alias (connection) ||
+                         tp_connection_get_group_storage (connection) !=
+                                        TP_CONTACT_METADATA_STORAGE_TYPE_NONE);
        }
 
        item = gtk_image_menu_item_new_with_mnemonic (
index bfc42bbb04142b41fa8f40b2257097cf2373e70e..89a7918aab5d056b6747771eecbe6e2f501027e3 100644 (file)
@@ -28,8 +28,8 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
-#include <libempathy/empathy-contact-manager.h>
 #include <libempathy/empathy-tp-contact-factory.h>
+#include <libempathy/empathy-utils.h>
 
 #include <libempathy-gtk/empathy-account-chooser.h>
 #include <libempathy-gtk/empathy-cell-renderer-text.h>
@@ -120,7 +120,7 @@ on_searcher_reset (GObject *source_object,
   gtk_list_store_clear (priv->store);
   tp_contact_search_start (priv->searcher, search);
 
-  g_hash_table_destroy (search);
+  g_hash_table_unref (search);
 }
 
 static void
@@ -142,7 +142,6 @@ on_get_contact_factory_get_from_id_cb (TpConnection *connection,
     gpointer user_data,
     GObject *object)
 {
-    EmpathyContactManager *manager = empathy_contact_manager_dup_singleton ();
     const gchar *message = user_data;
 
     if (error != NULL)
@@ -151,8 +150,7 @@ on_get_contact_factory_get_from_id_cb (TpConnection *connection,
         return;
       }
 
-    empathy_contact_list_add (EMPATHY_CONTACT_LIST (manager), contact,
-        message);
+    empathy_contact_add_to_contact_list (contact, message);
 }
 
 static void
@@ -342,15 +340,11 @@ check_request_message_available (EmpathyContactSearchDialog *self,
     TpConnection *conn)
 {
   EmpathyContactSearchDialogPrivate *priv = GET_PRIVATE (self);
-  EmpathyContactManager *manager = empathy_contact_manager_dup_singleton ();
-  EmpathyContactListFlags flags;
-
-  flags = empathy_contact_manager_get_flags_for_connection (manager, conn);
 
   gtk_widget_set_visible (priv->message_window,
-      flags & EMPATHY_CONTACT_LIST_MESSAGE_ADD);
+      tp_connection_get_can_change_contact_list (conn));
   gtk_widget_set_visible (priv->message_label,
-      flags & EMPATHY_CONTACT_LIST_MESSAGE_ADD);
+      tp_connection_get_can_change_contact_list (conn));
 }
 
 static void
@@ -504,11 +498,11 @@ empathy_contact_search_dialog_init (EmpathyContactSearchDialog *self)
   /* Title */
   gtk_window_set_title (GTK_WINDOW (self), _("Search contacts"));
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
 
   /* Account chooser */
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   label = gtk_label_new (_("Account:"));
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
   gtk_size_group_add_widget (size_group, label);
@@ -531,7 +525,7 @@ empathy_contact_search_dialog_init (EmpathyContactSearchDialog *self)
 #endif
 
   /* Search input */
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   label = gtk_label_new (_("Search: "));
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
   gtk_size_group_add_widget (size_group, label);
index 8e5666520b924b3817fcc9c4247e60f48a559095..476fb6217b9f45861f1a8de2a12c3c5876c25888 100644 (file)
@@ -40,7 +40,6 @@
 #include <libempathy/empathy-contact-manager.h>
 #include <libempathy/empathy-contact-list.h>
 #include <libempathy/empathy-location.h>
-#include <libempathy/empathy-request-util.h>
 #include <libempathy/empathy-time.h>
 #include <libempathy/empathy-utils.h>
 
@@ -479,64 +478,19 @@ contact_widget_details_update_edit (EmpathyContactWidget *information)
   return n_rows;
 }
 
-static gboolean
-channel_name_activated_cb (
-    GtkLabel *label,
-    gchar *uri,
-    EmpathyContactWidget *information)
-{
-  TpAccount *account = empathy_contact_get_account (information->contact);
-
-  empathy_join_muc (account, uri, empathy_get_current_action_time ());
-  return TRUE;
-}
-
 static void
-add_channel_list (
-    EmpathyContactWidget *information,
-    GPtrArray *channels,
-    guint row)
+add_row (GtkGrid *grid,
+    guint row,
+    GtkWidget *title,
+    GtkWidget *value)
 {
-  GtkWidget *w;
-  GString *label_markup = g_string_new ("");
-  guint i;
-
-  w = gtk_label_new (_("Channels:"));
-  gtk_grid_attach (GTK_GRID (information->grid_details),
-      w, 0, row, 1, 1);
-  gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
-  gtk_widget_show (w);
+  gtk_grid_attach (grid, title, 0, row, 1, 1);
+  gtk_misc_set_alignment (GTK_MISC (title), 0, 0.5);
+  gtk_widget_show (title);
 
-  for (i = 0; i < channels->len; i++)
-    {
-      const gchar *channel_name = g_ptr_array_index (channels, i);
-      /* We abuse the URI of the link to hold the channel name. It seems to
-       * be okay to just use it essentially verbatim, rather than trying to
-       * ensure it's actually a valid URI.  g_string_append_uri_escaped()
-       * escapes way more than we actually need to; so we're just using
-       * g_markup_escape_text directly.
-       */
-      gchar *escaped = g_markup_escape_text (channel_name, -1);
-
-      if (i > 0)
-        g_string_append (label_markup, ", ");
-
-      g_string_append_printf (label_markup, "<a href='%s'>%s</a>",
-          escaped, channel_name);
-      g_free (escaped);
-    }
-
-  w = gtk_label_new (NULL);
-  gtk_label_set_markup (GTK_LABEL (w), label_markup->str);
-  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
-  g_signal_connect (w, "activate-link",
-      (GCallback) channel_name_activated_cb, information);
-  gtk_grid_attach (GTK_GRID (information->grid_details),
-      w, 1, row, 1, 1);
-  gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
-  gtk_widget_show (w);
-
-  g_string_free (label_markup, TRUE);
+  gtk_grid_attach (grid, value, 1, row, 1, 1);
+  gtk_misc_set_alignment (GTK_MISC (value), 0, 0.5);
+  gtk_widget_show (value);
 }
 
 static guint
@@ -545,7 +499,8 @@ contact_widget_details_update_show (EmpathyContactWidget *information)
   TpContact *contact;
   GList *info, *l;
   guint n_rows = 0;
-  GPtrArray *channels = g_ptr_array_new ();
+  GtkWidget *channels_label;
+  TpAccount *account;
 
   contact = empathy_contact_get_tp_contact (information->contact);
   info = tp_contact_get_contact_info (contact);
@@ -555,7 +510,7 @@ contact_widget_details_update_show (EmpathyContactWidget *information)
       TpContactInfoField *field = l->data;
       const gchar *value;
       gchar *markup = NULL, *title;
-      GtkWidget *w;
+      GtkWidget *title_widget, *value_widget;
       EmpathyContactInfoFormatFunc format;
 
       if (field->field_value == NULL || field->field_value[0] == NULL)
@@ -563,12 +518,6 @@ contact_widget_details_update_show (EmpathyContactWidget *information)
 
       value = field->field_value[0];
 
-      if (!tp_strdiff (field->field_name, "x-irc-channel"))
-        {
-          g_ptr_array_add (channels, (gpointer) field->field_value[0]);
-          continue;
-        }
-
       if (!empathy_contact_info_lookup_field (field->field_name, NULL, &format))
         {
           DEBUG ("Unhandled ContactInfo field: %s", field->field_name);
@@ -590,42 +539,45 @@ contact_widget_details_update_show (EmpathyContactWidget *information)
       /* Add Title */
       title = empathy_contact_info_field_label (field->field_name,
           field->parameters);
-      w = gtk_label_new (title);
+      title_widget = gtk_label_new (title);
       g_free (title);
 
-      gtk_grid_attach (GTK_GRID (information->grid_details),
-          w, 0, n_rows, 1, 1);
-      gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
-      gtk_widget_show (w);
-
       /* Add Value */
-      w = gtk_label_new (value);
+      value_widget = gtk_label_new (value);
       if (markup != NULL)
         {
-          gtk_label_set_markup (GTK_LABEL (w), markup);
+          gtk_label_set_markup (GTK_LABEL (value_widget), markup);
           g_free (markup);
         }
 
       if ((information->flags & EMPATHY_CONTACT_WIDGET_FOR_TOOLTIP) == 0)
-        gtk_label_set_selectable (GTK_LABEL (w), TRUE);
+        gtk_label_set_selectable (GTK_LABEL (value_widget), TRUE);
 
-      gtk_grid_attach (GTK_GRID (information->grid_details),
-          w, 1, n_rows, 1, 1);
-      gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
-      gtk_widget_show (w);
+      add_row (GTK_GRID (information->grid_details), n_rows, title_widget,
+          value_widget);
 
       n_rows++;
     }
 
-  g_list_free (info);
+  account = empathy_contact_get_account (information->contact);
 
-  if (channels->len > 0)
+  channels_label = empathy_contact_info_create_channel_list_label (account,
+      info, n_rows);
+
+  if (channels_label != NULL)
     {
-      add_channel_list (information, channels, n_rows);
+      GtkWidget *title_widget;
+
+      title_widget =  gtk_label_new (_("Channels:"));
+
+      add_row (GTK_GRID (information->grid_details), n_rows, title_widget,
+          channels_label);
+
       n_rows++;
     }
 
-  g_ptr_array_unref (channels);
+  g_list_free (info);
+
   return n_rows;
 }
 
@@ -1673,7 +1625,7 @@ contact_widget_contact_setup (EmpathyContactWidget *information)
   else
     {
       /* Pack the protocol icon with the account name in an hbox */
-      information->widget_account = gtk_hbox_new (FALSE, 6);
+      information->widget_account = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 
       information->label_account = gtk_label_new (NULL);
       if (!(information->flags & EMPATHY_CONTACT_WIDGET_FOR_TOOLTIP)) {
index 997225775ee0ad2042ceacbe4ce66583fc98217e..695d1ee3c8a2ccf057ef18aeed422ecbbfc530c4 100644 (file)
 #include <telepathy-glib/util.h>
 
 #include <libempathy/empathy-time.h>
+#include <libempathy/empathy-request-util.h>
 
 #include "empathy-contactinfo-utils.h"
 #include "empathy-string-parser.h"
+#include "empathy-ui-utils.h"
 
 static gchar *
 linkify_first_value (GStrv values)
@@ -204,7 +206,7 @@ build_parameters_string (GStrv parameters)
   g_ptr_array_add (output, NULL); /* NULL-terminate */
 
   join = g_strjoinv (", ", (char **) output->pdata);
-  g_ptr_array_free (output, TRUE);
+  g_ptr_array_unref (output);
 
   return join;
 }
@@ -264,3 +266,68 @@ empathy_contact_info_field_spec_cmp (TpContactInfoFieldSpec *spec1,
 {
     return contact_info_field_name_cmp (spec1->name, spec2->name);
 }
+
+static gboolean
+channel_name_activated_cb (
+    GtkLabel *label,
+    gchar *uri,
+    TpAccount *account)
+{
+  empathy_join_muc (account, uri, empathy_get_current_action_time ());
+  return TRUE;
+}
+
+GtkWidget *
+empathy_contact_info_create_channel_list_label (TpAccount *account,
+    GList *info,
+    guint row)
+{
+  GtkWidget *label = NULL;
+  GString *label_markup = g_string_new ("");
+  guint i;
+  GPtrArray *channels;
+  GList *l;
+
+  /* Is there channels? */
+  channels = g_ptr_array_new ();
+
+  for (l = info; l != NULL; l = l->next)
+    {
+      TpContactInfoField *field = l->data;
+
+      if (!tp_strdiff (field->field_name, "x-irc-channel"))
+        g_ptr_array_add (channels, (gpointer) field->field_value[0]);
+    }
+
+  if (channels->len == 0)
+    goto out;
+
+  for (i = 0; i < channels->len; i++)
+    {
+      const gchar *channel_name = g_ptr_array_index (channels, i);
+      /* We abuse the URI of the link to hold the channel name. It seems to
+       * be okay to just use it essentially verbatim, rather than trying to
+       * ensure it's actually a valid URI. */
+      gchar *escaped = g_markup_escape_text (channel_name, -1);
+
+      if (i > 0)
+        g_string_append (label_markup, ", ");
+
+      g_string_append_printf (label_markup, "<a href='%s'>%s</a>",
+          escaped, channel_name);
+      g_free (escaped);
+    }
+
+  label = gtk_label_new (NULL);
+  gtk_label_set_markup (GTK_LABEL (label), label_markup->str);
+  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+
+  g_signal_connect (label, "activate-link",
+      (GCallback) channel_name_activated_cb, account);
+
+out:
+  g_ptr_array_unref (channels);
+  g_string_free (label_markup, TRUE);
+
+  return label;
+}
index 1d89ff2294d0470d1db8191f318c917134bff73a..a49e807aae6463c919a358e147635b32575c7737 100644 (file)
@@ -22,6 +22,8 @@
 #define __EMPATHY_CONTACTINFO_UTILS_H__
 
 #include <glib.h>
+#include <gtk/gtk.h>
+
 #include <telepathy-glib/connection.h>
 
 G_BEGIN_DECLS
@@ -39,6 +41,10 @@ gint empathy_contact_info_field_cmp (TpContactInfoField *field1,
 gint empathy_contact_info_field_spec_cmp (TpContactInfoFieldSpec *spec1,
     TpContactInfoFieldSpec *spec2);
 
+GtkWidget * empathy_contact_info_create_channel_list_label (TpAccount *account,
+    GList *info,
+    guint row);
+
 G_END_DECLS
 
 #endif /*  __EMPATHY_UTILS_H__ */
index 529aff26f49ba26478761e62dc6305106c5b84ab..1782dc8072b5bb91984457633c008c9a22ea273a 100644 (file)
@@ -140,7 +140,7 @@ empathy_dialpad_widget_init (EmpathyDialpadWidget *self)
 
   for (i = 0; dtmfbuttons[i].label != NULL; i++)
     {
-      GtkWidget *vbox = gtk_vbox_new (FALSE, 0);
+      GtkWidget *vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       GtkWidget *button = gtk_button_new ();
       GtkWidget *label;
       gchar *str;
index 33e4d8d5adb9ed13fb6800a1d9cfd156ddc5744e..efb58fa99dc55d84c4b1bf8461e83d70a947be2f 100644 (file)
@@ -32,7 +32,7 @@
 #include <folks/folks.h>
 
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-contact-manager.h>
+#include <libempathy/empathy-connection-aggregator.h>
 
 #include "empathy-groups-widget.h"
 #include "empathy-ui-utils.h"
@@ -150,7 +150,7 @@ static void
 populate_data (EmpathyGroupsWidget *self)
 {
   EmpathyGroupsWidgetPriv *priv = GET_PRIV (self);
-  EmpathyContactManager *manager;
+  EmpathyConnectionAggregator *aggregator;
   GtkTreeIter iter;
   GeeSet *member_groups;
   GList *all_groups, *l;
@@ -158,12 +158,12 @@ populate_data (EmpathyGroupsWidget *self)
   /* Remove the old groups */
   gtk_list_store_clear (priv->group_store);
 
-  /* FIXME: We have to get the whole group list from EmpathyContactManager, as
-   * libfolks hasn't grown API to get the whole group list yet. (bgo#627398) */
-  manager = empathy_contact_manager_dup_singleton ();
-  all_groups = empathy_contact_list_get_all_groups (
-      EMPATHY_CONTACT_LIST (manager));
-  g_object_unref (manager);
+  /* FIXME: We have to get the whole group list from
+   * EmpathyConnectionAggregator, as libfolks hasn't grown API to get the whole
+   * group list yet. (bgo#627398) */
+  aggregator = empathy_connection_aggregator_dup_singleton ();
+  all_groups = empathy_connection_aggregator_get_all_groups (aggregator);
+  g_object_unref (aggregator);
 
   /* Get the list of groups that this #FolksGroupDetails is currently in */
   member_groups = folks_group_details_get_groups (priv->group_details);
@@ -340,7 +340,7 @@ set_up (EmpathyGroupsWidget *self)
   alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
   gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0);
 
-  vbox = GTK_BOX (gtk_vbox_new (FALSE, 6));
+  vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 6));
 
   label = gtk_label_new (_("Select the groups you want this contact to appear "
       "in.  Note that you can select more than one group or no groups."));
@@ -350,7 +350,7 @@ set_up (EmpathyGroupsWidget *self)
   gtk_box_pack_start (vbox, label, FALSE, FALSE, 0);
   gtk_widget_show (label);
 
-  hbox = GTK_BOX (gtk_hbox_new (FALSE, 12));
+  hbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12));
 
   priv->add_group_entry = gtk_entry_new ();
   g_signal_connect (priv->add_group_entry, "changed",
index e1bd6f11fc173bd643a5dfcf657387173c4d1c05..ed566329df593641069569e5fc951ec8f288eb7d 100644 (file)
@@ -182,8 +182,6 @@ empathy_block_individual_dialog_show (GtkWindow *parent,
     GdkPixbuf *avatar,
     gboolean *abusive)
 {
-  EmpathyContactManager *contact_manager =
-    empathy_contact_manager_dup_singleton ();
   GtkWidget *dialog;
   GtkWidget *abusive_check = NULL;
   GeeSet *personas;
@@ -214,9 +212,9 @@ empathy_block_individual_dialog_show (GtkWindow *parent,
     {
       TpfPersona *persona = gee_iterator_get (iter);
       TpContact *contact;
-      EmpathyContactListFlags flags;
       GString *s;
       char *str;
+      TpConnection *conn;
 
       if (!TPF_IS_PERSONA (persona))
           goto while_finish;
@@ -225,10 +223,10 @@ empathy_block_individual_dialog_show (GtkWindow *parent,
       if (contact == NULL)
         goto while_finish;
 
-      flags = empathy_contact_manager_get_flags_for_connection (
-          contact_manager, tp_contact_get_connection (contact));
+      conn = tp_contact_get_connection (contact);
 
-      if (flags & EMPATHY_CONTACT_LIST_CAN_BLOCK)
+      if (tp_proxy_has_interface_by_id (conn,
+            TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING))
         {
           s = blocked_str;
           npersonas_blocked++;
@@ -239,7 +237,7 @@ empathy_block_individual_dialog_show (GtkWindow *parent,
           npersonas_notblocked++;
         }
 
-      if (flags & EMPATHY_CONTACT_LIST_CAN_REPORT_ABUSIVE)
+      if (tp_connection_can_report_abusive (conn))
         can_report_abuse = TRUE;
 
       str = contact_pretty_name (contact);
@@ -291,7 +289,6 @@ while_finish:
       gtk_widget_show (abusive_check);
     }
 
-  g_object_unref (contact_manager);
   g_string_free (text, TRUE);
   g_string_free (blocked_str, TRUE);
   g_string_free (notblocked_str, TRUE);
index 793c2827fa09a4d30f03f281f6db161a71fd597f..7de5e4addda8f579c6acfe58de27ecf0c0969249 100644 (file)
@@ -35,6 +35,7 @@
 
 #include "empathy-individual-linker.h"
 #include "empathy-individual-store.h"
+#include "empathy-individual-store-manager.h"
 #include "empathy-individual-view.h"
 #include "empathy-individual-widget.h"
 #include "empathy-persona-store.h"
@@ -355,17 +356,18 @@ set_up (EmpathyIndividualLinker *self)
 
   priv = GET_PRIV (self);
 
-  top_vbox = gtk_vbox_new (FALSE, 6);
+  top_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 
   /* Layout panes */
-  paned = GTK_PANED (gtk_hpaned_new ());
+
+  paned = GTK_PANED (gtk_paned_new (GTK_ORIENTATION_HORIZONTAL));
 
   /* Left column heading */
   alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
   gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 0, 6);
   gtk_widget_show (alignment);
 
-  vbox = GTK_BOX (gtk_vbox_new (FALSE, 6));
+  vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 6));
   label = gtk_label_new (NULL);
   tmp = g_strdup_printf ("<b>%s</b>", _("Select contacts to link"));
   gtk_label_set_markup (GTK_LABEL (label), tmp);
@@ -375,7 +377,8 @@ set_up (EmpathyIndividualLinker *self)
 
   /* Individual selector */
   individual_manager = empathy_individual_manager_dup_singleton ();
-  priv->individual_store = empathy_individual_store_new (individual_manager);
+  priv->individual_store = EMPATHY_INDIVIDUAL_STORE (
+      empathy_individual_store_manager_new (individual_manager));
   g_object_unref (individual_manager);
 
   empathy_individual_store_set_show_protocols (priv->individual_store, FALSE);
@@ -439,7 +442,7 @@ set_up (EmpathyIndividualLinker *self)
   gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 6, 0);
   gtk_widget_show (alignment);
 
-  vbox = GTK_BOX (gtk_vbox_new (FALSE, 6));
+  vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 6));