aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTravis Reitter <travis.reitter@collabora.co.uk>2010-10-27 01:39:18 +0800
committerTravis Reitter <travis.reitter@collabora.co.uk>2010-10-30 00:35:09 +0800
commitae2279dbd9844674ea90bb161078dfc3925573cd (patch)
tree447f4805eb7c3512725289367e9a73e6a0ed14d7
parent1cee1d840d87c1cb55ea35b17c58f3d7c69931be (diff)
downloadgsoc2013-empathy-ae2279dbd9844674ea90bb161078dfc3925573cd.tar
gsoc2013-empathy-ae2279dbd9844674ea90bb161078dfc3925573cd.tar.gz
gsoc2013-empathy-ae2279dbd9844674ea90bb161078dfc3925573cd.tar.bz2
gsoc2013-empathy-ae2279dbd9844674ea90bb161078dfc3925573cd.tar.lz
gsoc2013-empathy-ae2279dbd9844674ea90bb161078dfc3925573cd.tar.xz
gsoc2013-empathy-ae2279dbd9844674ea90bb161078dfc3925573cd.tar.zst
gsoc2013-empathy-ae2279dbd9844674ea90bb161078dfc3925573cd.zip
Make empathy-accounts use act as a "command-line" GApplication
Helps bgo#632912.
-rw-r--r--src/empathy-accounts.c81
1 files changed, 60 insertions, 21 deletions
diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 664f6f38b..8f316f4ac 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -54,6 +54,7 @@
static gboolean only_if_needed = FALSE;
static gboolean hidden = FALSE;
static gchar *selected_account_name = NULL;
+static gboolean account_manager_prepared = FALSE;
static void
account_prepare_cb (GObject *source_object,
@@ -131,33 +132,49 @@ account_manager_ready_for_accounts_cb (GObject *source_object,
else
{
maybe_show_accounts_ui (manager);
+ account_manager_prepared = TRUE;
}
}
-static void
-app_activate_cb (GApplication *app)
+static int
+app_command_line_cb (GApplication *app,
+ GApplicationCommandLine *cmdline)
{
- TpAccountManager *account_manager;
+ gchar **argv;
+ gint argc;
- /* don't let this application exit automatically */
- g_application_hold (G_APPLICATION (app));
+ g_application_hold (app);
- account_manager = tp_account_manager_dup ();
+ argv = g_application_command_line_get_arguments (cmdline, &argc);
- empathy_accounts_show_accounts_ui (account_manager, NULL,
- G_CALLBACK (gtk_main_quit));
+ /* if the window is ready, present it; otherwise, it will be presented when
+ * the accounts manager is prepared */
+ if (account_manager_prepared)
+ {
+ TpAccountManager *account_manager;
- g_object_unref (account_manager);
-}
+ account_manager = tp_account_manager_dup ();
+ empathy_accounts_show_accounts_ui (account_manager, NULL,
+ G_CALLBACK (gtk_main_quit));
-#define COMMAND_ACCOUNTS_DIALOG 1
+ g_object_unref (account_manager);
+ }
-int
-main (int argc, char *argv[])
+ g_strfreev (argv);
+
+ return 0;
+}
+
+static gboolean
+local_cmdline (GApplication *app,
+ gchar ***arguments,
+ gint *exit_status)
{
- TpAccountManager *account_manager;
+ gint i;
+ gchar **argv;
+ gint argc = 0;
+ gboolean retval = FALSE;
GError *error = NULL;
- GtkApplication *app;
GOptionContext *optcontext;
GOptionEntry options[] = {
@@ -178,23 +195,42 @@ main (int argc, char *argv[])
{ NULL }
};
- g_thread_init (NULL);
- empathy_init ();
-
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);
+ argv = *arguments;
+ for (i = 0; argv[i] != NULL; i++)
+ argc++;
+
if (!g_option_context_parse (optcontext, &argc, &argv, &error))
{
g_print ("%s\nRun '%s --help' to see a full list of available command line options.\n",
error->message, argv[0]);
g_warning ("Error in empathy init: %s", error->message);
- return EXIT_FAILURE;
+
+ *exit_status = EXIT_FAILURE;
+ retval = TRUE;
}
g_option_context_free (optcontext);
+ return retval;
+}
+
+#define COMMAND_ACCOUNTS_DIALOG 1
+
+int
+main (int argc, char *argv[])
+{
+ TpAccountManager *account_manager;
+ GtkApplication *app;
+ GObjectClass *app_class;
+
+ g_thread_init (NULL);
+ empathy_init ();
+
+ gtk_init (&argc, &argv);
empathy_gtk_init ();
g_set_application_name (_("Empathy Accounts"));
@@ -203,14 +239,17 @@ main (int argc, char *argv[])
textdomain (GETTEXT_PACKAGE);
app = gtk_application_new (EMPATHY_ACCOUNTS_DBUS_NAME,
- G_APPLICATION_FLAGS_NONE);
+ G_APPLICATION_HANDLES_COMMAND_LINE);
+ app_class = G_OBJECT_GET_CLASS (app);
+ G_APPLICATION_CLASS (app_class)->local_command_line = local_cmdline;
account_manager = tp_account_manager_dup ();
tp_account_manager_prepare_async (account_manager, NULL,
account_manager_ready_for_accounts_cb, selected_account_name);
- g_signal_connect (app, "activate", G_CALLBACK (app_activate_cb), NULL);
+ g_signal_connect (app, "command-line", G_CALLBACK (app_command_line_cb),
+ NULL);
g_application_run (G_APPLICATION (app), argc, argv);