[empathy] Move empathy-contactinfo-utils to libempathy-gtk

[Danielle Madeley <daniellem src gnome org>]

commit cf23dd409cc36a8f692bf0db4f28e505da8633f8
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Thu Sep 8 13:11:22 2011 +1000

    Move empathy-contactinfo-utils to libempathy-gtk
    
    Why do we still have this annoying split?
    
    Rebasing this work will pull in a dependency on empathy-string-parser, which is
    part of libempathy-gtk. Hence the move.

 libempathy-gtk/Makefile.am                         |    2 ++
 .../empathy-contactinfo-utils.c                    |    0
 .../empathy-contactinfo-utils.h                    |    0
 libempathy-gtk/empathy-individual-widget.c         |    2 +-
 libempathy/Makefile.am                             |    2 --
 5 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index ccf87f2..96ef811 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -46,6 +46,7 @@ libempathy_gtk_handwritten_source =            	\
 	empathy-contact-list-store.c		\
 	empathy-contact-list-view.c		\
 	empathy-contact-menu.c			\
+	empathy-contactinfo-utils.c		\
 	empathy-linking-dialog.c		\
 	empathy-live-search.c			\
 	empathy-contact-search-dialog.c		\
@@ -116,6 +117,7 @@ libempathy_gtk_headers =			\
 	empathy-live-search.h			\
 	empathy-contact-search-dialog.h		\
 	empathy-contact-widget.h		\
+	empathy-contactinfo-utils.h		\
 	empathy-dialpad-widget.h		\
 	empathy-geometry.h			\
 	empathy-groups-widget.h			\
diff --git a/libempathy/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c
similarity index 100%
rename from libempathy/empathy-contactinfo-utils.c
rename to libempathy-gtk/empathy-contactinfo-utils.c
diff --git a/libempathy/empathy-contactinfo-utils.h b/libempathy-gtk/empathy-contactinfo-utils.h
similarity index 100%
rename from libempathy/empathy-contactinfo-utils.h
rename to libempathy-gtk/empathy-contactinfo-utils.h
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 697eb25..7354ee8 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -37,12 +37,12 @@
 #include <champlain-gtk/champlain-gtk.h>
 #endif
 
-#include <libempathy/empathy-contactinfo-utils.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-location.h>
 #include <libempathy/empathy-time.h>
 
 #include "empathy-avatar-image.h"
+#include "empathy-contactinfo-utils.h"
 #include "empathy-groups-widget.h"
 #include "empathy-gtk-enum-types.h"
 #include "empathy-individual-widget.h"
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index bb30882..079b473 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -39,7 +39,6 @@ libempathy_headers =				\
 	empathy-contact-list.h			\
 	empathy-contact-manager.h		\
 	empathy-contact.h			\
-	empathy-contactinfo-utils.h		\
 	empathy-debug.h				\
 	empathy-ft-factory.h			\
 	empathy-ft-handler.h			\
@@ -83,7 +82,6 @@ libempathy_handwritten_source =				\
 	empathy-contact-list.c				\
 	empathy-contact-manager.c			\
 	empathy-contact.c				\
-	empathy-contactinfo-utils.c			\
 	empathy-debug.c					\
 	empathy-ft-factory.c				\
 	empathy-ft-handler.c				\