#include <libebook/e-book.h>
#include <libgnomevfs/gnome-vfs.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-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>
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 (G_STR_EMPTY (nickname) || !tp_strdiff (nickname, "nickname")) {
g_free (nickname);
nickname = g_strdup (g_get_user_name ());
}
MissionControl *mc;
McAccountMonitor *monitor;
EmpathyIdle *idle;
- gboolean no_connect = FALSE;
+ gboolean autoconnect = TRUE;
GError *error = NULL;
- GOptionEntry options[] = {
- { "no-connect", 'n',
- 0, G_OPTION_ARG_NONE, &no_connect,
- N_("Don't connect on startup"),
- NULL },
- { NULL }
- };
empathy_debug_set_log_file_from_env ();
if (!gtk_init_with_args (&argc, &argv,
_("- Empathy Instant Messenger"),
- options, GETTEXT_PACKAGE, &error)) {
+ NULL, GETTEXT_PACKAGE, &error)) {
empathy_debug (DEBUG_DOMAIN, error->message);
return EXIT_FAILURE;
}
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);
}