[Telepathy-commits] [telepathy-gabble/master] reordered private headers and makefile sources in alphabetical order
Senko Rasic
senko at phyrexia.lan
Tue Dec 2 04:34:03 PST 2008
---
src/Makefile.am | 15 +++++++--------
src/connection.c | 2 +-
src/connection.h | 4 ++--
src/jingle-content.c | 6 +++---
src/jingle-content.h | 1 +
src/jingle-factory.c | 10 ++++------
src/jingle-factory.h | 2 --
src/jingle-media-rtp.c | 8 ++++----
src/jingle-session.c | 8 ++++----
src/jingle-session.h | 4 ++--
src/jingle-transport-google.c | 8 ++++----
src/jingle-transport-google.h | 1 +
src/jingle-transport-iface.c | 7 ++++---
src/jingle-transport-iface.h | 2 +-
src/media-channel.c | 11 +++++------
src/media-factory.c | 3 +--
src/media-stream.c | 5 ++---
17 files changed, 46 insertions(+), 51 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index c3ea8b7..20356a8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,6 +54,12 @@ libgabble_convenience_la_SOURCES = \
im-channel.c \
im-factory.h \
im-factory.c \
+ jingle-content.c \
+ jingle-factory.c \
+ jingle-media-rtp.c \
+ jingle-session.c \
+ jingle-transport-google.c \
+ jingle-transport-iface.c \
media-channel.h \
media-channel.c \
media-stream.h \
@@ -107,14 +113,7 @@ libgabble_convenience_la_SOURCES = \
util.h \
util.c \
vcard-manager.h \
- vcard-manager.c \
- jingle-content.c \
- jingle-description-iface.c \
- jingle-factory.c \
- jingle-media-rtp.c \
- jingle-session.c \
- jingle-transport-google.c \
- jingle-transport-iface.c
+ vcard-manager.c
libgabble_convenience_la_LIBADD = \
diff --git a/src/connection.c b/src/connection.c
index 80b173b..bc0c24a 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -56,6 +56,7 @@
#include "media-channel.h"
#include "register.h"
#include "im-factory.h"
+#include "jingle-factory.h"
#include "media-factory.h"
#include "muc-factory.h"
#include "namespaces.h"
@@ -69,7 +70,6 @@
#include "private-tubes-factory.h"
#include "util.h"
#include "vcard-manager.h"
-#include "jingle-factory.h"
static guint disco_reply_timeout = 5000;
diff --git a/src/connection.h b/src/connection.h
index d2b3f49..27cc5df 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -29,11 +29,11 @@
#include <telepathy-glib/presence-mixin.h>
#include <telepathy-glib/dbus-properties-mixin.h>
-#include "types.h"
#include "error.h"
+#include "jingle-factory.h"
#include "muc-factory.h"
#include "olpc-gadget-manager.h"
-#include "jingle-factory.h"
+#include "types.h"
G_BEGIN_DECLS
diff --git a/src/jingle-content.c b/src/jingle-content.c
index 1599ec0..63b156e 100644
--- a/src/jingle-content.c
+++ b/src/jingle-content.c
@@ -28,13 +28,13 @@
#define DEBUG_FLAG GABBLE_DEBUG_MEDIA
-#include "debug.h"
#include "connection.h"
-#include "util.h"
-#include "namespaces.h"
+#include "debug.h"
#include "jingle-factory.h"
#include "jingle-session.h"
#include "jingle-transport-iface.h"
+#include "namespaces.h"
+#include "util.h"
/* signal enum */
enum
diff --git a/src/jingle-content.h b/src/jingle-content.h
index 225e259..266ec7f 100644
--- a/src/jingle-content.h
+++ b/src/jingle-content.h
@@ -24,6 +24,7 @@
#include <loudmouth/loudmouth.h>
#include "types.h"
#include "jingle-factory.h"
+#include "jingle-transport-iface.h"
G_BEGIN_DECLS
diff --git a/src/jingle-factory.c b/src/jingle-factory.c
index 589c8c5..55416fe 100644
--- a/src/jingle-factory.c
+++ b/src/jingle-factory.c
@@ -29,15 +29,13 @@
#define DEBUG_FLAG GABBLE_DEBUG_MEDIA
-#include "debug.h"
#include "connection.h"
-#include "util.h"
-#include "namespaces.h"
-#include "jingle-session.h"
-
+#include "debug.h"
#include "jingle-media-rtp.h"
+#include "jingle-session.h"
#include "jingle-transport-google.h"
-
+#include "namespaces.h"
+#include "util.h"
G_DEFINE_TYPE(GabbleJingleFactory, gabble_jingle_factory, G_TYPE_OBJECT);
diff --git a/src/jingle-factory.h b/src/jingle-factory.h
index 3e2733d..093c64a 100644
--- a/src/jingle-factory.h
+++ b/src/jingle-factory.h
@@ -23,8 +23,6 @@
#include <glib-object.h>
#include "types.h"
-#include "jingle-transport-iface.h"
-#include "jingle-description-iface.h"
G_BEGIN_DECLS
diff --git a/src/jingle-media-rtp.c b/src/jingle-media-rtp.c
index fe4bd45..d38edda 100644
--- a/src/jingle-media-rtp.c
+++ b/src/jingle-media-rtp.c
@@ -33,13 +33,13 @@
#define DEBUG_FLAG GABBLE_DEBUG_MEDIA
-#include "debug.h"
#include "connection.h"
-#include "util.h"
-#include "namespaces.h"
+#include "debug.h"
+#include "jingle-content.h"
#include "jingle-factory.h"
#include "jingle-session.h"
-#include "jingle-content.h"
+#include "namespaces.h"
+#include "util.h"
G_DEFINE_TYPE (GabbleJingleMediaRtp,
gabble_jingle_media_rtp, GABBLE_TYPE_JINGLE_CONTENT);
diff --git a/src/jingle-session.c b/src/jingle-session.c
index 2615bf9..3b3bdee 100644
--- a/src/jingle-session.c
+++ b/src/jingle-session.c
@@ -28,12 +28,12 @@
#define DEBUG_FLAG GABBLE_DEBUG_MEDIA
-#include "debug.h"
#include "connection.h"
-#include "util.h"
-#include "namespaces.h"
-#include "jingle-factory.h"
+#include "debug.h"
#include "jingle-content.h"
+#include "jingle-factory.h"
+#include "namespaces.h"
+#include "util.h"
G_DEFINE_TYPE(GabbleJingleSession, gabble_jingle_session, G_TYPE_OBJECT);
diff --git a/src/jingle-session.h b/src/jingle-session.h
index 991db7f..689ec93 100644
--- a/src/jingle-session.h
+++ b/src/jingle-session.h
@@ -22,10 +22,10 @@
#include <glib-object.h>
#include <loudmouth/loudmouth.h>
-#include "types.h"
-#include "jingle-factory.h"
#include "jingle-content.h"
+#include "jingle-factory.h"
+#include "types.h"
G_BEGIN_DECLS
diff --git a/src/jingle-transport-google.c b/src/jingle-transport-google.c
index 22ca6e4..56d1b6f 100644
--- a/src/jingle-transport-google.c
+++ b/src/jingle-transport-google.c
@@ -29,13 +29,13 @@
#define DEBUG_FLAG GABBLE_DEBUG_MEDIA
-#include "debug.h"
#include "connection.h"
-#include "util.h"
-#include "namespaces.h"
+#include "debug.h"
+#include "jingle-content.h"
#include "jingle-factory.h"
#include "jingle-session.h"
-#include "jingle-content.h"
+#include "namespaces.h"
+#include "util.h"
static void
transport_iface_init (gpointer g_iface, gpointer iface_data);
diff --git a/src/jingle-transport-google.h b/src/jingle-transport-google.h
index 204a504..5cb7d02 100644
--- a/src/jingle-transport-google.h
+++ b/src/jingle-transport-google.h
@@ -22,6 +22,7 @@
#include <glib-object.h>
#include <loudmouth/loudmouth.h>
+
#include "types.h"
G_BEGIN_DECLS
diff --git a/src/jingle-transport-iface.c b/src/jingle-transport-iface.c
index 816db11..ce7267e 100644
--- a/src/jingle-transport-iface.c
+++ b/src/jingle-transport-iface.c
@@ -18,12 +18,13 @@
*/
#include "jingle-transport-iface.h"
-#include "connection.h"
-#include "jingle-session.h"
-#include "jingle-content.h"
#include <glib.h>
+#include "connection.h"
+#include "jingle-content.h"
+#include "jingle-session.h"
+
void
gabble_jingle_transport_iface_parse_candidates (GabbleJingleTransportIface *self,
LmMessageNode *node, GError **error)
diff --git a/src/jingle-transport-iface.h b/src/jingle-transport-iface.h
index 35248f6..5b11c5d 100644
--- a/src/jingle-transport-iface.h
+++ b/src/jingle-transport-iface.h
@@ -21,9 +21,9 @@
#define __GABBLE_JINGLE_TRANSPORT_IFACE_H__
#include <glib-object.h>
+#include <loudmouth/loudmouth.h>
#include "types.h"
-#include <loudmouth/loudmouth.h>
G_BEGIN_DECLS
diff --git a/src/media-channel.c b/src/media-channel.c
index c2e076d..5d83b5c 100644
--- a/src/media-channel.c
+++ b/src/media-channel.c
@@ -37,17 +37,16 @@
#include "connection.h"
#include "debug.h"
+#include "jingle-content.h"
+#include "jingle-factory.h"
+#include "jingle-media-rtp.h"
+#include "jingle-session.h"
#include "media-factory.h"
#include "media-stream.h"
+#include "namespaces.h"
#include "presence-cache.h"
#include "presence.h"
-#include "jingle-factory.h"
-#include "jingle-session.h"
-#include "jingle-content.h"
-#include "jingle-media-rtp.h"
-#include "namespaces.h"
-
#define MAX_STREAMS 99
static void call_state_iface_init (gpointer, gpointer);
diff --git a/src/media-factory.c b/src/media-factory.c
index ed164c4..1d5b43d 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -37,14 +37,13 @@
#include "connection.h"
#include "debug.h"
#include "jingle-factory.h"
+#include "jingle-media-rtp.h"
#include "jingle-session.h"
#include "media-channel.h"
#include "namespaces.h"
#include "text-mixin.h"
#include "util.h"
-#include "jingle-media-rtp.h"
-
static void channel_manager_iface_init (gpointer, gpointer);
G_DEFINE_TYPE_WITH_CODE (GabbleMediaFactory, gabble_media_factory,
diff --git a/src/media-stream.c b/src/media-stream.c
index 644df2f..636b9bb 100644
--- a/src/media-stream.c
+++ b/src/media-stream.c
@@ -40,12 +40,11 @@
#include "connection.h"
#include "debug.h"
#include "gabble-signals-marshal.h"
-#include "media-channel.h"
-#include "namespaces.h"
-
#include "jingle-content.h"
#include "jingle-session.h"
#include "jingle-media-rtp.h"
+#include "media-channel.h"
+#include "namespaces.h"
static void stream_handler_iface_init (gpointer, gpointer);
--
1.5.6.5
More information about the Telepathy-commits
mailing list