empathy r1884 - in trunk: libempathy-gtk src

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Nov 21 16:23:16 2008
New Revision: 1884
URL: http://svn.gnome.org/viewvc/empathy?rev=1884&view=rev

Log:
Move the ft manager to src/ other programs do not need it.

Added:
   trunk/src/empathy-ft-manager.c
      - copied, changed from r1883, /trunk/libempathy-gtk/empathy-ft-manager.c
   trunk/src/empathy-ft-manager.glade
      - copied, changed from r1883, /trunk/libempathy-gtk/empathy-ft-manager.glade
   trunk/src/empathy-ft-manager.h
      - copied, changed from r1883, /trunk/libempathy-gtk/empathy-ft-manager.h
Removed:
   trunk/libempathy-gtk/empathy-ft-manager.c
   trunk/libempathy-gtk/empathy-ft-manager.glade
   trunk/libempathy-gtk/empathy-ft-manager.h
Modified:
   trunk/libempathy-gtk/Makefile.am
   trunk/src/Makefile.am
   trunk/src/empathy.c

Modified: trunk/libempathy-gtk/Makefile.am
==============================================================================
--- trunk/libempathy-gtk/Makefile.am	(original)
+++ trunk/libempathy-gtk/Makefile.am	Fri Nov 21 16:23:16 2008
@@ -33,7 +33,6 @@
 	empathy-contact-list-view.c		\
 	empathy-contact-menu.c			\
 	empathy-contact-widget.c		\
-	empathy-ft-manager.c			\
 	empathy-geometry.c			\
 	empathy-irc-network-dialog.c		\
 	empathy-log-window.c			\
@@ -81,7 +80,6 @@
 	empathy-contact-list-view.h		\
 	empathy-contact-menu.h			\
 	empathy-contact-widget.h		\
-	empathy-ft-manager.h			\
 	empathy-geometry.h			\
 	empathy-images.h			\
 	empathy-irc-network-dialog.h		\
@@ -121,8 +119,7 @@
 	empathy-spell-dialog.glade		\
 	empathy-log-window.glade		\
 	empathy-chat.glade			\
-	empathy-new-message-dialog.glade	\
-	empathy-ft-manager.glade
+	empathy-new-message-dialog.glade
 
 empathy-gtk-marshal.list: $(libempathy_gtk_la_SOURCES) Makefile.am
 	( cd $(srcdir) && \

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Fri Nov 21 16:23:16 2008
@@ -28,6 +28,7 @@
 	empathy-chatrooms-window.c empathy-chatrooms-window.h		\
 	empathy-chat-window.c empathy-chat-window.h			\
 	empathy-event-manager.c empathy-event-manager.h			\
+	empathy-ft-manager.c empathy-ft-manager.h			\
 	empathy-import-dialog.c empathy-import-dialog.h			\
 	empathy-import-pidgin.c empathy-import-pidgin.h			\
 	empathy-main-window.c empathy-main-window.h			\
@@ -44,6 +45,7 @@
 	empathy-call-window.glade		\
 	empathy-chatrooms-window.glade		\
 	empathy-chat-window.glade		\
+	empathy-ft-manager.glade		\
 	empathy-main-window.glade		\
 	empathy-new-chatroom-dialog.glade	\
 	empathy-preferences.glade		\

Copied: trunk/src/empathy-ft-manager.c (from r1883, /trunk/libempathy-gtk/empathy-ft-manager.c)
==============================================================================
--- /trunk/libempathy-gtk/empathy-ft-manager.c	(original)
+++ trunk/src/empathy-ft-manager.c	Fri Nov 21 16:23:16 2008
@@ -40,12 +40,12 @@
 #include <libempathy/empathy-tp-file.h>
 #include <libempathy/empathy-utils.h>
 
-#include "empathy-conf.h"
-#include "empathy-ft-manager.h"
-#include "empathy-ui-utils.h"
-#include "empathy-geometry.h"
-#include "empathy-images.h"
+#include <libempathy-gtk/empathy-conf.h>
+#include <libempathy-gtk/empathy-ui-utils.h>
+#include <libempathy-gtk/empathy-geometry.h>
+#include <libempathy-gtk/empathy-images.h>
 
+#include "empathy-ft-manager.h"
 
 /**
  * SECTION:empathy-ft-manager

Copied: trunk/src/empathy-ft-manager.glade (from r1883, /trunk/libempathy-gtk/empathy-ft-manager.glade)
==============================================================================

Copied: trunk/src/empathy-ft-manager.h (from r1883, /trunk/libempathy-gtk/empathy-ft-manager.h)
==============================================================================

Modified: trunk/src/empathy.c
==============================================================================
--- trunk/src/empathy.c	(original)
+++ trunk/src/empathy.c	Fri Nov 21 16:23:16 2008
@@ -44,7 +44,6 @@
 #include <libempathy/empathy-tp-group.h>
 
 #include <libempathy-gtk/empathy-conf.h>
-#include <libempathy-gtk/empathy-ft-manager.h>
 
 #include <extensions/extensions.h>
 
@@ -53,6 +52,7 @@
 #include "empathy-status-icon.h"
 #include "empathy-call-window.h"
 #include "empathy-chat-window.h"
+#include "empathy-ft-manager.h"
 #include "bacon-message-connection.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER