aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-03-02 02:25:19 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2010-03-02 02:26:00 +0800
commit8254654ccb030f05cd72f1c011d02c4de8816589 (patch)
tree604be8deeeeb7097d2412dab000fbd3fec00c4e4
parent2f54d54b0f73b08de6be479eb62bf49b4a1162dc (diff)
downloadgsoc2013-empathy-8254654ccb030f05cd72f1c011d02c4de8816589.tar
gsoc2013-empathy-8254654ccb030f05cd72f1c011d02c4de8816589.tar.gz
gsoc2013-empathy-8254654ccb030f05cd72f1c011d02c4de8816589.tar.bz2
gsoc2013-empathy-8254654ccb030f05cd72f1c011d02c4de8816589.tar.lz
gsoc2013-empathy-8254654ccb030f05cd72f1c011d02c4de8816589.tar.xz
gsoc2013-empathy-8254654ccb030f05cd72f1c011d02c4de8816589.tar.zst
gsoc2013-empathy-8254654ccb030f05cd72f1c011d02c4de8816589.zip
Also potentially popup the account dialog when activate by libunique
-rw-r--r--src/empathy.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/empathy.c b/src/empathy.c
index 2cc5a9f28..1b5ad7200 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -85,6 +85,10 @@
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,
EmpathyDispatchOperation *operation,
@@ -262,6 +266,7 @@ unique_app_message_cb (UniqueApp *unique_app,
gpointer user_data)
{
GtkWindow *window = user_data;
+ TpAccountManager *account_manager;
DEBUG ("Other instance launched, presenting the main window. "
"Command=%d, timestamp %u", command, timestamp);
@@ -281,6 +286,11 @@ unique_app_message_cb (UniqueApp *unique_app,
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;
}