summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.co.uk>2010-03-25 22:25:47 (GMT)
committerOlivier CrĂȘte <olivier.crete@collabora.co.uk>2010-09-09 08:28:52 (GMT)
commit7df999049d304734bf5919880549ef5d0b15ef22 (patch)
treeb62826bd6c8ea3ca44d4637dfd50a24daff477ee
parent8efb8187ee787afa032cb561b7b72bc1fd5f98ca (diff)
downloadtelepathy-stream-engine-7df999049d304734bf5919880549ef5d0b15ef22.tar.gz
telepathy-stream-engine-7df999049d304734bf5919880549ef5d0b15ef22.tar.xz
Put includes in right order, again
-rw-r--r--src/thread-tracker.c4
-rw-r--r--src/thread-tracker.h4
2 files changed, 3 insertions, 5 deletions
diff --git a/src/thread-tracker.c b/src/thread-tracker.c
index 612fc67..92d5824 100644
--- a/src/thread-tracker.c
+++ b/src/thread-tracker.c
@@ -22,14 +22,14 @@
#include "config.h"
#endif
+#include "thread-tracker.h"
+
#include <pthread.h>
#include <sys/syscall.h>
#include <unistd.h>
#include <gst/gst.h>
-#include "thread-tracker.h"
-
static gboolean add_pad_locked (struct ObjectTrackingData *otd, GstPad *pad);
diff --git a/src/thread-tracker.h b/src/thread-tracker.h
index fb8a6bc..2ef4c32 100644
--- a/src/thread-tracker.h
+++ b/src/thread-tracker.h
@@ -22,7 +22,7 @@
#ifndef __THREAD_TRACKER_H__
#define __THREAD_TRACKER_H__
-#include <glib-object.h>
+#include <gst/gst.h>
G_BEGIN_DECLS
@@ -61,8 +61,6 @@ void object_tracker_add_src (struct ObjectTrackingData *otd, GstElement *src);
void enter_thread (struct ThreadTrackingData *ttd, GstObject *src);
-
-
G_END_DECLS
#endif /* __THREAD_TRACKER_H__ */