#include <clutter-gtk/clutter-gtk.h>
#endif
-#include <libebook/e-book.h>
#include <libnotify/notify.h>
#include <telepathy-glib/account-manager.h>
#include "empathy-chat-window.h"
#include "empathy-ft-manager.h"
#include "empathy-import-mc4-accounts.h"
+#include "empathy-auto-salut-account-helper.h"
#include "extensions/extensions.h"
}
}
-/* Salut account creation. The TpAccountManager first argument
- * must already be prepared when calling this function. */
-static gboolean
-should_create_salut_account (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;
- }
-
- 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);
-
- 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_am_ready_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
-{
- TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
- EmpathyConnectionManagers *managers = user_data;
- 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 (!tp_account_manager_prepare_finish (account_manager, result, &error))
- {
- DEBUG ("Failed to prepare account manager: %s", error->message);
- g_error_free (error);
- goto out;
- }
-
- if (!should_create_salut_account (account_manager))
- goto out;
-
- manager = empathy_connection_managers_get_cm (managers, "salut");
- if (manager == NULL)
- {
- DEBUG ("Salut not installed, not making a salut account");
- goto out;
- }
-
- protocol = tp_connection_manager_get_protocol (manager, "local-xmpp");
- if (protocol == NULL)
- {
- DEBUG ("Salut doesn't support local-xmpp!!");
- goto out;
- }
-
- 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);
- goto out;
- }
-
- 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);
-
- out:
- g_object_unref (managers);
-}
-
-static void
-create_salut_account_if_needed (EmpathyConnectionManagers *managers)
-{
- TpAccountManager *manager;
-
- manager = tp_account_manager_dup ();
-
- tp_account_manager_prepare_async (manager, NULL,
- create_salut_account_am_ready_cb, g_object_ref (managers));
-
- g_object_unref (manager);
-}
-
static gboolean
has_non_salut_accounts (TpAccountManager *manager)
{
if (!empathy_import_mc4_accounts (managers) && !start_hidden)
maybe_show_account_assistant ();
- create_salut_account_if_needed (managers);
+ create_salut_account_if_needed ();
g_object_unref (managers);
- managers = NULL;
return TRUE;
}
return FALSE;
if (command == COMMAND_ACCOUNTS_DIALOG)
{
- show_accounts_ui (window, TRUE);
+ show_accounts_ui (NULL, TRUE);
}
else
{
EmpathyIdle *idle;
EmpathyConnectivity *connectivity;
gboolean autoconnect = TRUE;
+ TpConnectionPresenceType presence;
if (!tp_account_manager_prepare_finish (manager, result, &error))
{
idle = empathy_idle_dup_singleton ();
connectivity = empathy_connectivity_dup_singleton ();
+ 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
- (empathy_idle_get_state (idle), TP_CONNECTION_PRESENCE_TYPE_OFFLINE)
+ (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);
{ 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 },
};
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);
g_object_unref (unique_app);
notify_uninit ();
+ xmlCleanupParser ();
return EXIT_SUCCESS;
}
projects / empathy.git / blobdiff