diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-09-08 11:11:22 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-10-21 06:42:21 +0800 |
| commit | cf23dd409cc36a8f692bf0db4f28e505da8633f8 (patch) | |
| tree | 5d29fe7b658fe3c39a76a76056c4432303d6bf13 | |
| parent | 06e665213df9b95a74f317da82a8f9537e2e3c87 (diff) | |
| download | gsoc2013-empathy-cf23dd409cc36a8f692bf0db4f28e505da8633f8.tar gsoc2013-empathy-cf23dd409cc36a8f692bf0db4f28e505da8633f8.tar.gz gsoc2013-empathy-cf23dd409cc36a8f692bf0db4f28e505da8633f8.tar.bz2 gsoc2013-empathy-cf23dd409cc36a8f692bf0db4f28e505da8633f8.tar.lz gsoc2013-empathy-cf23dd409cc36a8f692bf0db4f28e505da8633f8.tar.xz gsoc2013-empathy-cf23dd409cc36a8f692bf0db4f28e505da8633f8.tar.zst gsoc2013-empathy-cf23dd409cc36a8f692bf0db4f28e505da8633f8.zip | |
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.
| -rw-r--r-- | libempathy-gtk/Makefile.am | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contactinfo-utils.c (renamed from libempathy/empathy-contactinfo-utils.c) | 0 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contactinfo-utils.h (renamed from libempathy/empathy-contactinfo-utils.h) | 0 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-individual-widget.c | 2 | ||||
| -rw-r--r-- | libempathy/Makefile.am | 2 |
5 files changed, 3 insertions, 3 deletions
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index ccf87f2f0..96ef811b4 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 index c4bbeb1ab..c4bbeb1ab 100644 --- a/libempathy/empathy-contactinfo-utils.c +++ b/libempathy-gtk/empathy-contactinfo-utils.c diff --git a/libempathy/empathy-contactinfo-utils.h b/libempathy-gtk/empathy-contactinfo-utils.h index 059085c84..059085c84 100644 --- a/libempathy/empathy-contactinfo-utils.h +++ b/libempathy-gtk/empathy-contactinfo-utils.h diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c index 697eb257f..7354ee83e 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 bb3088234..079b4736b 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 \ |