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

[empathy.git] / libempathy-gtk / empathy-call-window.h

diff --git a/libempathy-gtk/empathy-call-window.h b/libempathy-gtk/empathy-call-window.h
index c8c6d7f0ed70385d149561042da2a3e00646d7db..7d65aaeaec79258f4caf2930cbbc8b21e2064585 100644 (file)
--- a/libempathy-gtk/empathy-call-window.h
+++ b/libempathy-gtk/empathy-call-window.h
@@ -1,36 +1,34 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */

 /*
 /*

- * Copyright (C) 2007 Elliot Fairweather
- * Copyright (C) 2007 Collabora Ltd.
+ *  Copyright (C) 2007 Elliot Fairweather

  *
  *

- * 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 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.
+ *  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
+ *  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: Elliot Fairweather <elliot.fairweather@collabora.co.uk>
- *          Xavier Claessens <xclaesse@gmail.com>
+ *  Authors: Elliot Fairweather <elliot.fairweather@collabora.co.uk>

  */
 
 #ifndef __EMPATHY_CALL_WINDOW_H__
 #define __EMPATHY_CALL_WINDOW_H__
 
  */
 
 #ifndef __EMPATHY_CALL_WINDOW_H__
 #define __EMPATHY_CALL_WINDOW_H__
 

+#include <gtk/gtk.h>
+

 #include <libempathy/empathy-tp-call.h>
 
 G_BEGIN_DECLS
 
 #include <libempathy/empathy-tp-call.h>
 
 G_BEGIN_DECLS
 

-GtkWidget * empathy_call_window_show (EmpathyTpCall *call);
+GtkWidget *empathy_call_window_new (EmpathyTpCall *call);

 
 G_END_DECLS
 
 #endif /* __EMPATHY_CALL_WINDOW_H__ */
 
 G_END_DECLS
 
 #endif /* __EMPATHY_CALL_WINDOW_H__ */

-