empathy r592 - in trunk: libempathy libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Mon Jan 21 14:12:28 2008
New Revision: 592
URL: http://svn.gnome.org/viewvc/empathy?rev=592&view=rev

Log:
Move empathy-contact-groups to libempathy, it has nothing to do in -gtk


Added:
   trunk/libempathy/empathy-contact-groups.c
      - copied, changed from r591, /trunk/libempathy-gtk/empathy-contact-groups.c
   trunk/libempathy/empathy-contact-groups.dtd
      - copied, changed from r591, /trunk/libempathy-gtk/empathy-contact-groups.dtd
   trunk/libempathy/empathy-contact-groups.h
      - copied, changed from r591, /trunk/libempathy-gtk/empathy-contact-groups.h
Removed:
   trunk/libempathy-gtk/empathy-contact-groups.c
   trunk/libempathy-gtk/empathy-contact-groups.dtd
   trunk/libempathy-gtk/empathy-contact-groups.h
Modified:
   trunk/libempathy-gtk/Makefile.am
   trunk/libempathy-gtk/empathy-contact-list-view.c
   trunk/libempathy/Makefile.am

Modified: trunk/libempathy-gtk/Makefile.am
==============================================================================
--- trunk/libempathy-gtk/Makefile.am	(original)
+++ trunk/libempathy-gtk/Makefile.am	Mon Jan 21 14:12:28 2008
@@ -28,7 +28,6 @@
 	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 @@
 	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 @@
 	&& 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)		\

Modified: trunk/libempathy-gtk/empathy-contact-list-view.c
==============================================================================
--- trunk/libempathy-gtk/empathy-contact-list-view.c	(original)
+++ trunk/libempathy-gtk/empathy-contact-list-view.c	Mon Jan 21 14:12:28 2008
@@ -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"

Modified: trunk/libempathy/Makefile.am
==============================================================================
--- trunk/libempathy/Makefile.am	(original)
+++ trunk/libempathy/Makefile.am	Mon Jan 21 14:12:28 2008
@@ -20,13 +20,14 @@
 	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 @@
 	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 @@
 dtddir = $(datadir)/empathy
 dtd_DATA = 					\
 	empathy-status-presets.dtd		\
+	empathy-contact-groups.dtd		\
 	empathy-chatroom-manager.dtd
 
 stylesheetdir = $(datadir)/empathy

Copied: trunk/libempathy/empathy-contact-groups.c (from r591, /trunk/libempathy-gtk/empathy-contact-groups.c)
==============================================================================
--- /trunk/libempathy-gtk/empathy-contact-groups.c	(original)
+++ trunk/libempathy/empathy-contact-groups.c	Mon Jan 21 14:12:28 2008
@@ -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"

Copied: trunk/libempathy/empathy-contact-groups.dtd (from r591, /trunk/libempathy-gtk/empathy-contact-groups.dtd)
==============================================================================

Copied: trunk/libempathy/empathy-contact-groups.h (from r591, /trunk/libempathy-gtk/empathy-contact-groups.h)
==============================================================================