[Telepathy-commits] [telepathy-gabble/master] tidy up libc/glib includes
Dafydd Harries
dafydd.harries at collabora.co.uk
Tue Aug 19 10:53:30 PDT 2008
20080721180624-c9803-3bdb4a3eabe9b65b5ad3d11f48dcbefde393a7c9.gz
---
src/base64.c | 1 -
src/bytestream-factory.c | 5 +----
src/bytestream-ibb.c | 3 ---
src/bytestream-iface.c | 2 --
src/bytestream-muc.c | 3 ---
src/caps-hash.c | 3 ---
src/connection-manager.c | 2 --
src/connection.c | 2 --
src/debug.c | 1 -
src/disco.c | 1 -
src/error.c | 2 +-
src/gabble.c | 1 -
src/im-channel.c | 2 --
src/im-factory.c | 3 ---
src/media-channel.c | 2 --
src/media-factory.c | 2 --
src/media-session.c | 2 --
src/muc-channel.c | 2 --
src/muc-factory.c | 3 ---
src/presence.c | 2 --
src/private-tubes-factory.c | 3 ---
src/register.c | 2 --
src/roomlist-channel.c | 2 --
src/roster-channel.c | 3 ---
src/text-mixin.c | 1 -
src/tube-dbus.c | 3 ---
src/tube-iface.c | 2 --
src/tube-stream.c | 3 ---
src/tubes-channel.c | 6 ++----
src/util.c | 3 +--
src/vcard-manager.c | 1 -
31 files changed, 5 insertions(+), 68 deletions(-)
diff --git a/src/base64.c b/src/base64.c
index 160712a..600fa39 100644
--- a/src/base64.c
+++ b/src/base64.c
@@ -26,7 +26,6 @@
#include <ctype.h>
#include <string.h>
-#include <glib.h>
/*
|AAAA AABB|BBBB CCCC|CCDD DDDD|
diff --git a/src/bytestream-factory.c b/src/bytestream-factory.c
index 96b3a02..81bd0ea 100644
--- a/src/bytestream-factory.c
+++ b/src/bytestream-factory.c
@@ -20,11 +20,8 @@
#include "config.h"
#include "bytestream-factory.h"
-#include <stdlib.h>
#include <string.h>
-#include <time.h>
-
-#include <glib.h>
+#include <stdlib.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
diff --git a/src/bytestream-ibb.c b/src/bytestream-ibb.c
index e4368b8..50e9f8f 100644
--- a/src/bytestream-ibb.c
+++ b/src/bytestream-ibb.c
@@ -20,11 +20,8 @@
#include "config.h"
#include "bytestream-ibb.h"
-#include <stdlib.h>
#include <string.h>
-#include <time.h>
-#include <glib.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <loudmouth/loudmouth.h>
diff --git a/src/bytestream-iface.c b/src/bytestream-iface.c
index 285673b..dc9b862 100644
--- a/src/bytestream-iface.c
+++ b/src/bytestream-iface.c
@@ -20,8 +20,6 @@
#include "config.h"
#include "bytestream-iface.h"
-#include <glib.h>
-
#include "connection.h"
gboolean
diff --git a/src/bytestream-muc.c b/src/bytestream-muc.c
index 1739c73..822aeba 100644
--- a/src/bytestream-muc.c
+++ b/src/bytestream-muc.c
@@ -20,11 +20,8 @@
#include "config.h"
#include "bytestream-muc.h"
-#include <stdlib.h>
#include <string.h>
-#include <time.h>
-#include <glib.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <loudmouth/loudmouth.h>
diff --git a/src/caps-hash.c b/src/caps-hash.c
index 2b585d8..ff8a11c 100644
--- a/src/caps-hash.c
+++ b/src/caps-hash.c
@@ -28,9 +28,6 @@
#include "caps-hash.h"
#include <string.h>
-#include <time.h>
-
-#include <glib.h>
#define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
diff --git a/src/connection-manager.c b/src/connection-manager.c
index b731806..d97d119 100644
--- a/src/connection-manager.c
+++ b/src/connection-manager.c
@@ -21,8 +21,6 @@
#include "config.h"
#include "connection-manager.h"
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include <dbus/dbus-protocol.h>
diff --git a/src/connection.c b/src/connection.c
index 817d9b5..2f9ee2a 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -21,8 +21,6 @@
#include "config.h"
#include "connection.h"
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#define DBUS_API_SUBJECT_TO_CHANGE
diff --git a/src/debug.c b/src/debug.c
index 2a6583d..5983d5c 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -9,7 +9,6 @@
#include <fcntl.h>
#include <errno.h>
-#include <glib.h>
#include <glib/gstdio.h>
#include <telepathy-glib/debug.h>
diff --git a/src/disco.c b/src/disco.c
index 590480d..2f0549c 100644
--- a/src/disco.c
+++ b/src/disco.c
@@ -24,7 +24,6 @@
#include "config.h"
#include "disco.h"
-#include <stdlib.h>
#include <string.h>
#define DBUS_API_SUBJECT_TO_CHANGE
diff --git a/src/error.c b/src/error.c
index 431a13b..9d8eaf4 100644
--- a/src/error.c
+++ b/src/error.c
@@ -21,8 +21,8 @@
#include "config.h"
#include "error.h"
-#include <stdlib.h>
#include <stdio.h>
+#include <stdlib.h>
#include "namespaces.h"
#include "util.h"
diff --git a/src/gabble.c b/src/gabble.c
index cc1ea27..8f0a6a1 100644
--- a/src/gabble.c
+++ b/src/gabble.c
@@ -21,7 +21,6 @@
#include "config.h"
#include "gabble.h"
-#include <time.h>
#include <unistd.h>
#include <telepathy-glib/debug.h>
diff --git a/src/im-channel.c b/src/im-channel.c
index c24c027..584dff4 100644
--- a/src/im-channel.c
+++ b/src/im-channel.c
@@ -21,9 +21,7 @@
#include "config.h"
#include "im-channel.h"
-#include <stdio.h>
#include <string.h>
-#include <time.h>
#include <dbus/dbus-glib.h>
#include <loudmouth/loudmouth.h>
diff --git a/src/im-factory.c b/src/im-factory.c
index d5b0e07..9f384f6 100644
--- a/src/im-factory.c
+++ b/src/im-factory.c
@@ -22,11 +22,8 @@
#define DBUS_API_SUBJECT_TO_CHANGE
-#include <stdlib.h>
#include <string.h>
-#include <time.h>
-#include <glib.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <loudmouth/loudmouth.h>
diff --git a/src/media-channel.c b/src/media-channel.c
index ee98d2a..aaccd60 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -22,8 +22,6 @@
#include "config.h"
#include "media-channel.h"
-#include <stdio.h>
-#include <stdlib.h>
#include <dbus/dbus-glib.h>
#include <telepathy-glib/dbus.h>
diff --git a/src/media-factory.c b/src/media-factory.c
index affc44d..4080dab 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -24,9 +24,7 @@
#include <stdlib.h>
#include <string.h>
-#include <time.h>
-#include <glib.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <loudmouth/loudmouth.h>
diff --git a/src/media-session.c b/src/media-session.c
index 16f20c1..746ad8c 100644
--- a/src/media-session.c
+++ b/src/media-session.c
@@ -23,9 +23,7 @@
#include "media-session.h"
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <dbus/dbus-glib.h>
#include <telepathy-glib/debug-ansi.h>
diff --git a/src/muc-channel.c b/src/muc-channel.c
index 3a6f77f..a412734 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -23,9 +23,7 @@
#include "muc-channel.h"
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <dbus/dbus-glib.h>
#include <telepathy-glib/dbus.h>
diff --git a/src/muc-factory.c b/src/muc-factory.c
index dc742a7..edd57cf 100644
--- a/src/muc-factory.c
+++ b/src/muc-factory.c
@@ -22,11 +22,8 @@
#define DBUS_API_SUBJECT_TO_CHANGE
-#include <stdlib.h>
#include <string.h>
-#include <time.h>
-#include <glib.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <loudmouth/loudmouth.h>
diff --git a/src/presence.c b/src/presence.c
index 2d74e7a..4b6a80e 100644
--- a/src/presence.c
+++ b/src/presence.c
@@ -22,8 +22,6 @@
#include "presence.h"
#include <string.h>
-#include <glib.h>
-#include <time.h>
#include "presence-cache.h"
#include "namespaces.h"
diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index 318799f..0b479ff 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -20,11 +20,8 @@
#include "config.h"
#include "private-tubes-factory.h"
-#include <stdlib.h>
#include <string.h>
-#include <time.h>
-#include <glib.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <loudmouth/loudmouth.h>
diff --git a/src/register.c b/src/register.c
index 4da43ad..33dd632 100644
--- a/src/register.c
+++ b/src/register.c
@@ -25,8 +25,6 @@
#define DBUS_API_SUBJECT_TO_CHANGE
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include <ctype.h>
diff --git a/src/roomlist-channel.c b/src/roomlist-channel.c
index abc2687..9bf762e 100644
--- a/src/roomlist-channel.c
+++ b/src/roomlist-channel.c
@@ -21,8 +21,6 @@
#include "config.h"
#include "roomlist-channel.h"
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include <dbus/dbus-glib.h>
diff --git a/src/roster-channel.c b/src/roster-channel.c
index 668cc67..3693b48 100644
--- a/src/roster-channel.c
+++ b/src/roster-channel.c
@@ -21,9 +21,6 @@
#include "config.h"
#include "roster-channel.h"
-#include <stdio.h>
-#include <stdlib.h>
-
#include <dbus/dbus-glib.h>
#include <telepathy-glib/group-mixin.h>
#include <telepathy-glib/dbus.h>
diff --git a/src/text-mixin.c b/src/text-mixin.c
index bbe6a31..07ce42c 100644
--- a/src/text-mixin.c
+++ b/src/text-mixin.c
@@ -27,7 +27,6 @@
#include "text-mixin.h"
#include <string.h>
-#include <time.h>
#include <dbus/dbus-glib.h>
#include <loudmouth/loudmouth.h>
diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index d1c1532..1ba56a5 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -20,12 +20,9 @@
#include "config.h"
#include "tube-dbus.h"
-#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <errno.h>
-#include <glib.h>
#include <glib/gstdio.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
diff --git a/src/tube-iface.c b/src/tube-iface.c
index 9c2eee4..6ec3cd8 100644
--- a/src/tube-iface.c
+++ b/src/tube-iface.c
@@ -23,8 +23,6 @@
#include "connection.h"
#include "extensions/extensions.h"
-#include <glib.h>
-
gboolean
gabble_tube_iface_accept (GabbleTubeIface *self,
GError **error)
diff --git a/src/tube-stream.c b/src/tube-stream.c
index 8d08604..c34fabd 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -20,9 +20,7 @@
#include "config.h"
#include "tube-stream.h"
-#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
@@ -31,7 +29,6 @@
#include <errno.h>
#include <netdb.h>
-#include <glib.h>
#include <glib/gstdio.h>
#include <loudmouth/loudmouth.h>
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index f09b2f9..e412b55 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -20,15 +20,13 @@
#include "config.h"
#include "tubes-channel.h"
-#include <stdio.h>
+#include <errno.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/types.h>
#include <unistd.h>
-#include <errno.h>
-#include <glib.h>
#include <glib/gstdio.h>
#include <dbus/dbus-glib.h>
#include <telepathy-glib/channel-iface.h>
diff --git a/src/util.c b/src/util.c
index 5ce5fbd..d50f7bf 100644
--- a/src/util.c
+++ b/src/util.c
@@ -24,10 +24,9 @@
#include "util.h"
#include <stdio.h>
-#include <string.h>
#include <stdlib.h>
+#include <string.h>
-#include <glib.h>
#include <telepathy-glib/handle-repo-dynamic.h>
#define DEBUG_FLAG GABBLE_DEBUG_JID
diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index e057750..790fc8f 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -23,7 +23,6 @@
#include "vcard-manager.h"
#include <string.h>
-#include <time.h>
#include <telepathy-glib/dbus.h>
#include <telepathy-glib/heap.h>
--
1.5.6.3
More information about the Telepathy-commits
mailing list