Revision: 1845
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1845&view=rev
Author:   nadvornik
Date:     2009-09-12 15:31:24 +0000 (Sat, 12 Sep 2009)

Log Message:
-----------
fixed reloading of editors

Modified Paths:
--------------
    trunk/src/layout_util.c

Modified: trunk/src/layout_util.c
===================================================================
--- trunk/src/layout_util.c     2009-09-09 18:16:09 UTC (rev 1844)
+++ trunk/src/layout_util.c     2009-09-12 15:31:24 UTC (rev 1845)
@@ -1804,6 +1804,11 @@
        GList *old_path;
        GString *desc;
        
+       if (lw->ui_editors_id)
+               {
+               gtk_ui_manager_remove_ui(lw->ui_manager, lw->ui_editors_id);
+               }
+
        if (lw->action_group_editors)
                {
                gtk_ui_manager_remove_action_group(lw->ui_manager, 
lw->action_group_editors);
@@ -1988,19 +1993,6 @@
 
        work = layout_window_list;
 
-#if 0
-/* it should be enough to remove the old editors after the new ones are 
loaded, in layout_actions_setup_editors */
-       while (work)
-               {
-               LayoutWindow *lw = work->data;
-               work = work->next;
-
-               gtk_ui_manager_remove_ui(lw->ui_manager, lw->ui_editors_id);
-               gtk_ui_manager_remove_action_group(lw->ui_manager, 
lw->action_group_editors);
-               g_object_unref(lw->action_group_editors);
-               lw->action_group_editors = NULL;
-               }
-#endif
        editor_table_clear();
        layout_editors_reload_idle_id = 
g_idle_add(layout_editors_reload_idle_cb, NULL);
 }


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn

Reply via email to