[frogr] Delay the modification of the app menu as much as possible
- From: Mario Sanchez Prada <msanchez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [frogr] Delay the modification of the app menu as much as possible
- Date: Thu, 5 Jun 2014 23:28:02 +0000 (UTC)
commit 76b456d1e88ad36307a222bc32e231b4739162ad
Author: Mario Sanchez Prada <msanchez gnome org>
Date: Thu Jun 5 21:55:12 2014 +0100
Delay the modification of the app menu as much as possible
src/frogr-main-view.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/frogr-main-view.c b/src/frogr-main-view.c
index cdbd57c..c97a3b9 100644
--- a/src/frogr-main-view.c
+++ b/src/frogr-main-view.c
@@ -385,10 +385,6 @@ _initialize_ui (FrogrMainView *self)
priv->app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu"));
gtk_application_set_app_menu (GTK_APPLICATION (gtk_app), priv->app_menu);
- /* We initialize the app menu (update parts that can be variable) on
- a new iteration of the main loop to avoid race conditions on OS X */
- g_idle_add ((GSourceFunc) _initialize_app_menu_on_idle, self);
-
/* Menu bar */
full_path = g_strdup_printf ("%s/" UI_MENU_BAR_FILE, frogr_util_get_app_data_dir ());
gtk_builder_add_from_file (builder, full_path, NULL);
@@ -551,8 +547,12 @@ _initialize_ui (FrogrMainView *self)
/* Update UI */
_update_ui (FROGR_MAIN_VIEW (self));
+ /* We initialize the app menu (update parts that can be variable) on
+ a new iteration of the main loop to avoid race conditions on OS X */
+ gdk_threads_add_idle ((GSourceFunc) _initialize_app_menu_on_idle, self);
+
/* Show the auth dialog, if needed, on idle */
- g_idle_add ((GSourceFunc) _maybe_show_auth_dialog_on_idle, self);
+ gdk_threads_add_idle ((GSourceFunc) _maybe_show_auth_dialog_on_idle, self);
gtk_widget_show_all (GTK_WIDGET (self));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]