From d11f9d7dbfa00ca3ef150fe54666d7a4717115b2 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 31 Jan 2012 22:00:17 +0100 Subject: [PATCH] Bug 664885 - Open 'Document History' --> always a additional history tab appears Really find a *widget* in gimp_dialog_factory_find_widget(), don't just return the first found session info's widget. It's perfectly fine for a session info to have a NULL widget, if that dialog is not currently open. --- app/widgets/gimpdialogfactory.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/widgets/gimpdialogfactory.c b/app/widgets/gimpdialogfactory.c index 000cdf7945..ce057c2905 100644 --- a/app/widgets/gimpdialogfactory.c +++ b/app/widgets/gimpdialogfactory.c @@ -352,8 +352,9 @@ GtkWidget * gimp_dialog_factory_find_widget (GimpDialogFactory *factory, const gchar *identifiers) { - gchar **ids; - gint i; + GtkWidget *widget = NULL; + gchar **ids; + gint i; g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL); g_return_val_if_fail (identifiers != NULL, NULL); @@ -368,15 +369,16 @@ gimp_dialog_factory_find_widget (GimpDialogFactory *factory, if (info) { - g_strfreev (ids); + widget = gimp_session_info_get_widget (info); - return gimp_session_info_get_widget (info); + if (widget) + break; } } g_strfreev (ids); - return NULL; + return widget; } /**