Conflicts:

[empathy.git] / libempathy / empathy-tp-contact-list.c

diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c
index 5b0062f9e3fc5e8169f4469fde5d9ee2562d5e93..8051501778d01f7169f224daf1c55e82267573ea 100644 (file)
--- a/libempathy/empathy-tp-contact-list.c
+++ b/libempathy/empathy-tp-contact-list.c
@@ -3,20 +3,19 @@
  * Copyright (C) 2007 Xavier Claessens <xclaesse@gmail.com>
  * Copyright (C) 2007 Collabora Ltd.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  * 
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
@@ -346,9 +345,9 @@ static void
 tp_contact_list_newchannel_cb (DBusGProxy           *proxy,
                               const gchar          *object_path,
                               const gchar          *channel_type,
-                              TelepathyHandleType   handle_type,
+                              TpHandleType          handle_type,
                               guint                 channel_handle,
-                              gboolean              suppress_handle,
+                              gboolean              suppress_handler,
                               EmpathyTpContactList *list)
 {
        EmpathyTpContactListPriv *priv = GET_PRIV (list);
@@ -357,7 +356,7 @@ tp_contact_list_newchannel_cb (DBusGProxy           *proxy,
        const gchar              *bus_name;
 
        if (strcmp (channel_type, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST) != 0 ||
-           suppress_handle) {
+           suppress_handler) {
                return;
        }
 
@@ -542,18 +541,18 @@ tp_contact_list_disconnect (EmpathyTpContactList *list)
 }
 
 static void
-tp_contact_list_status_changed_cb (MissionControl                  *mc,
-                                  TelepathyConnectionStatus        status,
-                                  McPresence                       presence,
-                                  TelepathyConnectionStatusReason  reason,
-                                  const gchar                     *unique_name,
-                                  EmpathyTpContactList            *list)
+tp_contact_list_status_changed_cb (MissionControl           *mc,
+                                  TpConnectionStatus        status,
+                                  McPresence                presence,
+                                  TpConnectionStatusReason  reason,
+                                  const gchar              *unique_name,
+                                  EmpathyTpContactList     *list)
 {
        EmpathyTpContactListPriv *priv = GET_PRIV (list);
        McAccount                *account;
 
        account = mc_account_lookup (unique_name);
-       if (status != TP_CONN_STATUS_CONNECTED &&
+       if (status != TP_CONNECTION_STATUS_CONNECTED &&
            empathy_account_equal (account, priv->account)) {
                /* We are disconnected */
                tp_contact_list_disconnect (list);
@@ -663,11 +662,11 @@ tp_contact_list_setup (EmpathyTpContactList *list)
        }
 
        for (i = 0; i < channels->len; i++) {
-               GValueArray         *chan_struct;
-               const gchar         *object_path;
-               const gchar         *chan_iface;
-               TelepathyHandleType  handle_type;
-               guint                handle;
+               GValueArray  *chan_struct;
+               const gchar  *object_path;
+               const gchar  *chan_iface;
+               TpHandleType  handle_type;
+               guint         handle;
 
                chan_struct = g_ptr_array_index (channels, i);
                object_path = g_value_get_boxed (g_value_array_get_nth (chan_struct, 0));
@@ -896,7 +895,7 @@ tp_contact_list_get_group (EmpathyTpContactList *list,
                                      TP_IFACE_CHANNEL_TYPE_CONTACT_LIST,
                                      TP_HANDLE_TYPE_GROUP,
                                      handle,
-                                     FALSE,
+                                     TRUE,
                                      &object_path,
                                      &error)) {
                empathy_debug (DEBUG_DOMAIN,