[Telepathy-commits] [telepathy-sofiasip/master] Header and definition cleanup

[Mikhail Zabaluev]

---
 src/text-factory.c |   10 +++++++---
 src/text-factory.h |    3 +--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/text-factory.c b/src/text-factory.c
index 7a71ec3..88e5976 100644
--- a/src/text-factory.c
+++ b/src/text-factory.c
@@ -18,10 +18,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "text-factory.h"
+
+#include <string.h>
+
 #include <telepathy-glib/svc-connection.h>
 #include <telepathy-glib/interfaces.h>
-#include <string.h>
-#include "text-factory.h"
+
+#include "sip-connection.h"
 
 #define DEBUG_FLAG TPSIP_DEBUG_IM
 #include "debug.h"
@@ -275,7 +279,7 @@ tpsip_text_factory_new_channel (TpChannelFactoryIface *iface,
 
 TpsipTextChannel *
 tpsip_text_factory_lookup_channel (TpChannelFactoryIface *iface,
-                                 guint handle)
+                                   TpHandle handle)
 {
   TpsipTextFactory *fac = TPSIP_TEXT_FACTORY (iface);
   TpsipTextFactoryPrivate *priv = TPSIP_TEXT_FACTORY_GET_PRIVATE (fac);
diff --git a/src/text-factory.h b/src/text-factory.h
index 7b910b4..79d00d8 100644
--- a/src/text-factory.h
+++ b/src/text-factory.h
@@ -23,7 +23,6 @@
 
 #include <telepathy-glib/channel-factory-iface.h>
 
-#include "sip-connection-sofia.h"
 #include "sip-text-channel.h"
 
 G_BEGIN_DECLS
@@ -56,7 +55,7 @@ GType tpsip_text_factory_get_type(void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TPSIP_TYPE_TEXT_FACTORY, TpsipTextFactoryClass))
 
 TpsipTextChannel *tpsip_text_factory_lookup_channel (TpChannelFactoryIface *iface,
-    guint handle);
+    TpHandle handle);
 
 TpsipTextChannel *tpsip_text_factory_new_channel (TpChannelFactoryIface *iface,
     TpHandle handle, TpHandle initiator, gpointer request);
-- 
1.5.6.5