[Xfce4-commits] r30360 - in libexo/branches/xfce_4_6: . exo

[Nick Schermer]

Author: nick
Date: 2009-07-20 17:31:03 +0000 (Mon, 20 Jul 2009)
New Revision: 30360

Modified:
   libexo/branches/xfce_4_6/NEWS
   libexo/branches/xfce_4_6/exo/exo-toolbars-view.c
Log:
Backport fix from trunk.


Modified: libexo/branches/xfce_4_6/NEWS
===================================================================
--- libexo/branches/xfce_4_6/NEWS	2009-07-20 17:29:14 UTC (rev 30359)
+++ libexo/branches/xfce_4_6/NEWS	2009-07-20 17:31:03 UTC (rev 30360)
@@ -3,6 +3,7 @@
 - Allow all arguments in the terminal parameters (part of bug #5301).
 - Fix some issues in exo-open with spaces in arguments.
 - Properly handle NULL pixbufs in the toolbars code.
+- Make sure the ui-manager is up2date when creating the exo toolbar.
 
 0.3.101
 =======

Modified: libexo/branches/xfce_4_6/exo/exo-toolbars-view.c
===================================================================
--- libexo/branches/xfce_4_6/exo/exo-toolbars-view.c	2009-07-20 17:29:14 UTC (rev 30359)
+++ libexo/branches/xfce_4_6/exo/exo-toolbars-view.c	2009-07-20 17:31:03 UTC (rev 30360)
@@ -1123,6 +1123,9 @@
   if (view->priv->model == NULL || view->priv->ui_manager == NULL)
     return;
 
+  /* ensure there are no pending updates before getting the widgets */
+  gtk_ui_manager_ensure_update (view->priv->ui_manager);
+
   n_toolbars = exo_toolbars_model_n_toolbars (view->priv->model);
   for (i = 0; i < n_toolbars; ++i)
     {