[darcs-to-svn @ Remove EmpathySession and move all programs into src/]

svn path=/trunk/; revision=28

7 files changed, 277 insertions, 15 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index b9c9ca2e8..83b071790 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,23 +1,54 @@
-AM_CPPFLAGS =	                                 	\
-	-I$(top_srcdir)                          	\
-	-DPREFIX="\"$(prefix)"\"			\
-	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
-	-DDATADIR=\""$(datadir)"\"              	\
-	-DLIBDIR=\""$(libdir)"\"			\
-	$(EMPATHY_CFLAGS)				\
+AM_CPPFLAGS =	                                 		\
+	-I$(top_srcdir)                          		\
+	-DPREFIX="\"$(prefix)"\"				\
+	-DSYSCONFDIR=\""$(sysconfdir)"\"			\
+	-DDATADIR=\""$(datadir)"\"              		\
+	-DLIBDIR=\""$(libdir)"\"				\
+	$(EMPATHY_CFLAGS)					\
 	$(WARN_CFLAGS)
 
-bin_PROGRAMS = empathy
+LDADD =								\
+	$(top_builddir)/libempathy/libempathy.la		\
+	$(top_builddir)/libempathy-gtk/libempathy-gtk.la	\
+	$(EMPATHY_LIBS)
 
-empathy_SOURCES = 				                \
+bin_PROGRAMS = empathy empathy-accounts empathy-chat empathy-contact-list
+empathy_SOURCES =						\
 	empathy-main.c
 
