-SUBDIRS = po profiles pixmaps libempathy libempathy-gtk accounts contact-list chat src
+SUBDIRS = po profiles pixmaps libempathy libempathy-gtk src
DISTCHECK_CONFIGURE_FLAGS = \
--disable-scrollkeeper
# Workaround broken scrollkeeper that doesn't remove its files on
# uninstall.
distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
+
+dist-hook:
+ chmod a+w ${distdir}/ChangeLog
+ if test -d _darcs; then darcs changes >${distdir}/ChangeLog; fi
+++ /dev/null
-AM_CPPFLAGS = \
- -I$(top_srcdir) \
- -DPREFIX="\"$(prefix)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DLIBDIR=\""$(libdir)"\" \
- $(EMPATHY_CFLAGS) \
- $(WARN_CFLAGS)
-
-bin_PROGRAMS = empathy-accounts
-
-empathy_accounts_SOURCES = \
- empathy-accounts-main.c
-
-empathy_accounts_LDADD = \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la \
- $(EMPATHY_LIBS)
-
+++ /dev/null
-/* -*- 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/empathy-session.h>
-#include <libempathy-gtk/gossip-accounts-dialog.h>
-
-static void
-destroy_cb (GtkWidget *dialog,
- gpointer user_data)
-{
- empathy_session_finalize ();
- 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;
-}
-
+++ /dev/null
-AM_CPPFLAGS = \
- -I$(top_srcdir) \
- -DPREFIX="\"$(prefix)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DLIBDIR=\""$(libdir)"\" \
- $(EMPATHY_CFLAGS) \
- $(WARN_CFLAGS)
-
-bin_PROGRAMS = empathy-chat
-
-empathy_chat_SOURCES = \
- empathy-chat-main.c
-
-empathy_chat_LDADD = \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la \
- $(EMPATHY_LIBS)
-
-# 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
-
-
-EXTRA_DIST = \
- org.gnome.Empathy.Chat.service.in \
- $(chandler_DATA)
-
-BUILT_SOURCES = \
- org.gnome.Empathy.Chat.service
-
-CLEANFILES = $(BUILT_SOURCES)
+++ /dev/null
-/* -*- 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-session.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_session_get_contact_manager ();
- 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);
- }
-}
-
-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;
-}
-
+++ /dev/null
-[ChannelHandler]
-BusName = org.gnome.Empathy.Chat
-ObjectPath = /org/freedesktop/Telepathy/ChannelHandler
-ChannelType = org.freedesktop.Telepathy.Channel.Type.Text
-
+++ /dev/null
-[D-BUS Service]
-Name=org.gnome.Empathy.Chat
-Exec=@bindir@/empathy-chat
-AC_INIT(Empathy, 0.1)
+AC_INIT(Empathy, 0.3)
AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (C) 2003-2007 Imendio AB])
pixmaps/Makefile
libempathy/Makefile
libempathy-gtk/Makefile
- accounts/Makefile
- contact-list/Makefile
- chat/Makefile
src/Makefile
])
+++ /dev/null
-AM_CPPFLAGS = \
- -I$(top_srcdir) \
- -DPREFIX="\"$(prefix)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DLIBDIR=\""$(libdir)"\" \
- $(EMPATHY_CFLAGS) \
- $(WARN_CFLAGS)
-
-bin_PROGRAMS = empathy-contact-list
-
-empathy_contact_list_SOURCES = \
- empathy-contact-list-main.c
-
-empathy_contact_list_LDADD = \
- $(top_builddir)/libempathy/libempathy.la \
- $(top_builddir)/libempathy-gtk/libempathy-gtk.la \
- $(EMPATHY_LIBS)
-
-
+++ /dev/null
-/* -*- 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/empathy-session.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 ();
- empathy_session_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;
-}
-
#include <gtk/gtk.h>
#include <glade/glade.h>
-#include <libempathy/empathy-session.h>
#include <libempathy/empathy-contact-manager.h>
#include <libempathy/gossip-debug.h>
#include <libempathy/gossip-utils.h>
#define COMPOSING_STOP_TIMEOUT 5
struct _GossipChatPriv {
- EmpathyTpChat *tp_chat;
- GossipChatWindow *window;
-
- GtkTooltips *tooltips;
- guint composing_stop_timeout_id;
- gboolean sensitive;
- gchar *id;
- GSList *sent_messages;
- gint sent_messages_index;
+ EmpathyContactManager *manager;
+ EmpathyTpChat *tp_chat;
+ GossipChatWindow *window;
+
+ GtkTooltips *tooltips;
+ guint composing_stop_timeout_id;
+ gboolean sensitive;
+ gchar *id;
+ GSList *sent_messages;
+ gint sent_messages_index;
/* Used to automatically shrink a window that has temporarily
* grown due to long input.
*/
- gint padding_height;
- gint default_window_height;
- gint last_input_height;
- gboolean vscroll_visible;
+ gint padding_height;
+ gint default_window_height;
+ gint last_input_height;
+ gboolean vscroll_visible;
};
typedef struct {
priv = GET_PRIV (chat);
+ priv->manager = empathy_contact_manager_new ();
priv->tooltips = gtk_tooltips_new ();
-
priv->default_window_height = -1;
priv->vscroll_visible = FALSE;
priv->sensitive = TRUE;
"changed",
G_CALLBACK (chat_input_text_buffer_changed_cb),
chat);
- g_signal_connect (GOSSIP_CHAT (chat)->view,
+ g_signal_connect (chat->view,
"focus_in_event",
G_CALLBACK (chat_text_view_focus_in_event_cb),
chat);
g_slist_free (priv->sent_messages);
chat_composing_remove_timeout (chat);
- g_object_unref (GOSSIP_CHAT (object)->account);
+ g_object_unref (chat->account);
+ g_object_unref (priv->manager);
if (priv->tp_chat) {
g_object_unref (priv->tp_chat);
GossipContact *
gossip_chat_get_own_contact (GossipChat *chat)
{
- EmpathyContactManager *manager;
+ GossipChatPriv *priv;
g_return_val_if_fail (GOSSIP_IS_CHAT (chat), NULL);
- manager = empathy_session_get_contact_manager ();
+ priv = GET_PRIV (chat);
- return empathy_contact_manager_get_own (manager, chat->account);
+ return empathy_contact_manager_get_own (priv->manager, chat->account);
}
GtkWidget *
g_return_val_if_fail (GOSSIP_IS_CHAT (chat), FALSE);
- window = gossip_chat_get_window (GOSSIP_CHAT (chat));
+ window = gossip_chat_get_window (chat);
if (!window) {
return TRUE;
}
#include <libempathy/empathy-contact-manager.h>
#include <libempathy/gossip-debug.h>
-#include <libempathy/empathy-session.h>
#include "gossip-contact-list.h"
#include "gossip-contact-groups.h"
priv = GET_PRIV (list);
- priv->manager = empathy_session_get_contact_manager ();
- g_object_ref (priv->manager);
+ priv->manager = empathy_contact_manager_new ();
priv->is_compact = FALSE;
priv->show_active = TRUE;
priv->show_avatars = TRUE;
gossip-debug.c gossip-debug.h \
gossip-utils.c gossip-utils.h \
gossip-message.c gossip-message.h \
- empathy-session.c empathy-session.h \
empathy-contact-list.c empathy-contact-list.h \
empathy-contact-manager.c empathy-contact-manager.h \
empathy-tp-chat.c empathy-tp-chat.h \
#include <libtelepathy/tp-conn-iface-avatars-gen.h>
#include "empathy-contact-list.h"
-#include "empathy-session.h"
#include "gossip-debug.h"
#include "gossip-telepathy-group.h"
#include <libtelepathy/tp-constants.h>
#include "empathy-contact-manager.h"
-#include "empathy-session.h"
#include "gossip-utils.h"
#include "gossip-debug.h"
EmpathyContactManager *
empathy_contact_manager_new (void)
{
- return g_object_new (EMPATHY_TYPE_CONTACT_MANAGER, NULL);
+ static EmpathyContactManager *manager = NULL;
+
+ if (!manager) {
+ manager = g_object_new (EMPATHY_TYPE_CONTACT_MANAGER, NULL);
+ g_object_add_weak_pointer (G_OBJECT (manager), (gpointer) &manager);
+ } else {
+ g_object_ref (manager);
+ }
+
+ return manager;
}
void
+++ /dev/null
-/* -*- 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 <glib.h>
-
-#include <libtelepathy/tp-helpers.h>
-
-#include <libmissioncontrol/mc-account-monitor.h>
-
-#include "empathy-session.h"
-#include "gossip-debug.h"
-
-#define DEBUG_DOMAIN "Session"
-
-static EmpathyContactManager *contact_manager = NULL;
-
-void
-empathy_session_finalize (void)
-{
- if (contact_manager) {
- g_object_unref (contact_manager);
- contact_manager = NULL;
- }
-}
-
-EmpathyContactManager *
-empathy_session_get_contact_manager (void)
-{
- if (!contact_manager) {
- contact_manager = empathy_contact_manager_new ();
- }
-
- return contact_manager;
-}
-
+++ /dev/null
-/* -*- 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>
- */
-
-#ifndef __EMPATHY_SESSION_H__
-#define __EMPATHY_SESSION_H__
-
-#include <glib.h>
-
-#include <libmissioncontrol/mission-control.h>
-#include "empathy-contact-manager.h"
-
-G_BEGIN_DECLS
-
-void empathy_session_finalize (void);
-EmpathyContactManager *empathy_session_get_contact_manager (void);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_MISSION_CONTROL_H__ */
#include "empathy-tp-chat.h"
#include "empathy-contact-manager.h"
#include "empathy-contact-list.h"
-#include "empathy-session.h"
#include "empathy-marshal.h"
#include "gossip-debug.h"
#include "gossip-time.h"
#define DEBUG_DOMAIN "TpChat"
struct _EmpathyTpChatPriv {
- EmpathyContactList *list;
- McAccount *account;
- gchar *id;
- MissionControl *mc;
-
- TpChan *tp_chan;
- DBusGProxy *text_iface;
- DBusGProxy *chat_state_iface;
+ EmpathyContactList *list;
+ EmpathyContactManager *manager;
+ McAccount *account;
+ gchar *id;
+ MissionControl *mc;
+
+ TpChan *tp_chan;
+ DBusGProxy *text_iface;
+ DBusGProxy *chat_state_iface;
};
static void empathy_tp_chat_class_init (EmpathyTpChatClass *klass);
g_object_unref (priv->tp_chan);
}
+ if (priv->manager) {
+ g_object_unref (priv->manager);
+ }
if (priv->list) {
g_object_unref (priv->list);
}
{
EmpathyTpChatPriv *priv;
EmpathyTpChat *chat;
- EmpathyContactManager *manager;
g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
g_return_val_if_fail (TELEPATHY_IS_CHAN (tp_chan), NULL);
chat = g_object_new (EMPATHY_TYPE_TP_CHAT, NULL);
priv = GET_PRIV (chat);
- manager = empathy_session_get_contact_manager ();
- priv->list = empathy_contact_manager_get_list (manager, account);
+ priv->manager = empathy_contact_manager_new ();
+ priv->list = empathy_contact_manager_get_list (priv->manager, account);
priv->tp_chan = g_object_ref (tp_chan);
priv->account = g_object_ref (account);
priv->mc = mission_control_new (tp_get_bus ());
#include "gossip-debug.h"
#include "gossip-utils.h"
#include "gossip-paths.h"
-#include "empathy-session.h"
#include "empathy-contact-manager.h"
#define DEBUG_DOMAIN "Utils"
{
EmpathyContactManager *manager;
McAccount *account;
+ GossipContact *own_contact;
g_return_val_if_fail (GOSSIP_IS_CONTACT (contact), NULL);
- manager = empathy_session_get_contact_manager ();
+ manager = empathy_contact_manager_new ();
account = gossip_contact_get_account (contact);
+ own_contact = empathy_contact_manager_get_own (manager, account);
+ g_object_unref (manager);
- return empathy_contact_manager_get_own (manager, account);
+ return own_contact;
}
-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)
+
--- /dev/null
+/* -*- 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;
+}
+
--- /dev/null
+/* -*- 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;
+}
+
--- /dev/null
+[ChannelHandler]
+BusName = org.gnome.Empathy.Chat
+ObjectPath = /org/freedesktop/Telepathy/ChannelHandler
+ChannelType = org.freedesktop.Telepathy.Channel.Type.Text
+
--- /dev/null
+/* -*- 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;
+}
+
#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>
gpointer user_data)
{
gossip_stock_finalize ();
- empathy_session_finalize ();
gtk_main_quit ();
}
--- /dev/null
+[D-BUS Service]
+Name=org.gnome.Empathy.Chat
+Exec=@bindir@/empathy-chat
projects / empathy.git / commitdiff