Fix warning when selecting all accounts.

[empathy.git] / src / empathy-chat-main.c

diff --git a/src/empathy-chat-main.c b/src/empathy-chat-main.c
index 2826e4b5231165338efdca9b19150f87d0cae79c..fb09649344913e511cde55a2be9c73f86b2e431d 100644 (file)
--- a/src/empathy-chat-main.c
+++ b/src/empathy-chat-main.c
@@ -25,8 +25,12 @@
 #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>
@@ -35,9 +39,10 @@
 #include <libempathy/gossip-debug.h>
 #include <libempathy/gossip-utils.h>
 #include <libempathy/empathy-chandler.h>
-#include <libempathy/empathy-contact-manager.h>
-#include <libempathy/empathy-contact-list.h>
+#include <libempathy/empathy-tp-chat.h>
+#include <libempathy/gossip-paths.h>
 #include <libempathy-gtk/gossip-private-chat.h>
+#include <libempathy-gtk/gossip-group-chat.h>
 
 #define DEBUG_DOMAIN "ChatMain"
 
@@ -48,9 +53,9 @@
 #define EXIT_TIMEOUT 5
 
 
-static guint chat_count = 0;
-static guint exit_timeout = 0;
-
+static guint    chat_count = 0;
+static guint    exit_timeout = 0;
+static gboolean debug_mode = FALSE;
 
 static gboolean
 exit_timeout_cb (gpointer user_data)
@@ -65,7 +70,7 @@ exit_timeout_cb (gpointer user_data)
 static void
 exit_timeout_start (void)
 {
-       if (exit_timeout) {
+       if (exit_timeout || debug_mode) {
                return;
        }
 
@@ -101,47 +106,86 @@ new_channel_cb (EmpathyChandler *chandler,
                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 = gossip_mission_control_new ();
-               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);
-               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 (mc);
+       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);
-               g_object_unref (contact);
-               g_object_unref (chat);
-               g_object_unref (manager);
+               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;
+       gchar           *localedir;
+
+       localedir = gossip_paths_get_locale_path ();
+       bindtextdomain (GETTEXT_PACKAGE, localedir);
+       bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+       textdomain (GETTEXT_PACKAGE);
+       g_free (localedir);
+
+       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_init (&argc, &argv);
+       if (g_getenv ("EMPATHY_DEBUG")) {
+               debug_mode = TRUE;
+       }
 
-       exit_timeout_start ();
+       //sexit_timeout_start ();
        chandler = empathy_chandler_new (BUS_NAME, OBJECT_PATH);
 
        g_signal_connect (chandler, "new-channel",
@@ -150,6 +194,9 @@ main (int argc, char *argv[])
 
        gtk_main ();
 
+       g_object_unref (program);
+       g_object_unref (chandler);
+
        return EXIT_SUCCESS;
 }