* Travis Reitter <travis.reitter@collabora.co.uk>
*/
-#include <config.h>
+#include "config.h"
-#include <string.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/defs.h>
-#include <telepathy-glib/util.h>
+#ifdef HAVE_CHEESE
+#include <cheese-gtk.h>
+#endif
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-connection-managers.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-utils.h"
+#include "empathy-ui-utils.h"
-#include "empathy-accounts.h"
#include "empathy-accounts-common.h"
-#include "empathy-accounts-dialog.h"
-#include "empathy-auto-salut-account-helper.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
#define EMPATHY_ACCOUNTS_DBUS_NAME "org.gnome.EmpathyAccounts"
static gboolean only_if_needed = FALSE;
static gboolean hidden = FALSE;
static gchar *selected_account_name = NULL;
-static gboolean assistant = FALSE;
static void
maybe_show_accounts_ui (TpAccountManager *manager,
if (only_if_needed && empathy_accounts_has_non_salut_accounts (manager))
return;
- empathy_accounts_show_accounts_ui (manager, NULL, assistant, app);
+ empathy_accounts_show_accounts_ui (manager, NULL, app);
}
static TpAccount *
GList *accounts, *l;
TpAccount *found = NULL;
- accounts = tp_account_manager_get_valid_accounts (mgr);
+ accounts = tp_account_manager_dup_valid_accounts (mgr);
for (l = accounts; l != NULL; l = g_list_next (l))
{
if (!tp_strdiff (tp_proxy_get_object_path (l->data), path))
}
}
- g_list_free (accounts);
+ g_list_free_full (accounts, g_object_unref);
return found;
}
if (account != NULL)
{
- empathy_accounts_show_accounts_ui (manager, account, assistant, app);
+ empathy_accounts_show_accounts_ui (manager, account, app);
goto out;
}
else
N_("Initially select given account (eg, "
"gabble/jabber/foo_40example_2eorg0)"),
N_("<account-id>") },
- { "assistant", 'a',
- 0, G_OPTION_ARG_NONE, &assistant,
- N_("Show account assistant"),
- NULL },
{ NULL }
};
optcontext = g_option_context_new (N_("- Empathy Accounts"));
g_option_context_add_group (optcontext, gtk_get_option_group (TRUE));
g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE);
+ g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE);
argv = *arguments;
for (i = 0; argv[i] != NULL; i++)
GObjectClass *app_class;
gint retval;
- g_thread_init (NULL);
+ g_type_init ();
+
+#ifdef HAVE_CHEESE
+ /* Used by the avatar chooser */
+ g_return_val_if_fail (cheese_gtk_init (&argc, &argv), 1);
+#endif
+
empathy_init ();
gtk_init (&argc, &argv);
/* Make empathy and empathy-accounts appear as the same app in gnome-shell */
gdk_set_program_class ("Empathy");
gtk_window_set_default_icon_name ("empathy");
- textdomain (GETTEXT_PACKAGE);
app = gtk_application_new (EMPATHY_ACCOUNTS_DBUS_NAME,
G_APPLICATION_HANDLES_COMMAND_LINE);