aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-11-22 00:23:16 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-11-22 00:23:16 +0800
commite7d0410043afbe679e5f530a09e7513002faba50 (patch)
tree81fc199ba1fa0cd42c63fc6ec696d61b2b12cf8e
parentabb968c6cdc50023b248b328a403444e644619bc (diff)
downloadgsoc2013-empathy-e7d0410043afbe679e5f530a09e7513002faba50.tar
gsoc2013-empathy-e7d0410043afbe679e5f530a09e7513002faba50.tar.gz
gsoc2013-empathy-e7d0410043afbe679e5f530a09e7513002faba50.tar.bz2
gsoc2013-empathy-e7d0410043afbe679e5f530a09e7513002faba50.tar.lz
gsoc2013-empathy-e7d0410043afbe679e5f530a09e7513002faba50.tar.xz
gsoc2013-empathy-e7d0410043afbe679e5f530a09e7513002faba50.tar.zst
gsoc2013-empathy-e7d0410043afbe679e5f530a09e7513002faba50.zip
Move the ft manager to src/ other programs do not need it.
svn path=/trunk/; revision=1884
-rw-r--r--libempathy-gtk/Makefile.am5
-rw-r--r--src/Makefile.am2
-rw-r--r--src/empathy-ft-manager.c (renamed from libempathy-gtk/empathy-ft-manager.c)10
-rw-r--r--src/empathy-ft-manager.glade (renamed from libempathy-gtk/empathy-ft-manager.glade)0
-rw-r--r--src/empathy-ft-manager.h (renamed from libempathy-gtk/empathy-ft-manager.h)0
-rw-r--r--src/empathy.c2
6 files changed, 9 insertions, 10 deletions
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 1892b5689..17cfa4dc6 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -33,7 +33,6 @@ libempathy_gtk_la_SOURCES = \
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 @@ libempathy_gtk_headers = \
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 @@ glade_DATA = \
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) && \
diff --git a/src/Makefile.am b/src/Makefile.am
index c5944aa0a..5b9b610a5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,7 @@ empathy_SOURCES = \
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 @@ glade_DATA = \
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 \
diff --git a/libempathy-gtk/empathy-ft-manager.c b/src/empathy-ft-manager.c
index a939e6a4a..5ec319b81 100644
--- a/libempathy-gtk/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -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
diff --git a/libempathy-gtk/empathy-ft-manager.glade b/src/empathy-ft-manager.glade
index 5af2a55dc..5af2a55dc 100644
--- a/libempathy-gtk/empathy-ft-manager.glade
+++ b/src/empathy-ft-manager.glade
diff --git a/libempathy-gtk/empathy-ft-manager.h b/src/empathy-ft-manager.h
index d8cab58d7..d8cab58d7 100644
--- a/libempathy-gtk/empathy-ft-manager.h
+++ b/src/empathy-ft-manager.h
diff --git a/src/empathy.c b/src/empathy.c
index 869d14880..a5606acbe 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -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