Merge remote-tracking branch 'jonny/ft'

[empathy.git] / libempathy / empathy-contact-manager.h

diff --git a/libempathy/empathy-contact-manager.h b/libempathy/empathy-contact-manager.h
index 768301ae72aad05fd202901acefcc395c6c9f3f0..4d1493091c7e18403d22019e1755a3e2865fd1ce 100644 (file)
--- a/libempathy/empathy-contact-manager.h
+++ b/libempathy/empathy-contact-manager.h
@@ -1,21 +1,20 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 2007 Collabora Ltd.
+ * 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 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>
  */
@@ -25,10 +24,9 @@
 
 #include <glib.h>
 
-#include <libmissioncontrol/mc-account.h>
-
 #include "empathy-contact.h"
 #include "empathy-tp-contact-list.h"
+#include "empathy-contact-list.h"
 
 G_BEGIN_DECLS
 
@@ -41,29 +39,21 @@ G_BEGIN_DECLS
 
 typedef struct _EmpathyContactManager      EmpathyContactManager;
 typedef struct _EmpathyContactManagerClass EmpathyContactManagerClass;
-typedef struct _EmpathyContactManagerPriv  EmpathyContactManagerPriv;
 
 struct _EmpathyContactManager {
-       GObject      parent;
+       GObject parent;
+       gpointer priv;
 };
 
 struct _EmpathyContactManagerClass {
        GObjectClass parent_class;
 };
 
-GType                  empathy_contact_manager_get_type     (void) G_GNUC_CONST;
-EmpathyContactManager *empathy_contact_manager_new          (void);
-EmpathyTpContactList * empathy_contact_manager_get_list     (EmpathyContactManager *manager,
-                                                            McAccount             *account);
-EmpathyContact *        empathy_contact_manager_get_user     (EmpathyContactManager *manager,
-                                                            McAccount             *account);
-EmpathyContact *        empathy_contact_manager_create       (EmpathyContactManager *manager,
-                                                            McAccount             *account,
-                                                            const gchar           *id);
-void                   empathy_contact_manager_rename_group (EmpathyContactManager *manager,
-                                                            const gchar           *old_group,
-                                                            const gchar           *new_group);
-GList *                empathy_contact_manager_get_groups   (EmpathyContactManager *manager);
+GType                  empathy_contact_manager_get_type (void) G_GNUC_CONST;
+gboolean               empathy_contact_manager_initialized (void);
+EmpathyContactManager *empathy_contact_manager_dup_singleton  (void);
+EmpathyTpContactList * empathy_contact_manager_get_list (EmpathyContactManager *manager,
+                                                        TpConnection          *connection);
 
 G_END_DECLS