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

Bug 646794 - Get rid of valgrind warnings when changing window mode

Browse Source
This commit is contained in:
Massimo Valentini
2011-06-17 17:52:39 +02:00
parent 3c28ed4303
commit fe6e0c1913
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/gui/gimpuiconfigurer.c
View File

@ -175,6 +175,8 @@ gimp_ui_configurer_move_docks_to_columns (GimpUIConfigurer *ui_configurer,
dock_window = GIMP_DOCK_WINDOW (dialog_iter->data); dock_window = GIMP_DOCK_WINDOW (dialog_iter->data);
dock_container = GIMP_DOCK_CONTAINER (dock_window); dock_container = GIMP_DOCK_CONTAINER (dock_window);
g_object_add_weak_pointer (G_OBJECT (dock_window),
(gpointer) &dock_window);
docks = gimp_dock_container_get_docks (dock_container); docks = gimp_dock_container_get_docks (dock_container);
for (dock_iter = docks; dock_iter; dock_iter = dock_iter->next) for (dock_iter = docks; dock_iter; dock_iter = dock_iter->next)
@ -195,13 +197,13 @@ gimp_ui_configurer_move_docks_to_columns (GimpUIConfigurer *ui_configurer,
} }
g_list_free (docks); g_list_free (docks);
if (dock_window)
g_object_remove_weak_pointer (G_OBJECT (dock_window),
(gpointer) &dock_window);
/* Kill the window if removing the dock didn't destroy it /* Kill the window if removing the dock didn't destroy it
* already. This will be the case for the toolbox dock window * already. This will be the case for the toolbox dock window
*/ */
/* FIXME: We should solve this in a more elegant way, valgrind
* complains about invalid reads when the dock window already is
* destroyed
*/
if (GTK_IS_WIDGET (dock_window)) if (GTK_IS_WIDGET (dock_window))
{ {
guint docks_len; guint docks_len;