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

app: properly disconnect from the old shell in gimp_tool_dialog_set_shell()

Browse Source 
Also clean up the function a bit.
This commit is contained in:
Michael Natterer
2014-06-05 22:19:23 +02:00
parent ac9101691c
commit 8e948d29e0
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/display/gimptooldialog.c
View File

@ -162,25 +162,24 @@ gimp_tool_dialog_set_shell (GimpToolDialog *tool_dialog,
g_signal_handlers_disconnect_by_func (private->shell, g_signal_handlers_disconnect_by_func (private->shell,
gimp_tool_dialog_shell_unmap, gimp_tool_dialog_shell_unmap,
tool_dialog); tool_dialog);
private->shell = NULL;
gtk_window_set_transient_for (GTK_WINDOW (tool_dialog), NULL);
} }
private->shell = shell; private->shell = shell;
if (private->shell) if (private->shell)
{ {
GtkWidget *toplevel; GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (shell));
gtk_window_set_transient_for (GTK_WINDOW (tool_dialog),
GTK_WINDOW (toplevel));
g_signal_connect_object (private->shell, "unmap", g_signal_connect_object (private->shell, "unmap",
G_CALLBACK (gimp_tool_dialog_shell_unmap), G_CALLBACK (gimp_tool_dialog_shell_unmap),
tool_dialog, 0); tool_dialog, 0);
g_object_add_weak_pointer (G_OBJECT (private->shell), g_object_add_weak_pointer (G_OBJECT (private->shell),
(gpointer) &private->shell); (gpointer) &private->shell);
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (shell));
gtk_window_set_transient_for (GTK_WINDOW (tool_dialog),
GTK_WINDOW (toplevel));
} }
} }