salut-connection: Merge src/connection.h and salut/connection.h

SalutConnection is not used by plugins anymore so this patch merges
src/connection.h and salut/connection.h into a single file.

3 files changed, 1 insertions, 57 deletions

diff --git a/salut/Makefile.am b/salut/Makefile.am
index 4c3ce25a..14653c1f 100644
--- a/salut/Makefile.am
+++ b/salut/Makefile.am
@@ -4,8 +4,8 @@ pkgconfig_DATA = telepathy-salut.pc
 
 salutincludedir = $(includedir)/telepathy-salut-0/salut
 salutinclude_HEADERS = \
-    connection.h \
     plugin.h \
+    plugin-connection.h \
     protocol.h \
     caps-channel-manager.h \
     capabilities.h \
diff --git a/salut/connection.h b/salut/connection.h
deleted file mode 100644
index 34a89363..00000000
--- a/salut/connection.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * connection.h - connection API available to telepathy-salut plugins
- * Copyright © 2010 Collabora Ltd.
- * Copyright © 2010 Nokia Corporation
- *
- * 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.
- *
- * 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
- */
-
-#ifndef SALUT_PLUGINS_CONNECTION_H
-#define SALUT_PLUGINS_CONNECTION_H
-
-#include <wocky/wocky.h>
-
-#include <salut/plugin-connection.h>
-
-G_BEGIN_DECLS
-
-#define SALUT_TYPE_CONNECTION (salut_connection_get_type ())
-#define SALUT_CONNECTION(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), SALUT_TYPE_CONNECTION, SalutConnection))
-#define SALUT_CONNECTION_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), SALUT_TYPE_CONNECTION, \
-      SalutConnectionClass))
-#define SALUT_IS_CONNECTION(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), SALUT_TYPE_CONNECTION))
-#define SALUT_IS_CONNECTION_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), SALUT_TYPE_CONNECTION))
-#define SALUT_CONNECTION_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), SALUT_TYPE_CONNECTION, \
-      SalutConnectionClass))
-
-typedef struct _SalutConnection SalutConnection;
-typedef struct _SalutConnectionClass SalutConnectionClass;
-
-GType salut_connection_get_type (void);
-
-WockySession * salut_connection_get_session (SalutPluginConnection *connection);
-
-const gchar * salut_connection_get_name (SalutPluginConnection *connection);
-
-G_END_DECLS
-
-#endif
diff --git a/salut/sidecar.h b/salut/sidecar.h
index 1f5e78ff..00691fe6 100644
--- a/salut/sidecar.h
+++ b/salut/sidecar.h
@@ -23,7 +23,6 @@
 
 #include <glib-object.h>
 
-#include <salut/connection.h>
 
 G_BEGIN_DECLS