#include <libebook/e-book.h>
#include <libgnomevfs/gnome-vfs.h>
-#include <libtelepathy/tp-conn.h>
-#include <libtelepathy/tp-chan.h>
+#include <telepathy-glib/util.h>
#include <libmissioncontrol/mc-account.h>
#include <libmissioncontrol/mc-account-monitor.h>
#include <libmissioncontrol/mission-control.h>
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-presence.h>
-#include <libempathy/empathy-contact.h>
-#include <libempathy/empathy-chandler.h>
-#include <libempathy/empathy-tp-chat.h>
-#include <libempathy/empathy-tp-chatroom.h>
#include <libempathy/empathy-idle.h>
-#include <libempathy/empathy-conf.h>
+#include <libempathy/empathy-utils.h>
+#include <libempathy/empathy-debug.h>
+
+#include <libempathy-gtk/empathy-conf.h>
#include <libempathy-gtk/empathy-preferences.h>
#include <libempathy-gtk/empathy-main-window.h>
#include <libempathy-gtk/empathy-status-icon.h>
-#include <libempathy-gtk/empathy-private-chat.h>
-#include <libempathy-gtk/empathy-group-chat.h>
#define DEBUG_DOMAIN "EmpathyMain"
-#define BUS_NAME "org.gnome.Empathy.Chat"
-#define OBJECT_PATH "/org/freedesktop/Telepathy/ChannelHandler"
-
static void
service_ended_cb (MissionControl *mc,
gpointer user_data)
start_mission_control (idle);
}
-static void
-new_channel_cb (EmpathyChandler *chandler,
- TpConn *tp_conn,
- TpChan *tp_chan,
- MissionControl *mc)
-{
- McAccount *account;
- EmpathyChat *chat;
- gchar *id;
-
- account = mission_control_get_account_for_connection (mc, tp_conn, NULL);
- id = empathy_inspect_channel (account, tp_chan);
- chat = empathy_chat_window_find_chat (account, id);
- g_free (id);
-
- if (chat) {
- /* The chat already exists */
- if (!empathy_chat_is_connected (chat)) {
- EmpathyTpChat *tp_chat;
-
- /* The chat died, give him the new text channel */
- if (empathy_chat_is_group_chat (chat)) {
- tp_chat = EMPATHY_TP_CHAT (empathy_tp_chatroom_new (account, tp_chan));
- } else {
- tp_chat = empathy_tp_chat_new (account, tp_chan);
- }
- empathy_chat_set_tp_chat (chat, tp_chat);
- g_object_unref (tp_chat);
- }
- empathy_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 = EMPATHY_CHAT (empathy_private_chat_new (account, tp_chan));
- }
- else if (tp_chan->handle_type == TP_HANDLE_TYPE_ROOM) {
- /* We have a new group chat channel */
- chat = EMPATHY_CHAT (empathy_group_chat_new (account, tp_chan));
- }
-
- empathy_chat_present (EMPATHY_CHAT (chat));
-
- g_object_unref (chat);
- g_object_unref (account);
-}
-
static void
create_salut_account (void)
{
EBook *book;
EContact *contact;
gchar *nickname = NULL;
- gchar *published_name = NULL;
gchar *first_name = NULL;
gchar *last_name = NULL;
gchar *email = NULL;
mc_account_set_display_name (account, _("People nearby"));
nickname = e_contact_get (contact, E_CONTACT_NICKNAME);
- published_name = e_contact_get (contact, E_CONTACT_FULL_NAME);
first_name = e_contact_get (contact, E_CONTACT_GIVEN_NAME);
last_name = e_contact_get (contact, E_CONTACT_FAMILY_NAME);
email = e_contact_get (contact, E_CONTACT_EMAIL_1);
jid = e_contact_get (contact, E_CONTACT_IM_JABBER_HOME_1);
- if (G_STR_EMPTY (nickname) || !empathy_strdiff (nickname, "nickname")) {
+ if (!tp_strdiff (nickname, "nickname")) {
g_free (nickname);
- nickname = g_strdup (g_get_user_name ());
- }
- if (G_STR_EMPTY (published_name)) {
- g_free (published_name);
- published_name = g_strdup (g_get_real_name ());
+ nickname = NULL;
}
empathy_debug (DEBUG_DOMAIN, "Salut account created:\n"
" nickname=%s\n"
- " published-name=%s\n"
" first-name=%s\n"
" last-name=%s\n"
" email=%s\n"
" jid=%s\n",
- nickname, published_name, first_name, last_name, email, jid);
+ nickname, first_name, last_name, email, jid);
mc_account_set_param_string (account, "nickname", nickname ? nickname : "");
- mc_account_set_param_string (account, "published-name", published_name ? published_name : "");
mc_account_set_param_string (account, "first-name", first_name ? first_name : "");
mc_account_set_param_string (account, "last-name", last_name ? last_name : "");
mc_account_set_param_string (account, "email", email ? email : "");
mc_account_set_param_string (account, "jid", jid ? jid : "");
g_free (nickname);
- g_free (published_name);
g_free (first_name);
g_free (last_name);
g_free (email);
MissionControl *mc;
McAccountMonitor *monitor;
EmpathyIdle *idle;
- EmpathyChandler *chandler;
- 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 }
- };
+ gboolean autoconnect = TRUE;
+ GError *error = NULL;
empathy_debug_set_log_file_from_env ();
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);
+ if (!gtk_init_with_args (&argc, &argv,
+ _("- Empathy Instant Messenger"),
+ NULL, GETTEXT_PACKAGE, &error)) {
+ empathy_debug (DEBUG_DOMAIN, error->message);
+ return EXIT_FAILURE;
+ }
g_set_application_name (PACKAGE_NAME);
- gtk_init (&argc, &argv);
gtk_window_set_default_icon_name ("empathy");
gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
- DATADIR G_DIR_SEPARATOR_S "empathy");
+ PKGDATADIR G_DIR_SEPARATOR_S "icons");
gnome_vfs_init ();
/* Setting up MC */
G_CALLBACK (operation_error_cb),
NULL);
- if (!no_connect) {
+ empathy_conf_get_bool (empathy_conf_get(),
+ EMPATHY_PREFS_AUTOCONNECT,
+ &autoconnect);
+
+ if (autoconnect) {
start_mission_control (idle);
}
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 ();
empathy_idle_set_state (idle, MC_PRESENCE_OFFLINE);
- g_object_unref (chandler);
g_object_unref (monitor);
g_object_unref (mc);
g_object_unref (idle);