remove unused src/handles.[ch]

20070416175431-418b8-b830a6c4ffe7cec0c558bbcfb5098e2775bfd0de.gz

19 files changed, 0 insertions, 125 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 1e16718b..8cbc7db1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,8 +48,6 @@ libgabble_convenience_la_our_sources = \
     gabble-roomlist-channel.h \
     gabble-roomlist-channel.c \
     gabble-types.h \
-    handles.h \
-    handles.c \
     im-factory.h \
     im-factory.c \
     media-factory.h \
diff --git a/src/gabble-connection.c b/src/gabble-connection.c
index 646535c1..2c0c3884 100644
--- a/src/gabble-connection.c
+++ b/src/gabble-connection.c
@@ -32,7 +32,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "handles.h"
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/enums.h>
 #include <telepathy-glib/errors.h>
diff --git a/src/gabble-im-channel.c b/src/gabble-im-channel.c
index 2930a138..96143563 100644
--- a/src/gabble-im-channel.c
+++ b/src/gabble-im-channel.c
@@ -33,7 +33,6 @@
 #include "gabble-connection.h"
 #include "presence.h"
 #include "presence-cache.h"
-#include "handles.h"
 #include "roster.h"
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/enums.h>
diff --git a/src/gabble-media-channel.h b/src/gabble-media-channel.h
index af308814..e71fe1e0 100644
--- a/src/gabble-media-channel.h
+++ b/src/gabble-media-channel.h
@@ -27,7 +27,6 @@
 #include <telepathy-glib/properties-mixin.h>
 
 #include "gabble-media-session.h"
-#include "handles.h"
 #include "presence.h"
 
 G_BEGIN_DECLS
diff --git a/src/gabble-media-session.c b/src/gabble-media-session.c
index aedaabab..f0345533 100644
--- a/src/gabble-media-session.c
+++ b/src/gabble-media-session.c
@@ -31,7 +31,6 @@
 
 #include <telepathy-glib/debug-ansi.h>
 #include "debug.h"
-#include "handles.h"
 #include "namespaces.h"
 #include "util.h"
 
diff --git a/src/gabble-media-stream.c b/src/gabble-media-stream.c
index c063b046..4be1c8b9 100644
--- a/src/gabble-media-stream.c
+++ b/src/gabble-media-stream.c
@@ -30,7 +30,6 @@
 
 #include <telepathy-glib/debug-ansi.h>
 #include "debug.h"
-#include "handles.h"
 #include "namespaces.h"
 
 #include "gabble-connection.h"
diff --git a/src/gabble-muc-channel.h b/src/gabble-muc-channel.h
index 67024539..66b9dc56 100644
--- a/src/gabble-muc-channel.h
+++ b/src/gabble-muc-channel.h
@@ -27,7 +27,6 @@
 #include <telepathy-glib/group-mixin.h>
 #include <telepathy-glib/properties-mixin.h>
 #include "text-mixin.h"
-#include "handles.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/gabble-roomlist-channel.c b/src/gabble-roomlist-channel.c
index 64c3bbd0..44bc6479 100644
--- a/src/gabble-roomlist-channel.c
+++ b/src/gabble-roomlist-channel.c
@@ -30,7 +30,6 @@
 #include "debug.h"
 #include "disco.h"
 #include "gabble-connection.h"
-#include "handles.h"
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/enums.h>
 #include <telepathy-glib/interfaces.h>
diff --git a/src/gabble-roster-channel.c b/src/gabble-roster-channel.c
index c1479938..a65480eb 100644
--- a/src/gabble-roster-channel.c
+++ b/src/gabble-roster-channel.c
@@ -32,7 +32,6 @@
 #include "debug.h"
 #include "gabble-connection.h"
 #include <telepathy-glib/group-mixin.h>
