callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: Copy dialogs list so we can remove while we iterate

Browse Source
This commit is contained in:
Martin Nordholts
2009-10-25 20:35:49 +01:00
parent ca5fbf45d4
commit d7c61bade9
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/gui/gimpuiconfigurer.c
View File

@ -141,10 +141,10 @@ gimp_ui_configurer_move_docks_to_columns (GimpUIConfigurer *ui_configurer,
GimpDialogFactory *dialog_factory, GimpDialogFactory *dialog_factory,
GimpDockColumns *dock_columns) GimpDockColumns *dock_columns)
{ {
GList *iter = NULL; GList *dialogs = g_list_copy (dialog_factory->open_dialogs);
GList *for_removal = NULL; GList *iter = NULL;
for (iter = dialog_factory->open_dialogs; iter; iter = iter->next) for (iter = dialogs; iter; iter = iter->next)
{ {
GimpDockWindow *dock_window = NULL; GimpDockWindow *dock_window = NULL;
GimpDock *dock = NULL; GimpDock *dock = NULL;
@ -163,18 +163,9 @@ gimp_ui_configurer_move_docks_to_columns (GimpUIConfigurer *ui_configurer,
gimp_dock_columns_add_dock (dock_columns, dock, -1); gimp_dock_columns_add_dock (dock_columns, dock, -1);
g_object_unref (dock); g_object_unref (dock);
/* Queue for removal from the dialog factory. (We can't remove
* while we iterate)
*/
for_removal = g_list_prepend (for_removal, dock_window);
}
for (iter = for_removal; iter; iter = iter->next)
{
GtkWidget *dock_window = GTK_WIDGET (iter->data);
/* Kill the dock window, we don't need it any longer */ /* Kill the dock window, we don't need it any longer */
gimp_dialog_factory_remove_dialog (dialog_factory, dock_window); gimp_dialog_factory_remove_dialog (dialog_factory,
GTK_WIDGET (dock_window));
gtk_widget_destroy (GTK_WIDGET (dock_window)); gtk_widget_destroy (GTK_WIDGET (dock_window));
} }
} }