-empathy_LDADD = \
-	$(top_builddir)/libempathy/libempathy.la				\
-	$(top_builddir)/libempathy-gtk/libempathy-gtk.la			\
-	$(EMPATHY_LIBS)
+empathy_accounts_SOURCES =					\
+	empathy-accounts-main.c
+
+empathy_chat_SOURCES =						\
+	empathy-chat-main.c
+
+empathy_contact_list_SOURCES =					\
+	empathy-contact-list-main.c
+
+# Dbus service file
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.gnome.Empathy.Chat.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+
+# Rule to make the service file with bindir expanded
+$(service_DATA): $(service_in_files) Makefile
+	@sed -e "s|\@bindir\@|$(bindir)|" $< > $@
+
+chandlerdir = $(datadir)/telepathy/managers
+chandler_DATA = empathy-chat.chandler
 
 autostartdir = $(datadir)/gnome/autostart
 autostart_in_files = empathy.desktop.in
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
+
+BUILT_SOURCES =							\
+	org.gnome.Empathy.Chat.service
+
+EXTRA_DIST =							\
+	org.gnome.Empathy.Chat.service.in			\
+	$(autostart_DATA)					\
+	$(chandler_DATA)
+
+CLEANFILES = $(BUILT_SOURCES)
+
diff --git a/src/empathy-accounts-main.c b/src/empathy-accounts-main.c
new file mode 100644
index 000000000..954b3cea7
--- /dev/null
+++ b/src/empathy-accounts-main.c
@@ -0,0 +1,57 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2007 Collabora Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ * 
+ * Authors: Xavier Claessens <xclaesse@gmail.com>
+ */
+
+#include <config.h>
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include <libempathy-gtk/gossip-accounts-dialog.h>
+
+static void
+destroy_cb (GtkWidget *dialog,
+	    gpointer   user_data)
+{
+	gtk_main_quit ();
+}
+
+int
+main (int argc, char *argv[])
+{
+	GtkWidget *dialog;
+
+	gtk_init (&argc, &argv);
+
+	dialog = gossip_accounts_dialog_show ();
+
+	g_signal_connect (dialog, "destroy",
+			  G_CALLBACK (destroy_cb),
+			  NULL);
+
+	gtk_main ();
+
+	return EXIT_SUCCESS;
+}
+
diff --git a/src/empathy-chat-main.c b/src/empathy-chat-main.c
new file mode 100644
index 000000000..7fde26ae0
--- /dev/null
+++ b/src/empathy-chat-main.c
@@ -0,0 +1,96 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2007 Collabora Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ * 
+ * Authors: Xavier Claessens <xclaesse@gmail.com>
+ */
+
+#include <config.h>
+
+#include <stdlib.h>
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include <libtelepathy/tp-conn.h>
+#include <libtelepathy/tp-chan.h>
+#include <libtelepathy/tp-helpers.h>
+#include <libmissioncontrol/mc-account.h>
+
+#include <libempathy/gossip-contact.h>
+#include <libempathy/empathy-chandler.h>
+#include <libempathy/empathy-contact-manager.h>
+#include <libempathy/empathy-contact-list.h>
+#include <libempathy-gtk/gossip-private-chat.h>
+#include <libempathy-gtk/gossip-stock.h>
+
+#define BUS_NAME "org.gnome.Empathy.Chat"
+#define OBJECT_PATH "/org/freedesktop/Telepathy/ChannelHandler"
+
+static void
+new_channel_cb (EmpathyChandler *chandler,
+		TpConn          *tp_conn,
+		TpChan          *tp_chan,
+		gpointer         user_data)
+{
+	if (tp_chan->handle_type == TP_HANDLE_TYPE_CONTACT) {
+		MissionControl        *mc;
+		McAccount             *account;
+		EmpathyContactManager *manager;
+		EmpathyContactList    *list;
+		GossipContact         *contact;
+		GossipPrivateChat     *chat;
+
+		/* We have a private chat channel */
+		mc = mission_control_new (tp_get_bus ());
+		account = mission_control_get_account_for_connection (mc, tp_conn, NULL);
+		manager = empathy_contact_manager_new ();
+		list = empathy_contact_manager_get_list (manager, account);
+		contact = empathy_contact_list_get_from_handle (list, tp_chan->handle);
+
+		chat = gossip_private_chat_new_with_channel (contact, tp_chan);
+		gossip_chat_present (GOSSIP_CHAT (chat));
+
+		g_object_unref (mc);
+		g_object_unref (account);
+		g_object_unref (contact);
+		g_object_unref (chat);
+		g_object_unref (manager);
+	}
+}
+
+int
+main (int argc, char *argv[])
+{
+	EmpathyChandler *chandler;
+
+	gtk_init (&argc, &argv);
+	/* FIXME: This is a horrible hack */
+	gossip_stock_init (gtk_window_new (GTK_WINDOW_TOPLEVEL));
+
+	chandler = empathy_chandler_new (BUS_NAME, OBJECT_PATH);
+
+	g_signal_connect (chandler, "new-channel",
+			  G_CALLBACK (new_channel_cb),
+			  NULL);
+
+	gtk_main ();
+
+	return EXIT_SUCCESS;
+}
+
diff --git a/src/empathy-chat.chandler b/src/empathy-chat.chandler
new file mode 100644
index 000000000..4cfe75b01
--- /dev/null
+++ b/src/empathy-chat.chandler
@@ -0,0 +1,5 @@
+[ChannelHandler]
+BusName = org.gnome.Empathy.Chat
+ObjectPath = /org/freedesktop/Telepathy/ChannelHandler
+ChannelType = org.freedesktop.Telepathy.Channel.Type.Text
+
diff --git a/src/empathy-contact-list-main.c b/src/empathy-contact-list-main.c
new file mode 100644
index 000000000..084649bab
--- /dev/null
+++ b/src/empathy-contact-list-main.c
@@ -0,0 +1,72 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2007 Collabora Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ * 
+ * Authors: Xavier Claessens <xclaesse@gmail.com>
+ */
+
+#include <config.h>
+
+#include <stdlib.h>
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include <libmissioncontrol/mc-account.h>
+
+#include <libempathy-gtk/empathy-main-window.h>
+#include <libempathy-gtk/gossip-stock.h>
+#include <libempathy-gtk/gossip-accounts-dialog.h>
+
+static void
+destroy_cb (GtkWidget *window,
+	    gpointer   user_data)
+{
+	gossip_stock_finalize ();
+	gtk_main_quit ();
+}
+
+int
+main (int argc, char *argv[])
+{
+	GtkWidget *window;
+	GList     *accounts;
+
+	gtk_init (&argc, &argv);
+
+	/* FIXME: This is a horrible hack */
+	gossip_stock_init (gtk_window_new (GTK_WINDOW_TOPLEVEL));
+
+	window = empathy_main_window_show ();
+	g_signal_connect (window, "destroy",
+			  G_CALLBACK (destroy_cb),
+			  NULL);
+
+	/* Show the accounts dialog if there is no enabled accounts */
+	accounts = mc_accounts_list_by_enabled (TRUE);
+	if (accounts) {
+		mc_accounts_list_free (accounts);
+	} else {
+		gossip_accounts_dialog_show ();
+	}
+
+	gtk_main ();
+
+	return EXIT_SUCCESS;
+}
+
diff --git a/src/empathy-main.c b/src/empathy-main.c
index 94e29e2b5..2aea589f6 100644
--- a/src/empathy-main.c
+++ b/src/empathy-main.c
@@ -33,7 +33,6 @@
 #include <libmissioncontrol/mc-account-monitor.h>
 #include <libmissioncontrol/mission-control.h>
 
-#include <libempathy/empathy-session.h>
 #include <libempathy/gossip-debug.h>
 #include <libempathy-gtk/empathy-main-window.h>
 #include <libempathy-gtk/gossip-status-presets.h>
@@ -106,7 +105,6 @@ destroy_cb (GtkWidget *window,
 	    gpointer   user_data)
 {
 	gossip_stock_finalize ();
-	empathy_session_finalize ();
 	gtk_main_quit ();
 }
 
diff --git a/src/org.gnome.Empathy.Chat.service.in b/src/org.gnome.Empathy.Chat.service.in
new file mode 100644
index 000000000..6a794e4b8
--- /dev/null
+++ b/src/org.gnome.Empathy.Chat.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.gnome.Empathy.Chat
+Exec=@bindir@/empathy-chat