Merge branch 'gnome-3-8'

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

diff --git a/libempathy/empathy-chatroom-manager.h b/libempathy/empathy-chatroom-manager.h
index 8ee2a897a93ce187ca5dc2ae3455e2f0d7c33913..498d225ad9395421ca43139010b15ce89d3a8920 100644 (file)
--- a/libempathy/empathy-chatroom-manager.h
+++ b/libempathy/empathy-chatroom-manager.h
@@ -1,7 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2004-2007 Imendio AB
- * Copyright (C) 2007-2008 Collabora Ltd.
+ * Copyright (C) 2007-2010 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
@@ -26,11 +25,9 @@
 #define __EMPATHY_CHATROOM_MANAGER_H__
 
 #include <glib-object.h>
-
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-chatroom.h"
-#include "empathy-dispatcher.h"
 
 G_BEGIN_DECLS
 
@@ -44,30 +41,41 @@ G_BEGIN_DECLS
 typedef struct _EmpathyChatroomManager      EmpathyChatroomManager;
 typedef struct _EmpathyChatroomManagerClass EmpathyChatroomManagerClass;
 
-struct _EmpathyChatroomManager {
-       GObject parent;
-       gpointer priv;
+struct _EmpathyChatroomManager
+{
+  GObject parent;
+  gpointer priv;
 };
 
-struct _EmpathyChatroomManagerClass {
-       GObjectClass parent_class;
+struct _EmpathyChatroomManagerClass
+{
+  GObjectClass parent_class;
 };
 
-GType                  empathy_chatroom_manager_get_type      (void) G_GNUC_CONST;
-EmpathyChatroomManager *empathy_chatroom_manager_dup_singleton (const gchar *file);
-gboolean               empathy_chatroom_manager_add           (EmpathyChatroomManager *manager,
-                                                             EmpathyChatroom        *chatroom);
-void                   empathy_chatroom_manager_remove        (EmpathyChatroomManager *manager,
-                                                             EmpathyChatroom        *chatroom);
-EmpathyChatroom *       empathy_chatroom_manager_find          (EmpathyChatroomManager *manager,
-                                                             TpAccount               *account,
-                                                             const gchar             *room);
-GList *                empathy_chatroom_manager_get_chatrooms (EmpathyChatroomManager *manager,
-                                                             TpAccount               *account);
-guint                  empathy_chatroom_manager_get_count     (EmpathyChatroomManager *manager,
-                                                             TpAccount               *account);
-void                   empathy_chatroom_manager_observe       (EmpathyChatroomManager *manager,
-                                                             EmpathyDispatcher *dispatcher);
+GType empathy_chatroom_manager_get_type (void) G_GNUC_CONST;
+
+EmpathyChatroomManager * empathy_chatroom_manager_dup_singleton (
+    const gchar *file);
+
+gboolean empathy_chatroom_manager_add (EmpathyChatroomManager *manager,
+    EmpathyChatroom *chatroom);
+
+void empathy_chatroom_manager_remove (EmpathyChatroomManager *manager,
+    EmpathyChatroom *chatroom);
+
+EmpathyChatroom * empathy_chatroom_manager_find (
+    EmpathyChatroomManager *manager,
+    TpAccount *account,
+    const gchar *room);
+
+EmpathyChatroom * empathy_chatroom_manager_ensure_chatroom (
+    EmpathyChatroomManager *manager,
+    TpAccount *account,
+    const gchar *room,
+    const gchar *name);
+
+GList * empathy_chatroom_manager_get_chatrooms (EmpathyChatroomManager *manager,
+    TpAccount *account);
 
 G_END_DECLS