[Telepathy-commits] [telepathy-gabble/master] rename gabble-connection-manager.h to connection-manager.h
Dafydd Harries
dafydd.harries at collabora.co.uk
Tue Aug 19 10:53:13 PDT 2008
20080714115806-c9803-f201bea0260e5e0dd87ce25367288db3358ec090.gz
---
src/Makefile.am | 2 +-
src/connection-manager.h | 65 +++++++++++++++++++++++++++++++++++++++
src/gabble-connection-manager.c | 2 +-
src/gabble-connection-manager.h | 65 ---------------------------------------
src/gabble.c | 2 +-
src/write-mgr-file.c | 2 +-
6 files changed, 69 insertions(+), 69 deletions(-)
create mode 100644 src/connection-manager.h
delete mode 100644 src/gabble-connection-manager.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 0ca8b08..a23d5c0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,7 +49,7 @@ libgabble_convenience_la_our_sources = \
gabble.h \
gabble-error.c \
gabble-error.h \
- gabble-connection-manager.h \
+ connection-manager.h \
gabble-connection-manager.c \
connection.h \
gabble-connection.c \
diff --git a/src/connection-manager.h b/src/connection-manager.h
new file mode 100644
index 0000000..5365ab1
--- /dev/null
+++ b/src/connection-manager.h
@@ -0,0 +1,65 @@
+/*
+ * gabble-connection-manager.h - Header for GabbleConnectionManager
+ * 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 __GABBLE_CONNECTION_MANAGER_H__
+#define __GABBLE_CONNECTION_MANAGER_H__
+
+#include <glib-object.h>
+#include <telepathy-glib/base-connection-manager.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GabbleConnectionManager GabbleConnectionManager;
+typedef struct _GabbleConnectionManagerClass GabbleConnectionManagerClass;
+
+struct _GabbleConnectionManagerClass {
+ TpBaseConnectionManagerClass parent_class;
+};
+
+struct _GabbleConnectionManager {
+ TpBaseConnectionManager parent;
+
+ gpointer priv;
+};
+
+extern const TpCMProtocolSpec gabble_protocols[];
+
+GType gabble_connection_manager_get_type (void);
+
+/* TYPE MACROS */
+#define GABBLE_TYPE_CONNECTION_MANAGER \
+ (gabble_connection_manager_get_type ())
+#define GABBLE_CONNECTION_MANAGER(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_CONNECTION_MANAGER, \
+ GabbleConnectionManager))
+#define GABBLE_CONNECTION_MANAGER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_CONNECTION_MANAGER, \
+ GabbleConnectionManagerClass))
+#define GABBLE_IS_CONNECTION_MANAGER(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_CONNECTION_MANAGER))
+#define GABBLE_IS_CONNECTION_MANAGER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_CONNECTION_MANAGER))
+#define GABBLE_CONNECTION_MANAGER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_CONNECTION_MANAGER, \
+ GabbleConnectionManagerClass))
+
+G_END_DECLS
+
+#endif /* #ifndef __GABBLE_CONNECTION_MANAGER_H__*/
diff --git a/src/gabble-connection-manager.c b/src/gabble-connection-manager.c
index 98e3a58..39e5bfd 100644
--- a/src/gabble-connection-manager.c
+++ b/src/gabble-connection-manager.c
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "gabble-connection-manager.h"
+#include "connection-manager.h"
#include <dbus/dbus-protocol.h>
#include <dbus/dbus-glib.h>
diff --git a/src/gabble-connection-manager.h b/src/gabble-connection-manager.h
deleted file mode 100644
index 5365ab1..0000000
--- a/src/gabble-connection-manager.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * gabble-connection-manager.h - Header for GabbleConnectionManager
- * 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 __GABBLE_CONNECTION_MANAGER_H__
-#define __GABBLE_CONNECTION_MANAGER_H__
-
-#include <glib-object.h>
-#include <telepathy-glib/base-connection-manager.h>
-
-G_BEGIN_DECLS
-
-typedef struct _GabbleConnectionManager GabbleConnectionManager;
-typedef struct _GabbleConnectionManagerClass GabbleConnectionManagerClass;
-
-struct _GabbleConnectionManagerClass {
- TpBaseConnectionManagerClass parent_class;
-};
-
-struct _GabbleConnectionManager {
- TpBaseConnectionManager parent;
-
- gpointer priv;
-};
-
-extern const TpCMProtocolSpec gabble_protocols[];
-
-GType gabble_connection_manager_get_type (void);
-
-/* TYPE MACROS */
-#define GABBLE_TYPE_CONNECTION_MANAGER \
- (gabble_connection_manager_get_type ())
-#define GABBLE_CONNECTION_MANAGER(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_CONNECTION_MANAGER, \
- GabbleConnectionManager))
-#define GABBLE_CONNECTION_MANAGER_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_CONNECTION_MANAGER, \
- GabbleConnectionManagerClass))
-#define GABBLE_IS_CONNECTION_MANAGER(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_CONNECTION_MANAGER))
-#define GABBLE_IS_CONNECTION_MANAGER_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_CONNECTION_MANAGER))
-#define GABBLE_CONNECTION_MANAGER_GET_CLASS(obj) \
- (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_CONNECTION_MANAGER, \
- GabbleConnectionManagerClass))
-
-G_END_DECLS
-
-#endif /* #ifndef __GABBLE_CONNECTION_MANAGER_H__*/
diff --git a/src/gabble.c b/src/gabble.c
index b936d97..fbc1723 100644
--- a/src/gabble.c
+++ b/src/gabble.c
@@ -26,7 +26,7 @@
#include <telepathy-glib/debug.h>
#include <telepathy-glib/run.h>
#include "debug.h"
-#include "gabble-connection-manager.h"
+#include "connection-manager.h"
#include "gabble.h"
static TpBaseConnectionManager *
diff --git a/src/write-mgr-file.c b/src/write-mgr-file.c
index fd61ef6..aa0f2a6 100644
--- a/src/write-mgr-file.c
+++ b/src/write-mgr-file.c
@@ -24,7 +24,7 @@
#include <dbus/dbus-protocol.h>
#include <telepathy-glib/enums.h>
-#include "gabble-connection-manager.h"
+#include "connection-manager.h"
static gchar *
mgr_file_contents (const char *busname,
--
1.5.6.3
More information about the Telepathy-commits
mailing list