Remove SalutPluginContact and salut_send_ll_pep_event

They've been superseded by stuff in Wocky

3 files changed, 1 insertions, 90 deletions

diff --git a/salut/Makefile.am b/salut/Makefile.am
index 92f5c615..f4b29c7b 100644
--- a/salut/Makefile.am
+++ b/salut/Makefile.am
@@ -6,11 +6,9 @@ salutincludedir = $(includedir)/telepathy-salut-0/salut
 salutinclude_HEADERS = \
     plugin.h \
     plugin-connection.h \
-    plugin-contact.h \
     caps-channel-manager.h \
     capabilities.h \
     capability-set.h \
-    sidecar.h \
-    util.h
+    sidecar.h
 
 endif
diff --git a/salut/plugin-contact.h b/salut/plugin-contact.h
deleted file mode 100644
index b9815bef..00000000
--- a/salut/plugin-contact.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * plugin-contact.h — Connection API available to telepathy-salut plugins
- * Copyright © 2012 Collabora Ltd.
- *
- * 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_PLUGIN_CONTACT_H
-#define SALUT_PLUGIN_CONTACT_H
-
-#include <glib-object.h>
-
-#include <wocky/wocky.h>
-#include <salut/capability-set.h>
-
-G_BEGIN_DECLS
-
-typedef struct _SalutPluginContact SalutPluginContact;
-typedef struct _SalutPluginContactInterface SalutPluginContactInterface;
-
-#define SALUT_TYPE_PLUGIN_CONTACT (salut_plugin_contact_get_type ())
-#define SALUT_PLUGIN_CONTACT(o) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((o), SALUT_TYPE_PLUGIN_CONTACT, \
-                               SalutPluginContact))
-#define SALUT_IS_PLUGIN_CONTACT(o) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((o), SALUT_TYPE_PLUGIN_CONTACT))
-#define SALUT_PLUGIN_CONTACT_GET_IFACE(o) \
-  (G_TYPE_INSTANCE_GET_INTERFACE ((o), SALUT_TYPE_PLUGIN_CONTACT, \
-                                  SalutPluginContactInterface))
-
-GType salut_plugin_contact_get_type (void) G_GNUC_CONST;
-
-typedef GabbleCapabilitySet * (*SalutPluginContactGetCapsFunc) (
-    SalutPluginContact *plugin_contact);
-
-struct _SalutPluginContactInterface
-{
-  GTypeInterface parent;
-  SalutPluginContactGetCapsFunc get_caps;
-};
-
-GabbleCapabilitySet *salut_plugin_contact_get_caps (
-    SalutPluginContact *plugin_contact);
-
-G_END_DECLS
-
-#endif
diff --git a/salut/util.h b/salut/util.h
deleted file mode 100644
index 379658b1..00000000
--- a/salut/util.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * plugin-util.h - Headers for Salut plugins utility functions
- * Copyright (C) 2011 Collabora Ltd.
- *
- * 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_UTIL_H
-#define SALUT_UTIL_H
-
-#include <wocky/wocky.h>
-
-void salut_send_ll_pep_event (WockySession *session,
-    WockyStanza *stanza);
-
-#endif /* SALUT_UTIL_H */