[Telepathy-commits] [telepathy-gabble/master] rename gabble-error.h to error.h
Dafydd Harries
dafydd.harries at collabora.co.uk
Tue Aug 19 10:53:13 PDT 2008
20080714115809-c9803-b865ce9eca9b78a5e776e544677e40490d7d225d.gz
---
src/Makefile.am | 2 +-
src/bytestream-ibb.h | 2 +-
src/connection.h | 2 +-
src/disco.c | 2 +-
src/error.h | 85 ++++++++++++++++++++++++++++++++++++++++++++++
src/gabble-error.c | 2 +-
src/gabble-error.h | 85 ----------------------------------------------
src/gabble-muc-channel.c | 2 +-
src/gabble-register.c | 2 +-
9 files changed, 92 insertions(+), 92 deletions(-)
create mode 100644 src/error.h
delete mode 100644 src/gabble-error.h
diff --git a/src/Makefile.am b/src/Makefile.am
index a23d5c0..2b48e5d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,7 +48,7 @@ libgabble_convenience_la_our_sources = \
gabble.c \
gabble.h \
gabble-error.c \
- gabble-error.h \
+ error.h \
connection-manager.h \
gabble-connection-manager.c \
connection.h \
diff --git a/src/bytestream-ibb.h b/src/bytestream-ibb.h
index db86638..02716d7 100644
--- a/src/bytestream-ibb.h
+++ b/src/bytestream-ibb.h
@@ -25,7 +25,7 @@
#include <telepathy-glib/base-connection.h>
-#include "gabble-error.h"
+#include "error.h"
G_BEGIN_DECLS
diff --git a/src/connection.h b/src/connection.h
index 061fa2f..3c01528 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -28,7 +28,7 @@
#include <telepathy-glib/presence-mixin.h>
#include "gabble-types.h"
-#include "gabble-error.h"
+#include "error.h"
#include "muc-factory.h"
G_BEGIN_DECLS
diff --git a/src/disco.c b/src/disco.c
index 98cbdd4..89994a9 100644
--- a/src/disco.c
+++ b/src/disco.c
@@ -34,7 +34,7 @@
#include "debug.h"
#include "connection.h"
-#include "gabble-error.h"
+#include "error.h"
#include "namespaces.h"
#include <telepathy-glib/dbus.h>
#include "util.h"
diff --git a/src/error.h b/src/error.h
new file mode 100644
index 0000000..3aabb9b
--- /dev/null
+++ b/src/error.h
@@ -0,0 +1,85 @@
+/*
+ * gabble-error.h - Header for Gabble's error handling API
+ * Copyright (C) 2006-2007 Collabora Ltd.
+ * Copyright (C) 2006 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 __GABBLE_ERROR_H__
+#define __GABBLE_ERROR_H__
+
+#include <glib.h>
+#include <loudmouth/loudmouth.h>
+
+typedef enum {
+ XMPP_ERROR_UNDEFINED_CONDITION = 0, /* 500 */
+ XMPP_ERROR_REDIRECT, /* 302 */
+ XMPP_ERROR_GONE, /* 302 */
+
+ XMPP_ERROR_BAD_REQUEST, /* 400 */
+ XMPP_ERROR_UNEXPECTED_REQUEST, /* 400 */
+ XMPP_ERROR_JID_MALFORMED, /* 400 */
+
+ XMPP_ERROR_NOT_AUTHORIZED, /* 401 */
+
+ XMPP_ERROR_PAYMENT_REQUIRED, /* 402 */
+
+ XMPP_ERROR_FORBIDDEN, /* 403 */
+
+ XMPP_ERROR_ITEM_NOT_FOUND, /* 404 */
+ XMPP_ERROR_RECIPIENT_UNAVAILABLE, /* 404 */
+ XMPP_ERROR_REMOTE_SERVER_NOT_FOUND, /* 404 */
+
+ XMPP_ERROR_NOT_ALLOWED, /* 405 */
+
+ XMPP_ERROR_NOT_ACCEPTABLE, /* 406 */
+
+ XMPP_ERROR_REGISTRATION_REQUIRED, /* 407 */
+ XMPP_ERROR_SUBSCRIPTION_REQUIRED, /* 407 */
+
+ XMPP_ERROR_REMOTE_SERVER_TIMEOUT, /* 408, 504 */
+
+ XMPP_ERROR_CONFLICT, /* 409 */
+
+ XMPP_ERROR_INTERNAL_SERVER_ERROR, /* 500 */
+ XMPP_ERROR_RESOURCE_CONSTRAINT, /* 500 */
+
+ XMPP_ERROR_FEATURE_NOT_IMPLEMENTED, /* 501 */
+
+ XMPP_ERROR_SERVICE_UNAVAILABLE, /* 502, 503, 510 */
+
+ XMPP_ERROR_JINGLE_OUT_OF_ORDER,
+ XMPP_ERROR_JINGLE_UNKNOWN_SESSION,
+ XMPP_ERROR_JINGLE_UNSUPPORTED_CONTENT,
+ XMPP_ERROR_JINGLE_UNSUPPORTED_TRANSPORT,
+
+ XMPP_ERROR_SI_NO_VALID_STREAMS,
+ XMPP_ERROR_SI_BAD_PROFILE,
+
+ NUM_XMPP_ERRORS,
+} GabbleXmppError;
+
+GQuark gabble_xmpp_error_quark (void);
+#define GABBLE_XMPP_ERROR (gabble_xmpp_error_quark ())
+
+GabbleXmppError gabble_xmpp_error_from_node (LmMessageNode *error_node);
+LmMessageNode *gabble_xmpp_error_to_node (GabbleXmppError error,
+ LmMessageNode *parent_node, const gchar *errmsg);
+const gchar *gabble_xmpp_error_string (GabbleXmppError error);
+const gchar *gabble_xmpp_error_description (GabbleXmppError error);
+GError *gabble_message_get_xmpp_error (LmMessage *msg);
+
+#endif /* __GABBLE_ERROR_H__ */
diff --git a/src/gabble-error.c b/src/gabble-error.c
index 92ad650..cc89e50 100644
--- a/src/gabble-error.c
+++ b/src/gabble-error.c
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "gabble-error.h"
+#include "error.h"
#include <stdlib.h>
#include <stdio.h>
diff --git a/src/gabble-error.h b/src/gabble-error.h
deleted file mode 100644
index 3aabb9b..0000000
--- a/src/gabble-error.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * gabble-error.h - Header for Gabble's error handling API
- * Copyright (C) 2006-2007 Collabora Ltd.
- * Copyright (C) 2006 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 __GABBLE_ERROR_H__
-#define __GABBLE_ERROR_H__
-
-#include <glib.h>
-#include <loudmouth/loudmouth.h>
-
-typedef enum {
- XMPP_ERROR_UNDEFINED_CONDITION = 0, /* 500 */
- XMPP_ERROR_REDIRECT, /* 302 */
- XMPP_ERROR_GONE, /* 302 */
-
- XMPP_ERROR_BAD_REQUEST, /* 400 */
- XMPP_ERROR_UNEXPECTED_REQUEST, /* 400 */
- XMPP_ERROR_JID_MALFORMED, /* 400 */
-
- XMPP_ERROR_NOT_AUTHORIZED, /* 401 */
-
- XMPP_ERROR_PAYMENT_REQUIRED, /* 402 */
-
- XMPP_ERROR_FORBIDDEN, /* 403 */
-
- XMPP_ERROR_ITEM_NOT_FOUND, /* 404 */
- XMPP_ERROR_RECIPIENT_UNAVAILABLE, /* 404 */
- XMPP_ERROR_REMOTE_SERVER_NOT_FOUND, /* 404 */
-
- XMPP_ERROR_NOT_ALLOWED, /* 405 */
-
- XMPP_ERROR_NOT_ACCEPTABLE, /* 406 */
-
- XMPP_ERROR_REGISTRATION_REQUIRED, /* 407 */
- XMPP_ERROR_SUBSCRIPTION_REQUIRED, /* 407 */
-
- XMPP_ERROR_REMOTE_SERVER_TIMEOUT, /* 408, 504 */
-
- XMPP_ERROR_CONFLICT, /* 409 */
-
- XMPP_ERROR_INTERNAL_SERVER_ERROR, /* 500 */
- XMPP_ERROR_RESOURCE_CONSTRAINT, /* 500 */
-
- XMPP_ERROR_FEATURE_NOT_IMPLEMENTED, /* 501 */
-
- XMPP_ERROR_SERVICE_UNAVAILABLE, /* 502, 503, 510 */
-
- XMPP_ERROR_JINGLE_OUT_OF_ORDER,
- XMPP_ERROR_JINGLE_UNKNOWN_SESSION,
- XMPP_ERROR_JINGLE_UNSUPPORTED_CONTENT,
- XMPP_ERROR_JINGLE_UNSUPPORTED_TRANSPORT,
-
- XMPP_ERROR_SI_NO_VALID_STREAMS,
- XMPP_ERROR_SI_BAD_PROFILE,
-
- NUM_XMPP_ERRORS,
-} GabbleXmppError;
-
-GQuark gabble_xmpp_error_quark (void);
-#define GABBLE_XMPP_ERROR (gabble_xmpp_error_quark ())
-
-GabbleXmppError gabble_xmpp_error_from_node (LmMessageNode *error_node);
-LmMessageNode *gabble_xmpp_error_to_node (GabbleXmppError error,
- LmMessageNode *parent_node, const gchar *errmsg);
-const gchar *gabble_xmpp_error_string (GabbleXmppError error);
-const gchar *gabble_xmpp_error_description (GabbleXmppError error);
-GError *gabble_message_get_xmpp_error (LmMessage *msg);
-
-#endif /* __GABBLE_ERROR_H__ */
diff --git a/src/gabble-muc-channel.c b/src/gabble-muc-channel.c
index d97ed4e..5f0eda3 100644
--- a/src/gabble-muc-channel.c
+++ b/src/gabble-muc-channel.c
@@ -38,7 +38,7 @@
#include "debug.h"
#include "disco.h"
#include "connection.h"
-#include "gabble-error.h"
+#include "error.h"
#include "namespaces.h"
#include "util.h"
diff --git a/src/gabble-register.c b/src/gabble-register.c
index 58efa02..3a7243b 100644
--- a/src/gabble-register.c
+++ b/src/gabble-register.c
@@ -35,7 +35,7 @@
#include <telepathy-glib/errors.h>
#include "connection.h"
-#include "gabble-error.h"
+#include "error.h"
#include "gabble-signals-marshal.h"
#include "namespaces.h"
#include "util.h"
--
1.5.6.3
More information about the Telepathy-commits
mailing list