We have to old the application while doing async preparation as the app window
is not created right away.
https://bugzilla.gnome.org/show_bug.cgi?id=662504
static void
do_show_accounts_ui (TpAccountManager *manager,
TpAccount *account,
static void
do_show_accounts_ui (TpAccountManager *manager,
TpAccount *account,
- GCallback window_destroyed_cb)
{
static GtkWidget *accounts_window = NULL;
if (accounts_window == NULL)
{
static GtkWidget *accounts_window = NULL;
if (accounts_window == NULL)
- accounts_window = empathy_accounts_dialog_show (NULL, account);
+ {
+ accounts_window = empathy_accounts_dialog_show (NULL, account);
- if (window_destroyed_cb)
- g_signal_connect (accounts_window, "destroy", window_destroyed_cb, NULL);
+ gtk_application_add_window (GTK_APPLICATION (app),
+ GTK_WINDOW (accounts_window));
+ }
gtk_window_present (GTK_WINDOW (accounts_window));
}
static GtkWidget *
show_account_assistant (EmpathyConnectionManagers *connection_mgrs,
gtk_window_present (GTK_WINDOW (accounts_window));
}
static GtkWidget *
show_account_assistant (EmpathyConnectionManagers *connection_mgrs,
- GCallback assistant_destroy_cb)
{
GtkWidget *assistant;
assistant = empathy_account_assistant_show (NULL, connection_mgrs);
{
GtkWidget *assistant;
assistant = empathy_account_assistant_show (NULL, connection_mgrs);
- if (assistant_destroy_cb)
- g_signal_connect (assistant, "destroy", assistant_destroy_cb, NULL);
+
+ gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (assistant));
gpointer user_data)
{
EmpathyConnectionManagers *cm_mgr = EMPATHY_CONNECTION_MANAGERS (source);
gpointer user_data)
{
EmpathyConnectionManagers *cm_mgr = EMPATHY_CONNECTION_MANAGERS (source);
- GCallback assistant_destroy_cb = G_CALLBACK (user_data);
+ GApplication *app = user_data;
if (!empathy_connection_managers_prepare_finish (cm_mgr, result, NULL))
goto out;
if (!empathy_connection_managers_prepare_finish (cm_mgr, result, NULL))
goto out;
- show_account_assistant (cm_mgr, assistant_destroy_cb);
+ show_account_assistant (cm_mgr, app);
DEBUG ("would show the account assistant");
out:
g_object_unref (cm_mgr);
DEBUG ("would show the account assistant");
out:
g_object_unref (cm_mgr);
+ g_application_release (app);
}
void
empathy_accounts_show_accounts_ui (TpAccountManager *manager,
TpAccount *account,
gboolean assistant,
}
void
empathy_accounts_show_accounts_ui (TpAccountManager *manager,
TpAccount *account,
gboolean assistant,
- GCallback window_destroyed_cb)
{
g_return_if_fail (TP_IS_ACCOUNT_MANAGER (manager));
g_return_if_fail (!account || TP_IS_ACCOUNT (account));
{
g_return_if_fail (TP_IS_ACCOUNT_MANAGER (manager));
g_return_if_fail (!account || TP_IS_ACCOUNT (account));
if ((empathy_accounts_has_non_salut_accounts (manager) && !assistant) ||
account != NULL)
{
if ((empathy_accounts_has_non_salut_accounts (manager) && !assistant) ||
account != NULL)
{
- do_show_accounts_ui (manager, account, window_destroyed_cb);
+ do_show_accounts_ui (manager, account, app);
cm_mgr = empathy_connection_managers_dup_singleton ();
cm_mgr = empathy_connection_managers_dup_singleton ();
+ /* Hold the application while preparing cm_mgr */
+ g_application_hold (app);
+
empathy_connection_managers_prepare_async (cm_mgr,
empathy_connection_managers_prepare_async (cm_mgr,
- connection_managers_prepare_for_accounts, window_destroyed_cb);
+ connection_managers_prepare_for_accounts, app);
void empathy_accounts_show_accounts_ui (TpAccountManager *manager,
TpAccount *account,
gboolean assistant,
void empathy_accounts_show_accounts_ui (TpAccountManager *manager,
TpAccount *account,
gboolean assistant,
- GCallback window_destroyed_cb);
#endif /* __EMPATHY_ACCOUNTS_COMMON_H__ */
#endif /* __EMPATHY_ACCOUNTS_COMMON_H__ */
static gboolean assistant = FALSE;
static void
static gboolean assistant = FALSE;
static void
-maybe_show_accounts_ui (TpAccountManager *manager)
+maybe_show_accounts_ui (TpAccountManager *manager,
+ GApplication *app)
- if (hidden ||
- (only_if_needed && empathy_accounts_has_non_salut_accounts (manager)))
- gtk_main_quit ();
- else
- empathy_accounts_show_accounts_ui (manager, NULL, assistant, gtk_main_quit);
+ if (hidden)
+ return;
+
+ if (only_if_needed && empathy_accounts_has_non_salut_accounts (manager))
+ return;
+
+ empathy_accounts_show_accounts_ui (manager, NULL, assistant, app);
{
TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
GError *error = NULL;
{
TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
GError *error = NULL;
+ GApplication *app = G_APPLICATION (user_data);
if (!tp_proxy_prepare_finish (manager, result, &error))
{
DEBUG ("Failed to prepare account manager: %s", error->message);
g_clear_error (&error);
if (!tp_proxy_prepare_finish (manager, result, &error))
{
DEBUG ("Failed to prepare account manager: %s", error->message);
g_clear_error (&error);
}
if (selected_account_name != NULL)
}
if (selected_account_name != NULL)
- empathy_accounts_show_accounts_ui (manager, account, assistant,
- G_CALLBACK (gtk_main_quit));
-
- return;
+ empathy_accounts_show_accounts_ui (manager, account, assistant, app);
+ goto out;
- maybe_show_accounts_ui (manager);
+ maybe_show_accounts_ui (manager, app);
}
g_free (account_path);
}
else
{
}
g_free (account_path);
}
else
{
- maybe_show_accounts_ui (manager);
+ maybe_show_accounts_ui (manager, app);
+
+out:
+ g_application_release (app);
{
TpAccountManager *account_manager;
{
TpAccountManager *account_manager;
- g_application_hold (app);
-
account_manager = tp_account_manager_dup ();
account_manager = tp_account_manager_dup ();
+ /* Hold the application while preparing the AM */
+ g_application_hold (app);
+
tp_proxy_prepare_async (account_manager, NULL,
tp_proxy_prepare_async (account_manager, NULL,
- account_manager_ready_for_accounts_cb, NULL);
+ account_manager_ready_for_accounts_cb, app);
g_object_unref (account_manager);
g_object_unref (account_manager);