-#include "handles.h"
 #include "roster.h"
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/errors.h>
diff --git a/src/handles.c b/src/handles.c
deleted file mode 100644
index 009e8e1b..00000000
--- a/src/handles.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * handles.c - mechanism to store and retrieve handles on a connection
- * Copyright (C) 2005 Collabora Ltd.
- * Copyright (C) 2005 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
- */
-
-#include "handles.h"
-
-#include <glib.h>
-#include <string.h>
-
-#include <telepathy-glib/heap.h>
-#include <telepathy-glib/errors.h>
-
-#include "util.h"
-
-#include "config.h"
-
-/* public API */
-
-/**
- * gabble_handle_jid_is_valid
- *
- * Validates a jid for given handle type and returns TRUE/FALSE
- * on success/failure. In the latter case further information is
- * provided through error if set.
- */
-gboolean
-gabble_handle_jid_is_valid (TpHandleType type,
-                            const gchar *jid,
-                            GError **error)
-{
-  if (type == TP_HANDLE_TYPE_CONTACT || type == TP_HANDLE_TYPE_ROOM)
-    {
-      if (!strchr (jid, '@'))
-        {
-          g_debug ("%s: jid %s has no @", G_STRFUNC, jid);
-
-          g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
-              "jid %s has no @", jid);
-
-          return FALSE;
-        }
-
-      /* FIXME: do more extensive checking */
-    }
-  else
-    {
-      g_assert_not_reached ();
-      /* FIXME: add checking for other types here */
-    }
-
-  return TRUE;
-}
diff --git a/src/handles.h b/src/handles.h
deleted file mode 100644
index 377e76a0..00000000
--- a/src/handles.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * handles.h - mechanism to store and retrieve handles on a connection
- * Copyright (C) 2005 Collabora Ltd.
- * Copyright (C) 2005 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 __HANDLES_H__
-#define __HANDLES_H__
-
-#include <glib.h>
-
-#include <telepathy-glib/handle-repo.h>
-
-#include "gabble-types.h"
-#include <telepathy-glib/enums.h>
-
-G_BEGIN_DECLS
-
-gboolean gabble_handle_jid_is_valid (TpHandleType type, const gchar *jid,
-    GError **error);
-
-G_END_DECLS
-
-#endif /* #ifndef __HANDLES_H__ */
diff --git a/src/im-factory.c b/src/im-factory.c
index 525ce225..e8c16d15 100644
--- a/src/im-factory.c
+++ b/src/im-factory.c
@@ -38,7 +38,6 @@
 #include "disco.h"
 #include "gabble-connection.h"
 #include "gabble-im-channel.h"
-#include "handles.h"
 #include <telepathy-glib/interfaces.h>
 #include "text-mixin.h"
 #include <telepathy-glib/channel-factory-iface.h>
diff --git a/src/media-factory.c b/src/media-factory.c
index 15923179..b24088a7 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -37,7 +37,6 @@
 #include "debug.h"
 #include "gabble-connection.h"
 #include "gabble-media-channel.h"
-#include "handles.h"
 #include "namespaces.h"
 #include <telepathy-glib/interfaces.h>
 #include "text-mixin.h"
diff --git a/src/muc-factory.c b/src/muc-factory.c
index eee926a9..088d434a 100644
--- a/src/muc-factory.c
+++ b/src/muc-factory.c
@@ -40,7 +40,6 @@
 #include "presence-cache.h"
 #include "gabble-muc-channel.h"
 #include "gabble-roomlist-channel.h"
-#include "handles.h"
 #include "namespaces.h"
 #include <telepathy-glib/interfaces.h>
 #include "text-mixin.h"
diff --git a/src/presence-cache.h b/src/presence-cache.h
index 1cfa248a..9b9b5225 100644
--- a/src/presence-cache.h
+++ b/src/presence-cache.h
@@ -24,7 +24,6 @@
 #include <glib-object.h>
 
 #include "presence.h"
-#include "handles.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/roster.c b/src/roster.c
index c4cf237e..ceb8dd81 100644
--- a/src/roster.c
+++ b/src/roster.c
@@ -37,7 +37,6 @@
 #include "debug.h"
 #include "gabble-connection.h"
 #include "gabble-roster-channel.h"
-#include "handles.h"
 #include "namespaces.h"
 #include "util.h"
 
diff --git a/src/text-mixin.h b/src/text-mixin.h
index acc8a642..336982fe 100644
--- a/src/text-mixin.h
+++ b/src/text-mixin.h
@@ -22,7 +22,6 @@
 #define __GABBLE_TEXT_MIXIN_H__
 
 #include <telepathy-glib/text-mixin.h>
-#include "handles.h"
 #include "util.h"
 
 G_BEGIN_DECLS
diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index c1df0878..837ff6ff 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -28,11 +28,9 @@
 #include "base64.h"
 #include "debug.h"
 #include "gabble-connection.h"
-#include "handles.h"
 #include "namespaces.h"
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/heap.h>
-#include "handles.h"
 #include "time.h"
 #include "util.h"
 
diff --git a/tests/test-handles.c b/tests/test-handles.c
index fb5ec1c6..c9bc5193 100644
--- a/tests/test-handles.c
+++ b/tests/test-handles.c
@@ -1,7 +1,6 @@
 #include <string.h>
 #include <glib.h>
 #include <glib-object.h>
-#include <handles.h>
 #include <gabble-connection.h>
 #include <telepathy-glib/enums.h>
 #include <telepathy-glib/interfaces.h>