#include <clutter-gtk/clutter-gtk.h>
#endif
-#include <libebook/e-book.h>
#include <libnotify/notify.h>
#include <telepathy-glib/account-manager.h>
#include <telepathy-glib/dbus.h>
+#include <telepathy-glib/debug-sender.h>
#include <telepathy-glib/util.h>
#include <telepathy-glib/connection-manager.h>
#include <telepathy-glib/interfaces.h>
+#ifdef ENABLE_TPL
+#include <telepathy-logger/log-manager.h>
+#include <telepathy-logger/log-store-empathy.h>
+#else
+
+#include <libempathy/empathy-log-manager.h>
+#endif /* ENABLE_TPL */
#include <libempathy/empathy-idle.h>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-call-factory.h>
#include <libempathy/empathy-account-settings.h>
#include <libempathy/empathy-connectivity.h>
#include <libempathy/empathy-connection-managers.h>
-#include <libempathy/empathy-debugger.h>
#include <libempathy/empathy-dispatcher.h>
#include <libempathy/empathy-dispatch-operation.h>
-#include <libempathy/empathy-log-manager.h>
#include <libempathy/empathy-ft-factory.h>
#include <libempathy/empathy-tp-chat.h>
#include <libempathy/empathy-tp-call.h>
#include <libempathy-gtk/empathy-ui-utils.h>
#include <libempathy-gtk/empathy-location-manager.h>
-#include "empathy-account-assistant.h"
-#include "empathy-accounts-dialog.h"
#include "empathy-main-window.h"
+#include "empathy-import-mc4-accounts.h"
+#include "empathy-accounts-common.h"
+#include "empathy-accounts-dialog.h"
#include "empathy-status-icon.h"
#include "empathy-call-window.h"
#include "empathy-chat-window.h"
#include "empathy-ft-manager.h"
-#include "empathy-import-mc4-accounts.h"
#include "extensions/extensions.h"
#include <gst/gst.h>
-#define COMMAND_ACCOUNTS_DIALOG 1
-
-static gboolean account_dialog_only = FALSE;
static gboolean start_hidden = FALSE;
+static gboolean no_connect = FALSE;
+
+static void account_manager_ready_cb (GObject *source_object,
+ GAsyncResult *result,
+ gpointer user_data);
static void
dispatch_cb (EmpathyDispatcher *dispatcher,
}
if (chat)
- empathy_chat_set_tp_chat (chat, tp_chat);
+ {
+ empathy_chat_set_tp_chat (chat, tp_chat);
+ }
else
- chat = empathy_chat_new (tp_chat);
+ {
+ chat = empathy_chat_new (tp_chat);
+ /* empathy_chat_new returns a floating reference as EmpathyChat is
+ * a GtkWidget. This reference will be taken by a container
+ * (a GtkNotebook) when we'll call empathy_chat_window_present_chat */
+ }
empathy_chat_window_present_chat (chat);
}
}
-/* Salut account creation */
-static gboolean
-should_create_salut_account (void)
-{
- TpAccountManager *manager;
- gboolean salut_created = FALSE;
- GList *accounts, *l;
-
- /* Check if we already created a salut account */
- empathy_conf_get_bool (empathy_conf_get (),
- EMPATHY_PREFS_SALUT_ACCOUNT_CREATED,
- &salut_created);
-
- if (salut_created)
- {
- DEBUG ("Gconf says we already created a salut account once");
- return FALSE;
- }
-
- /* FIXME: this assumes the account manager is already prepared */
- manager = tp_account_manager_dup ();
- accounts = tp_account_manager_get_valid_accounts (manager);
-
- for (l = accounts; l != NULL; l = g_list_next (l))
- {
- TpAccount *account = TP_ACCOUNT (l->data);
-
- if (!tp_strdiff (tp_account_get_protocol (account), "local-xmpp"))
- {
- salut_created = TRUE;
- break;
- }
- }
-
- g_list_free (accounts);
-
- g_object_unref (manager);
-
- if (salut_created)
- {
- DEBUG ("Existing salut account already exists, flagging so in gconf");
- empathy_conf_set_bool (empathy_conf_get (),
- EMPATHY_PREFS_SALUT_ACCOUNT_CREATED,
- TRUE);
- }
-
- return !salut_created;
-}
-
-static void
-salut_account_created (GObject *source,
- GAsyncResult *result,
- gpointer user_data)
-{
- EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (source);
- TpAccount *account;
- GError *error = NULL;
-
- if (!empathy_account_settings_apply_finish (settings, result, &error))
- {
- DEBUG ("Failed to create salut account: %s", error->message);
- g_error_free (error);
- return;
- }
-
- account = empathy_account_settings_get_account (settings);
-
- tp_account_set_enabled_async (account, TRUE, NULL, NULL);
- empathy_conf_set_bool (empathy_conf_get (),
- EMPATHY_PREFS_SALUT_ACCOUNT_CREATED,
- TRUE);
-}
-
static void
use_conn_notify_cb (EmpathyConf *conf,
const gchar *key,
}
}
-static void
-create_salut_account_if_needed (EmpathyConnectionManagers *managers)
-{
- EmpathyAccountSettings *settings;
- TpConnectionManager *manager;
- const TpConnectionManagerProtocol *protocol;
- EBook *book;
- EContact *contact;
- gchar *nickname = NULL;
- gchar *first_name = NULL;
- gchar *last_name = NULL;
- gchar *email = NULL;
- gchar *jid = NULL;
- GError *error = NULL;
-
-
- if (!should_create_salut_account ())
- return;
-
- manager = empathy_connection_managers_get_cm (managers, "salut");
- if (manager == NULL)
- {
- DEBUG ("Salut not installed, not making a salut account");
- return;
- }
-
- protocol = tp_connection_manager_get_protocol (manager, "local-xmpp");
- if (protocol == NULL)
- {
- DEBUG ("Salut doesn't support local-xmpp!!");
- return;
- }
-
- DEBUG ("Trying to add a salut account...");
-
- /* Get self EContact from EDS */
- if (!e_book_get_self (&contact, &book, &error))
- {
- DEBUG ("Failed to get self econtact: %s",
- error ? error->message : "No error given");
- g_clear_error (&error);
- return;
- }
-
- settings = empathy_account_settings_new ("salut", "local-xmpp",
- _("People nearby"));
-
- nickname = e_contact_get (contact, E_CONTACT_NICKNAME);
- 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 (!tp_strdiff (nickname, "nickname"))
- {
- g_free (nickname);
- nickname = NULL;
- }
-
- DEBUG ("Salut account created:\nnickname=%s\nfirst-name=%s\n"
- "last-name=%s\nemail=%s\njid=%s\n",
- nickname, first_name, last_name, email, jid);
-
- empathy_account_settings_set_string (settings,
- "nickname", nickname ? nickname : "");
- empathy_account_settings_set_string (settings,
- "first-name", first_name ? first_name : "");
- empathy_account_settings_set_string (settings,
- "last-name", last_name ? last_name : "");
- empathy_account_settings_set_string (settings, "email", email ? email : "");
- empathy_account_settings_set_string (settings, "jid", jid ? jid : "");
-
- empathy_account_settings_apply_async (settings,
- salut_account_created, NULL);
-
- g_free (nickname);
- g_free (first_name);
- g_free (last_name);
- g_free (email);
- g_free (jid);
- g_object_unref (settings);
- g_object_unref (contact);
- g_object_unref (book);
-}
-
-static gboolean
-has_non_salut_accounts (TpAccountManager *manager)
-{
- gboolean ret = FALSE;
- GList *accounts, *l;
-
- accounts = tp_account_manager_get_valid_accounts (manager);
-
- for (l = accounts ; l != NULL; l = g_list_next (l))
- {
- if (tp_strdiff (tp_account_get_protocol (l->data), "local-xmpp"))
- {
- ret = TRUE;
- break;
- }
- }
-
- g_list_free (accounts);
-
- return ret;
-}
-
-static void
-maybe_show_account_assistant (void)
-{
- TpAccountManager *manager;
- manager = tp_account_manager_dup ();
-
- if (!has_non_salut_accounts (manager))
- empathy_account_assistant_show (GTK_WINDOW (empathy_main_window_get ()));
-
- g_object_unref (manager);
-}
-
-static gboolean
-check_connection_managers_ready (EmpathyConnectionManagers *managers)
-{
- if (empathy_connection_managers_is_ready (managers))
- {
- if (!empathy_import_mc4_accounts (managers) && !start_hidden)
- maybe_show_account_assistant ();
-
- create_salut_account_if_needed (managers);
- g_object_unref (managers);
- managers = NULL;
- return TRUE;
- }
- return FALSE;
-}
-
-static void
-connection_managers_ready_cb (EmpathyConnectionManagers *managers,
- GParamSpec *spec,
- gpointer user_data)
-{
- check_connection_managers_ready (managers);
-}
-
static void
migrate_config_to_xdg_dir (void)
{
}
static void
-do_show_accounts_ui (GtkWindow *window,
- TpAccountManager *manager)
-{
-
- GtkWidget *ui;
-
- if (has_non_salut_accounts (manager))
- ui = empathy_accounts_dialog_show (window, NULL);
- else
- ui = empathy_account_assistant_show (window);
-
- if (account_dialog_only)
- g_signal_connect (ui, "destroy",
- G_CALLBACK (gtk_main_quit), NULL);
-}
-
-static void
-account_manager_ready_for_accounts_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+accounts_application_exited_cb (GPid pid,
+ gint status,
+ gpointer data)
{
- TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
- GError *error = NULL;
-
- if (!tp_account_manager_prepare_finish (manager, result, &error))
+ if (status)
{
- DEBUG ("Failed to prepare account manager: %s", error->message);
- g_error_free (error);
- return;
+ g_warning ("accounts application exited with status %d: '%s'",
+ status, g_strerror (status));
}
-
- do_show_accounts_ui (user_data, manager);
}
static void
-show_accounts_ui (GtkWindow *window,
- gboolean force)
+show_accounts_ui (GdkScreen *screen,
+ gboolean if_needed)
{
- TpAccountManager *manager;
-
- if (!force)
- return;
-
- manager = tp_account_manager_dup ();
-
- tp_account_manager_prepare_async (manager, NULL,
- account_manager_ready_for_accounts_cb, window);
-
- g_object_unref (manager);
+ empathy_accounts_dialog_show_application (screen,
+ accounts_application_exited_cb, NULL, NULL, if_needed, start_hidden);
}
static UniqueResponse
gpointer user_data)
{
GtkWindow *window = user_data;
+ TpAccountManager *account_manager;
DEBUG ("Other instance launched, presenting the main window. "
"Command=%d, timestamp %u", command, timestamp);
- if (command == COMMAND_ACCOUNTS_DIALOG)
- {
- show_accounts_ui (window, TRUE);
- }
- else
- {
- /* We're requested to show stuff again, disable the start hidden global
- * in case the accounts wizard wants to pop up.
- */
- start_hidden = FALSE;
+ /* XXX: the standalone app somewhat breaks this case, since
+ * communicating it would be a pain */
- show_accounts_ui (window, FALSE);
+ /* We're requested to show stuff again, disable the start hidden global
+ * in case the accounts wizard wants to pop up.
+ */
+ start_hidden = FALSE;
- gtk_window_set_screen (GTK_WINDOW (window),
- unique_message_data_get_screen (data));
- gtk_window_set_startup_id (GTK_WINDOW (window),
- unique_message_data_get_startup_id (data));
- gtk_window_present_with_time (GTK_WINDOW (window), timestamp);
- }
+ gtk_window_set_screen (GTK_WINDOW (window),
+ unique_message_data_get_screen (data));
+ gtk_window_set_startup_id (GTK_WINDOW (window),
+ unique_message_data_get_startup_id (data));
+ gtk_window_present_with_time (GTK_WINDOW (window), timestamp);
+ gtk_window_set_skip_taskbar_hint (window, FALSE);
+
+ account_manager = tp_account_manager_dup ();
+ tp_account_manager_prepare_async (account_manager, NULL,
+ account_manager_ready_cb, NULL);
+ g_object_unref (account_manager);
return UNIQUE_RESPONSE_OK;
}
gtk_widget_show (GTK_WIDGET (window));
}
-#ifdef ENABLE_DEBUG
-static void
-default_log_handler (const gchar *log_domain,
- GLogLevelFlags log_level,
- const gchar *message,
- gpointer user_data)
-{
- g_log_default_handler (log_domain, log_level, message, NULL);
-
- /* G_LOG_DOMAIN = "empathy". No need to send empathy messages to the
- * debugger as they already have in empathy_debug. */
- if (log_level != G_LOG_LEVEL_DEBUG
- || tp_strdiff (log_domain, G_LOG_DOMAIN))
- {
- EmpathyDebugger *dbg;
- GTimeVal now;
-
- dbg = empathy_debugger_get_singleton ();
- g_get_current_time (&now);
-
- empathy_debugger_add_message (dbg, &now, log_domain,
- log_level, message);
- }
-}
-#endif /* ENABLE_DEBUG */
-
static void
account_manager_ready_cb (GObject *source_object,
GAsyncResult *result,
{
TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
GError *error = NULL;
+ EmpathyIdle *idle;
+ EmpathyConnectivity *connectivity;
+ gboolean autoconnect = TRUE;
+ TpConnectionPresenceType presence;
if (!tp_account_manager_prepare_finish (manager, result, &error))
{
return;
}
- if (should_create_salut_account () || !empathy_import_mc4_has_imported ())
- {
- EmpathyConnectionManagers *managers;
- managers = empathy_connection_managers_dup_singleton ();
+ /* Autoconnect */
+ idle = empathy_idle_dup_singleton ();
+ connectivity = empathy_connectivity_dup_singleton ();
- if (!check_connection_managers_ready (managers))
- {
- g_signal_connect (managers, "notify::ready",
- G_CALLBACK (connection_managers_ready_cb), NULL);
- }
- }
- else if (!start_hidden)
- {
- maybe_show_account_assistant ();
- }
+ presence = tp_account_manager_get_most_available_presence (manager, NULL,
+ NULL);
+
+ empathy_conf_get_bool (empathy_conf_get (),
+ EMPATHY_PREFS_AUTOCONNECT, &autoconnect);
+ if (autoconnect && !no_connect &&
+ tp_connection_presence_type_cmp_availability
+ (presence, TP_CONNECTION_PRESENCE_TYPE_OFFLINE)
+ <= 0)
+ /* if current state is Offline, then put it online */
+ empathy_idle_set_state (idle, TP_CONNECTION_PRESENCE_TYPE_AVAILABLE);
+
+ /* Pop up the accounts dialog if it's needed (either when we don't have any
+ * accounts yet or when we haven't imported mc4 accounts yet */
+ if (!empathy_accounts_has_accounts (manager)
+ || !empathy_import_mc4_has_imported ())
+ show_accounts_ui (gdk_screen_get_default (), TRUE);
+
+ g_object_unref (idle);
+ g_object_unref (connectivity);
}
static EmpathyDispatcher *
{ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, TP_HANDLE_TYPE_CONTACT },
/* stream media to contacts */
{ TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA, TP_HANDLE_TYPE_CONTACT },
- /* stream tubes to contacts and rooms */
- { TP_IFACE_CHANNEL_TYPE_STREAM_TUBE, TP_HANDLE_TYPE_CONTACT },
- { TP_IFACE_CHANNEL_TYPE_STREAM_TUBE, TP_HANDLE_TYPE_ROOM },
- /* d-bus tubes to contacts and rooms */
- { TP_IFACE_CHANNEL_TYPE_DBUS_TUBE, TP_HANDLE_TYPE_CONTACT },
- { TP_IFACE_CHANNEL_TYPE_DBUS_TUBE, TP_HANDLE_TYPE_ROOM },
/* roomlists */
{ TP_IFACE_CHANNEL_TYPE_ROOM_LIST, TP_HANDLE_TYPE_NONE },
};
TpConnection *conn;
conn = tp_account_get_connection (account);
+ if (conn == NULL)
+ return;
empathy_dispatcher_join_muc (conn,
empathy_chatroom_get_room (room), NULL, NULL);
EmpathyStatusIcon *icon;
EmpathyDispatcher *dispatcher;
TpAccountManager *account_manager;
+#ifdef ENABLE_TPL
+ TplLogManager *log_manager;
+#else
EmpathyLogManager *log_manager;
+#endif /* ENABLE_TPL */
EmpathyChatroomManager *chatroom_manager;
EmpathyCallFactory *call_factory;
EmpathyFTFactory *ft_factory;
GtkWidget *window;
EmpathyIdle *idle;
EmpathyConnectivity *connectivity;
- gboolean autoconnect = TRUE;
- gboolean no_connect = FALSE;
GError *error = NULL;
- TpDBusDaemon *dbus_daemon;
UniqueApp *unique_app;
gboolean chatroom_manager_ready;
+#ifdef ENABLE_DEBUG
+ TpDebugSender *debug_sender;
+#endif /* ENABLE_TPL */
+
GOptionContext *optcontext;
GOptionEntry options[] = {
{ "no-connect", 'n',
0, G_OPTION_ARG_NONE, &start_hidden,
N_("Don't display the contact list or any other dialogs on startup"),
NULL },
- { "accounts", 'a',
- 0, G_OPTION_ARG_NONE, &account_dialog_only,
- N_("Show the accounts dialog"),
- NULL },
{ "version", 'v',
G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, show_version_cb,
NULL, NULL },
optcontext = g_option_context_new (N_("- Empathy IM Client"));
g_option_context_add_group (optcontext, gst_init_get_option_group ());
g_option_context_add_group (optcontext, gtk_get_option_group (TRUE));
+#if HAVE_LIBCHAMPLAIN
+ g_option_context_add_group (optcontext, clutter_get_option_group ());
+#endif
g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE);
if (!g_option_context_parse (optcontext, &argc, &argv, &error)) {
g_set_application_name (_(PACKAGE_NAME));
g_setenv ("PULSE_PROP_media.role", "phone", TRUE);
-#if HAVE_LIBCHAMPLAIN
- gtk_clutter_init (&argc, &argv);
-#endif
-
gtk_window_set_default_icon_name ("empathy");
textdomain (GETTEXT_PACKAGE);
#ifdef ENABLE_DEBUG
- /* Set up debugger */
- g_log_set_default_handler (default_log_handler, NULL);
+ /* Set up debug sender */
+ debug_sender = tp_debug_sender_dup ();
+ g_log_set_default_handler (tp_debug_sender_log_handler, G_LOG_DOMAIN);
#endif
- unique_app = unique_app_new_with_commands ("org.gnome.Empathy",
- NULL, "accounts_dialog", COMMAND_ACCOUNTS_DIALOG, NULL);
+ unique_app = unique_app_new ("org.gnome."PACKAGE_NAME, NULL);
if (unique_app_is_running (unique_app))
{
- unique_app_send_message (unique_app, account_dialog_only ?
- COMMAND_ACCOUNTS_DIALOG : UNIQUE_ACTIVATE, NULL);
+ unique_app_send_message (unique_app, UNIQUE_ACTIVATE, NULL);
g_object_unref (unique_app);
return EXIT_SUCCESS;
}
- /* Take well-known name */
- dbus_daemon = tp_dbus_daemon_dup (&error);
- if (error == NULL)
- {
- if (!tp_dbus_daemon_request_name (dbus_daemon,
- "org.gnome.Empathy", TRUE, &error))
- {
- DEBUG ("Failed to request well-known name: %s",
- error ? error->message : "no message");
- g_clear_error (&error);
- }
- g_object_unref (dbus_daemon);
- }
- else
- {
- DEBUG ("Failed to dup dbus daemon: %s",
- error ? error->message : "no message");
- g_clear_error (&error);
- }
-
- if (account_dialog_only)
- {
- account_manager = tp_account_manager_dup ();
- show_accounts_ui (NULL, TRUE);
-
- gtk_main ();
-
- g_object_unref (account_manager);
- return 0;
- }
-
notify_init (_(PACKAGE_NAME));
/* Setting up Idle */
empathy_conf_notify_add (empathy_conf_get (), EMPATHY_PREFS_USE_CONN,
use_conn_notify_cb, connectivity);
- /* Autoconnect */
- empathy_conf_get_bool (empathy_conf_get (),
- EMPATHY_PREFS_AUTOCONNECT, &autoconnect);
- if (autoconnect && !no_connect &&
- tp_connection_presence_type_cmp_availability
- (empathy_idle_get_state (idle), TP_CONNECTION_PRESENCE_TYPE_OFFLINE)
- <= 0)
- empathy_idle_set_state (idle, TP_CONNECTION_PRESENCE_TYPE_AVAILABLE);
-
/* account management */
account_manager = tp_account_manager_dup ();
tp_account_manager_prepare_async (account_manager, NULL,
G_CALLBACK (unique_app_message_cb), window);
/* Logging */
+#ifdef ENABLE_TPL
+ log_manager = tpl_log_manager_dup_singleton ();
+#else
log_manager = empathy_log_manager_dup_singleton ();
empathy_log_manager_observe (log_manager, dispatcher);
+#endif
chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL);
empathy_chatroom_manager_observe (chatroom_manager, dispatcher);
empathy_idle_set_state (idle, TP_CONNECTION_PRESENCE_TYPE_OFFLINE);
+#ifdef ENABLE_DEBUG
+ g_object_unref (debug_sender);
+#endif
+
g_object_unref (idle);
g_object_unref (connectivity);
g_object_unref (icon);
g_object_unref (unique_app);
notify_uninit ();
+ xmlCleanupParser ();
return EXIT_SUCCESS;
}
projects / empathy.git / blobdiff