+2007-06-14 Xavier Claessens <xclaesse@gmail.com>
+
+ * src/org.gnome.Empathy.Chat.service.in:
+ * src/empathy-accounts.c:
+ * src/empathy-accounts-main.c:
+ * src/empathy-chat-main.c:
+ * src/empathy.c:
+ * src/Makefile.am:
+ * src/empathy-main.c:
+ * libempathy/gossip-chatroom-manager.c:
+ * autogen.sh: Empathy is no more splitted into 2 processes. It makes
+ debugging more difficult when emmpathy-chat crashes. It's also more
+ optimised like that since contact objects can be shared.
+
2007-06-14 Xavier Claessens <xclaesse@gmail.com>
* libempathy-gtk/gossip-chat-window.c: Disconnect signals from
cd $srcdir
PROJECT="empathy"
TEST_TYPE=-f
-FILE=src/empathy-main.c
+FILE=src/empathy.c
CONFIGURE=configure.ac
DIE=0
#include <libxml/parser.h>
#include <libxml/tree.h>
-#include <libgnomevfs/gnome-vfs.h>
-
#include "gossip-debug.h"
#include "gossip-chatroom-manager.h"
#include "gossip-utils.h"
struct _GossipChatroomManagerPriv {
GList *chatrooms;
- GHashTable *monitors;
};
static void gossip_chatroom_manager_class_init (GossipChatroomManagerClass *klass);
static void gossip_chatroom_manager_init (GossipChatroomManager *manager);
static void chatroom_manager_finalize (GObject *object);
static gboolean chatroom_manager_get_all (GossipChatroomManager *manager);
-static void chatroom_manager_file_changed_cb (GnomeVFSMonitorHandle *handle,
- const gchar *monitor_uri,
- const gchar *info_uri,
- GnomeVFSMonitorEventType event_type,
- GossipChatroomManager *manager);
static gboolean chatroom_manager_file_parse (GossipChatroomManager *manager,
const gchar *filename);
static void chatroom_manager_parse_chatroom (GossipChatroomManager *manager,
GossipChatroomManagerPriv *priv;
priv = GET_PRIV (manager);
-
- priv->monitors = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- (GDestroyNotify) g_free,
- (GDestroyNotify) gnome_vfs_monitor_cancel);
}
static void
g_list_foreach (priv->chatrooms, (GFunc) g_object_unref, NULL);
g_list_free (priv->chatrooms);
- g_hash_table_destroy (priv->monitors);
(G_OBJECT_CLASS (gossip_chatroom_manager_parent_class)->finalize) (object);
}
return TRUE;
}
-static void
-chatroom_manager_file_changed_cb (GnomeVFSMonitorHandle *handle,
- const gchar *monitor_uri,
- const gchar *info_uri,
- GnomeVFSMonitorEventType event_type,
- GossipChatroomManager *manager)
-{
- GossipChatroomManagerPriv *priv;
- GList *l;
-
- priv = GET_PRIV (manager);
-
- gossip_debug (DEBUG_DOMAIN, "Reload file: %s", monitor_uri);
-
- /* FIXME: This is not optimised */
- for (l = priv->chatrooms; l; l = l->next) {
- g_signal_emit (manager, signals[CHATROOM_REMOVED], 0, l->data);
- g_object_unref (l->data);
- }
- g_list_free (priv->chatrooms);
- priv->chatrooms = NULL;
-
- chatroom_manager_get_all (manager);
-}
-
static gboolean
chatroom_manager_file_parse (GossipChatroomManager *manager,
const gchar *filename)
priv = GET_PRIV (manager);
- /* Do not monitor this file twice if it's already monitored */
- if (!g_hash_table_lookup (priv->monitors, filename)) {
- GnomeVFSMonitorHandle *handle;
-
- gnome_vfs_monitor_add (&handle,
- filename,
- GNOME_VFS_MONITOR_FILE,
- (GnomeVFSMonitorCallback) chatroom_manager_file_changed_cb,
- manager);
-
- g_hash_table_insert (priv->monitors, g_strdup (filename), handle);
- }
-
gossip_debug (DEBUG_DOMAIN, "Attempting to parse file:'%s'...", filename);
ctxt = xmlNewParserCtxt ();
-cppflags = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DPREFIX="\"$(prefix)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
$(EMPATHY_CFLAGS) \
$(WARN_CFLAGS)
-libs = \
+LDADD = \
$(top_builddir)/libempathy-gtk/libempathy-gtk.la \
$(EMPATHY_LIBS)
bin_PROGRAMS = \
empathy \
- empathy-chat \
empathy-accounts
-empathy_SOURCES = empathy-main.c
-empathy_CPPFLAGS = $(cppflags)
-empathy_LDADD = $(libs)
-
-empathy_accounts_SOURCES = empathy-accounts-main.c
-empathy_accounts_CPPFLAGS = $(cppflags)
-empathy_accounts_LDADD = $(libs)
-
-empathy_chat_SOURCES = empathy-chat-main.c
-empathy_chat_CPPFLAGS = $(cppflags)
-empathy_chat_LDADD = $(libs)
+empathy_SOURCES = empathy.c
+empathy_accounts_SOURCES = empathy-accounts.c
# Dbus service file
servicedir = $(datadir)/dbus-1/services
+++ /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);
-
- gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
- DATADIR G_DIR_SEPARATOR_S "empathy");
- dialog = gossip_accounts_dialog_show (NULL);
-
- 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 <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);
+
+ gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+ DATADIR G_DIR_SEPARATOR_S "empathy");
+ dialog = gossip_accounts_dialog_show (NULL);
+
+ 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 <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include <libgnome/gnome-program.h>
-#include <libgnomeui/gnome-ui-init.h>
-
-#include <libtelepathy/tp-conn.h>
-#include <libtelepathy/tp-chan.h>
-#include <libmissioncontrol/mc-account.h>
-
-#include <libempathy/gossip-contact.h>
-#include <libempathy/gossip-debug.h>
-#include <libempathy/gossip-utils.h>
-#include <libempathy/empathy-chandler.h>
-#include <libempathy/empathy-tp-chat.h>
-#include <libempathy-gtk/gossip-private-chat.h>
-#include <libempathy-gtk/gossip-group-chat.h>
-
-#define DEBUG_DOMAIN "ChatMain"
-
-#define BUS_NAME "org.gnome.Empathy.Chat"
-#define OBJECT_PATH "/org/freedesktop/Telepathy/ChannelHandler"
-
-/* Time to wait before exit, in seconds */
-#define EXIT_TIMEOUT 5
-
-
-static guint chat_count = 0;
-static guint exit_timeout = 0;
-static gboolean debug_mode = FALSE;
-
-static gboolean
-exit_timeout_cb (gpointer user_data)
-{
- gossip_debug (DEBUG_DOMAIN, "Timeout, exiting");
-
- gtk_main_quit ();
-
- return FALSE;
-}
-
-static void
-exit_timeout_start (void)
-{
- if (exit_timeout || debug_mode) {
- return;
- }
-
- exit_timeout = g_timeout_add (EXIT_TIMEOUT * 1000,
- (GSourceFunc) exit_timeout_cb,
- NULL);
-}
-
-static void
-exit_timeout_stop (void)
-{
- if (exit_timeout) {
- gossip_debug (DEBUG_DOMAIN, "Exit timeout canceled");
- g_source_remove (exit_timeout);
- exit_timeout = 0;
- }
-}
-
-static void
-chat_finalized_cb (gpointer user_data,
- GossipChat *chat)
-{
- chat_count--;
- if (chat_count == 0) {
- gossip_debug (DEBUG_DOMAIN, "No more chat, start exit timeout");
- exit_timeout_start ();
- }
-}
-
-static void
-new_channel_cb (EmpathyChandler *chandler,
- TpConn *tp_conn,
- TpChan *tp_chan,
- gpointer user_data)
-{
- MissionControl *mc;
- McAccount *account;
- GossipChat *chat;
- gchar *id;
-
- mc = gossip_mission_control_new ();
- account = mission_control_get_account_for_connection (mc, tp_conn, NULL);
- id = gossip_get_channel_id (account, tp_chan);
- chat = gossip_chat_window_find_chat (account, id);
-
- g_free (id);
- g_object_unref (mc);
-
- if (chat) {
- /* The chat already exists */
- if (!gossip_chat_is_connected (chat)) {
- EmpathyTpChat *tp_chat;
-
- /* The chat died, give him the new text channel */
- tp_chat = empathy_tp_chat_new (account, tp_chan);
- gossip_chat_set_tp_chat (chat, tp_chat);
- g_object_unref (tp_chat);
- }
- gossip_chat_present (chat);
-
- g_object_unref (account);
- return;
- }
-
- if (tp_chan->handle_type == TP_HANDLE_TYPE_CONTACT) {
- /* We have a new private chat channel */
- chat = GOSSIP_CHAT (gossip_private_chat_new (account, tp_chan));
- }
- else if (tp_chan->handle_type == TP_HANDLE_TYPE_ROOM) {
- /* We have a new group chat channel */
- chat = GOSSIP_CHAT (gossip_group_chat_new (account, tp_chan));
- }
-
- g_object_weak_ref (G_OBJECT (chat),
- (GWeakNotify) chat_finalized_cb,
- NULL);
-
- exit_timeout_stop ();
- chat_count++;
-
- gossip_chat_present (GOSSIP_CHAT (chat));
-
- g_object_unref (chat);
- g_object_unref (account);
-
-}
-
-int
-main (int argc, char *argv[])
-{
- EmpathyChandler *chandler;
- GnomeProgram *program;
-
- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
-
- program = gnome_program_init ("empathy-chat",
- PACKAGE_VERSION,
- LIBGNOMEUI_MODULE,
- argc, argv,
- GNOME_PROGRAM_STANDARD_PROPERTIES,
- GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME,
- NULL);
-
- gtk_window_set_default_icon_name ("empathy");
- gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
- DATADIR G_DIR_SEPARATOR_S "empathy");
-
- if (g_getenv ("EMPATHY_DEBUG")) {
- debug_mode = TRUE;
- }
-
- //sexit_timeout_start ();
- chandler = empathy_chandler_new (BUS_NAME, OBJECT_PATH);
-
- g_signal_connect (chandler, "new-channel",
- G_CALLBACK (new_channel_cb),
- NULL);
-
- gtk_main ();
-
- g_object_unref (program);
- g_object_unref (chandler);
-
- 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 <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include <libgnome/gnome-program.h>
-#include <libgnomeui/gnome-ui-init.h>
-
-#include <libmissioncontrol/mc-account.h>
-#include <libmissioncontrol/mc-account-monitor.h>
-#include <libmissioncontrol/mission-control.h>
-
-#include <libempathy/gossip-debug.h>
-#include <libempathy/gossip-utils.h>
-#include <libempathy/gossip-presence.h>
-#include <libempathy-gtk/empathy-main-window.h>
-#include <libempathy-gtk/empathy-status-icon.h>
-
-#define DEBUG_DOMAIN "EmpathyMain"
-
-static void error_cb (MissionControl *mc,
- GError *error,
- gpointer data);
-static void service_ended_cb (MissionControl *mc,
- gpointer user_data);
-static void operation_error_cb (MissionControl *mc,
- guint operation_id,
- guint error_code,
- gpointer user_data);
-static void start_mission_control (MissionControl *mc);
-
-static void
-error_cb (MissionControl *mc,
- GError *error,
- gpointer data)
-{
- if (error) {
- gossip_debug (DEBUG_DOMAIN, "Error: %s", error->message);
- }
-}
-
-static void
-service_ended_cb (MissionControl *mc,
- gpointer user_data)
-{
- gossip_debug (DEBUG_DOMAIN, "Mission Control stopped");
-}
-
-static void
-operation_error_cb (MissionControl *mc,
- guint operation_id,
- guint error_code,
- gpointer user_data)
-{
- gossip_debug (DEBUG_DOMAIN, "Error code %d during operation %d",
- error_code,
- operation_id);
-}
-
-static void
-account_enabled_cb (McAccountMonitor *monitor,
- gchar *unique_name,
- MissionControl *mc)
-{
- gossip_debug (DEBUG_DOMAIN, "Account enabled: %s", unique_name);
- start_mission_control (mc);
-}
-
-static void
-start_mission_control (MissionControl *mc)
-{
- McPresence presence;
-
- presence = mission_control_get_presence_actual (mc, NULL);
-
- if (presence > MC_PRESENCE_OFFLINE) {
- /* MC is already running and online, nothing to do */
- return;
- }
-
- gossip_debug (DEBUG_DOMAIN, "Starting Mission Control...");
-
- mission_control_set_presence (mc,
- MC_PRESENCE_AVAILABLE,
- NULL,
- (McCallback) error_cb,
- NULL);
-}
-
-int
-main (int argc, char *argv[])
-{
- EmpathyStatusIcon *icon;
- GtkWidget *window;
- MissionControl *mc;
- McAccountMonitor *monitor;
- GnomeProgram *program;
- gboolean no_connect = FALSE;
- GOptionContext *context;
- GOptionEntry options[] = {
- { "no-connect", 'n',
- 0, G_OPTION_ARG_NONE, &no_connect,
- N_("Don't connect on startup"),
- NULL },
- { NULL }
- };
-
- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
-
- context = g_option_context_new (_("- Empathy Instant Messenger"));
- g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
-
- g_set_application_name (PACKAGE_NAME);
-
- program = gnome_program_init ("empathy",
- PACKAGE_VERSION,
- LIBGNOMEUI_MODULE,
- argc, argv,
- GNOME_PROGRAM_STANDARD_PROPERTIES,
- "goption-context", context,
- GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME,
- NULL);
-
- gtk_window_set_default_icon_name ("empathy");
- gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
- DATADIR G_DIR_SEPARATOR_S "empathy");
-
- /* Setting up MC */
- monitor = mc_account_monitor_new ();
- mc = gossip_mission_control_new ();
- g_signal_connect (monitor, "account-enabled",
- G_CALLBACK (account_enabled_cb),
- mc);
- g_signal_connect (mc, "ServiceEnded",
- G_CALLBACK (service_ended_cb),
- NULL);
- g_signal_connect (mc, "Error",
- G_CALLBACK (operation_error_cb),
- NULL);
-
- if (!no_connect) {
- start_mission_control (mc);
- }
-
- /* Setting up UI */
- window = empathy_main_window_show ();
- icon = empathy_status_icon_new (GTK_WINDOW (window));
-
- gtk_main ();
-
- mission_control_set_presence (mc,
- MC_PRESENCE_OFFLINE,
- NULL, NULL, NULL);
-
- g_object_unref (monitor);
- g_object_unref (mc);
- g_object_unref (icon);
- g_object_unref (program);
-
- 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 <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#include <libgnome/gnome-program.h>
+#include <libgnomeui/gnome-ui-init.h>
+
+#include <libtelepathy/tp-conn.h>
+#include <libtelepathy/tp-chan.h>
+#include <libmissioncontrol/mc-account.h>
+#include <libmissioncontrol/mc-account-monitor.h>
+#include <libmissioncontrol/mission-control.h>
+
+#include <libempathy/gossip-debug.h>
+#include <libempathy/gossip-utils.h>
+#include <libempathy/gossip-presence.h>
+#include <libempathy/gossip-contact.h>
+#include <libempathy/empathy-chandler.h>
+#include <libempathy/empathy-tp-chat.h>
+#include <libempathy-gtk/empathy-main-window.h>
+#include <libempathy-gtk/empathy-status-icon.h>
+#include <libempathy-gtk/gossip-private-chat.h>
+#include <libempathy-gtk/gossip-group-chat.h>
+
+#define DEBUG_DOMAIN "EmpathyMain"
+
+#define BUS_NAME "org.gnome.Empathy.Chat"
+#define OBJECT_PATH "/org/freedesktop/Telepathy/ChannelHandler"
+
+static void
+error_cb (MissionControl *mc,
+ GError *error,
+ gpointer data)
+{
+ if (error) {
+ gossip_debug (DEBUG_DOMAIN, "Error: %s", error->message);
+ }
+}
+
+static void
+service_ended_cb (MissionControl *mc,
+ gpointer user_data)
+{
+ gossip_debug (DEBUG_DOMAIN, "Mission Control stopped");
+}
+
+static void
+operation_error_cb (MissionControl *mc,
+ guint operation_id,
+ guint error_code,
+ gpointer user_data)
+{
+ gossip_debug (DEBUG_DOMAIN, "Error code %d during operation %d",
+ error_code,
+ operation_id);
+}
+
+static void
+start_mission_control (MissionControl *mc)
+{
+ McPresence presence;
+
+ presence = mission_control_get_presence_actual (mc, NULL);
+
+ if (presence > MC_PRESENCE_OFFLINE) {
+ /* MC is already running and online, nothing to do */
+ return;
+ }
+
+ gossip_debug (DEBUG_DOMAIN, "Starting Mission Control...");
+
+ mission_control_set_presence (mc,
+ MC_PRESENCE_AVAILABLE,
+ NULL,
+ (McCallback) error_cb,
+ NULL);
+}
+
+static void
+account_enabled_cb (McAccountMonitor *monitor,
+ gchar *unique_name,
+ MissionControl *mc)
+{
+ gossip_debug (DEBUG_DOMAIN, "Account enabled: %s", unique_name);
+ start_mission_control (mc);
+}
+
+static void
+new_channel_cb (EmpathyChandler *chandler,
+ TpConn *tp_conn,
+ TpChan *tp_chan,
+ MissionControl *mc)
+{
+ McAccount *account;
+ GossipChat *chat;
+ gchar *id;
+
+ account = mission_control_get_account_for_connection (mc, tp_conn, NULL);
+ id = gossip_get_channel_id (account, tp_chan);
+ chat = gossip_chat_window_find_chat (account, id);
+ g_free (id);
+
+ if (chat) {
+ /* The chat already exists */
+ if (!gossip_chat_is_connected (chat)) {
+ EmpathyTpChat *tp_chat;
+
+ /* The chat died, give him the new text channel */
+ tp_chat = empathy_tp_chat_new (account, tp_chan);
+ gossip_chat_set_tp_chat (chat, tp_chat);
+ g_object_unref (tp_chat);
+ }
+ gossip_chat_present (chat);
+
+ g_object_unref (account);
+ return;
+ }
+
+ if (tp_chan->handle_type == TP_HANDLE_TYPE_CONTACT) {
+ /* We have a new private chat channel */
+ chat = GOSSIP_CHAT (gossip_private_chat_new (account, tp_chan));
+ }
+ else if (tp_chan->handle_type == TP_HANDLE_TYPE_ROOM) {
+ /* We have a new group chat channel */
+ chat = GOSSIP_CHAT (gossip_group_chat_new (account, tp_chan));
+ }
+
+ gossip_chat_present (GOSSIP_CHAT (chat));
+
+ g_object_unref (chat);
+ g_object_unref (account);
+}
+
+int
+main (int argc, char *argv[])
+{
+ EmpathyStatusIcon *icon;
+ GtkWidget *window;
+ MissionControl *mc;
+ McAccountMonitor *monitor;
+ EmpathyChandler *chandler;
+ GnomeProgram *program;
+ gboolean no_connect = FALSE;
+ GOptionContext *context;
+ GOptionEntry options[] = {
+ { "no-connect", 'n',
+ 0, G_OPTION_ARG_NONE, &no_connect,
+ N_("Don't connect on startup"),
+ NULL },
+ { NULL }
+ };
+
+ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
+
+ context = g_option_context_new (_("- Empathy Instant Messenger"));
+ g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
+
+ g_set_application_name (PACKAGE_NAME);
+
+ program = gnome_program_init ("empathy",
+ PACKAGE_VERSION,
+ LIBGNOMEUI_MODULE,
+ argc, argv,
+ GNOME_PROGRAM_STANDARD_PROPERTIES,
+ "goption-context", context,
+ GNOME_PARAM_HUMAN_READABLE_NAME, PACKAGE_NAME,
+ NULL);
+
+ gtk_window_set_default_icon_name ("empathy");
+ gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+ DATADIR G_DIR_SEPARATOR_S "empathy");
+
+ /* Setting up MC */
+ monitor = mc_account_monitor_new ();
+ mc = gossip_mission_control_new ();
+ g_signal_connect (monitor, "account-enabled",
+ G_CALLBACK (account_enabled_cb),
+ mc);
+ g_signal_connect (mc, "ServiceEnded",
+ G_CALLBACK (service_ended_cb),
+ NULL);
+ g_signal_connect (mc, "Error",
+ G_CALLBACK (operation_error_cb),
+ NULL);
+
+ if (!no_connect) {
+ start_mission_control (mc);
+ }
+
+ /* Setting up UI */
+ window = empathy_main_window_show ();
+ icon = empathy_status_icon_new (GTK_WINDOW (window));
+
+ /* Setting up channel handler */
+ chandler = empathy_chandler_new (BUS_NAME, OBJECT_PATH);
+ g_signal_connect (chandler, "new-channel",
+ G_CALLBACK (new_channel_cb),
+ mc);
+
+ gtk_main ();
+
+ mission_control_set_presence (mc,
+ MC_PRESENCE_OFFLINE,
+ NULL, NULL, NULL);
+
+ g_object_unref (chandler);
+ g_object_unref (monitor);
+ g_object_unref (mc);
+ g_object_unref (icon);
+ g_object_unref (program);
+
+ return EXIT_SUCCESS;
+}
+
[D-BUS Service]
Name=org.gnome.Empathy.Chat
-Exec=@bindir@/empathy-chat
+Exec=@bindir@/empathy
projects / empathy.git / commitdiff