diff options
| -rw-r--r-- | libempathy-gtk/Makefile.am | 9 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-view.c | 2 | ||||
| -rw-r--r-- | libempathy/Makefile.am | 5 | ||||
| -rw-r--r-- | libempathy/empathy-contact-groups.c (renamed from libempathy-gtk/empathy-contact-groups.c) | 5 | ||||
| -rw-r--r-- | libempathy/empathy-contact-groups.dtd (renamed from libempathy-gtk/empathy-contact-groups.dtd) | 0 | ||||
| -rw-r--r-- | libempathy/empathy-contact-groups.h (renamed from libempathy-gtk/empathy-contact-groups.h) | 0 |
6 files changed, 8 insertions, 13 deletions
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index 002762138..721bd82e2 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -28,7 +28,6 @@ libempathy_gtk_la_SOURCES = \ empathy-cell-renderer-activatable.c \ empathy-spell.c \ empathy-spell-dialog.c \ - empathy-contact-groups.c \ empathy-contact-list-store.c \ empathy-contact-list-view.c \ empathy-preferences.c \ @@ -83,7 +82,6 @@ libempathy_gtk_headers = \ empathy-cell-renderer-activatable.h \ empathy-spell.h \ empathy-spell-dialog.h \ - empathy-contact-groups.h \ empathy-contact-list-store.h \ empathy-contact-list-view.h \ empathy-preferences.h \ @@ -174,16 +172,11 @@ empathy-gtk-enum-types.c: Makefile $(libempathy_gtk_headers) && cp xgen-gtc $(@F) \ && rm -f xgen-gtc -dtddir = $(datadir)/empathy -dtd_DATA = \ - empathy-contact-groups.dtd - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libempathy-gtk.pc EXTRA_DIST = \ - $(glade_DATA) \ - $(dtd_DATA) + $(glade_DATA) CLEANFILES = \ $(BUILT_SOURCES) \ diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c index 35557f10d..78ac3980c 100644 --- a/libempathy-gtk/empathy-contact-list-view.c +++ b/libempathy-gtk/empathy-contact-list-view.c @@ -40,6 +40,7 @@ #include <libempathy/empathy-contact-list.h> #include <libempathy/empathy-log-manager.h> #include <libempathy/empathy-tp-group.h> +#include <libempathy/empathy-contact-groups.h> #include <libempathy/empathy-debug.h> #include <libempathy/empathy-utils.h> #include <libempathy/empathy-marshal.h> @@ -47,7 +48,6 @@ #include "empathy-contact-list-view.h" #include "empathy-contact-list-store.h" #include "empathy-images.h" -#include "empathy-contact-groups.h" #include "empathy-cell-renderer-expander.h" #include "empathy-cell-renderer-text.h" #include "empathy-cell-renderer-activatable.h" diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index c6c7faa8e..e6711c3c6 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -20,13 +20,14 @@ libempathy_la_SOURCES = \ empathy-avatar.c \ empathy-time.c \ empathy-presence.c \ - empathy-status-presets.c \ + empathy-status-presets.c \ empathy-debug.c \ empathy-utils.c \ empathy-message.c \ empathy-chatroom-manager.c \ empathy-chatroom.c \ empathy-contact.c \ + empathy-contact-groups.c \ empathy-contact-list.c \ empathy-contact-manager.c \ empathy-contact-factory.c \ @@ -64,6 +65,7 @@ libempathy_headers = \ empathy-chatroom-manager.h \ empathy-chatroom.h \ empathy-contact.h \ + empathy-contact-groups.h \ empathy-contact-list.h \ empathy-contact-manager.h \ empathy-contact-factory.h \ @@ -142,6 +144,7 @@ empathy-enum-types.c: $(libempathy_headers) Makefile dtddir = $(datadir)/empathy dtd_DATA = \ empathy-status-presets.dtd \ + empathy-contact-groups.dtd \ empathy-chatroom-manager.dtd stylesheetdir = $(datadir)/empathy diff --git a/libempathy-gtk/empathy-contact-groups.c b/libempathy/empathy-contact-groups.c index 1e5fabe29..b71cf6642 100644 --- a/libempathy-gtk/empathy-contact-groups.c +++ b/libempathy/empathy-contact-groups.c @@ -32,9 +32,8 @@ #include <libxml/parser.h> #include <libxml/tree.h> -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-utils.h> - +#include "empathy-debug.h" +#include "empathy-utils.h" #include "empathy-contact-groups.h" #define DEBUG_DOMAIN "ContactGroups" diff --git a/libempathy-gtk/empathy-contact-groups.dtd b/libempathy/empathy-contact-groups.dtd index b4de2260a..b4de2260a 100644 --- a/libempathy-gtk/empathy-contact-groups.dtd +++ b/libempathy/empathy-contact-groups.dtd diff --git a/libempathy-gtk/empathy-contact-groups.h b/libempathy/empathy-contact-groups.h index e2e9810e3..e2e9810e3 100644 --- a/libempathy-gtk/empathy-contact-groups.h +++ b/libempathy/empathy-contact-groups.h |