Merge call branch from Elliot Fairweather with cleanups from Xavier Claessens.

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

diff --git a/libempathy/empathy-tp-chatroom.h b/libempathy/empathy-tp-chatroom.h
index 488ac74fb44908a220f4c786f63519c0d0a1e23f..8f0a181005bc8f25b48804a6eb84be73bd7cd9fe 100644 (file)
--- a/libempathy/empathy-tp-chatroom.h
+++ b/libempathy/empathy-tp-chatroom.h
@@ -2,20 +2,19 @@
 /*
  * 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>
  */
@@ -56,7 +55,7 @@ GType              empathy_tp_chatroom_get_type          (void) G_GNUC_CONST;
 EmpathyTpChatroom *empathy_tp_chatroom_new               (McAccount          *account,
                                                          TpChan             *tp_chan);
 gboolean           empathy_tp_chatroom_get_invitation    (EmpathyTpChatroom  *chatroom,
-                                                         GossipContact     **contact,
+                                                         EmpathyContact     **contact,
                                                          const gchar       **message);
 void               empathy_tp_chatroom_accept_invitation (EmpathyTpChatroom *chatroom);
 void               empathy_tp_chatroom_set_topic         (EmpathyTpChatroom *chatroom,