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

app: Fix gimp_dialog_factory_constructor()

Browse Source 
Fix gimp_dialog_factory_constructor() so that non-dockables can be
created by the dialog factory.
This commit is contained in:
Martin Nordholts
2010-01-16 21:22:56 +01:00
parent 08078ca79c
commit db2221c97d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/widgets/gimpdialogfactory.c
View File

@ -1378,7 +1378,6 @@ gimp_dialog_factory_constructor (GimpDialogFactory *factory,
GimpContext *context, GimpContext *context,
gint view_size) gint view_size)
{ {
GtkWidget *dockable = NULL;
GtkWidget *widget; GtkWidget *widget;
widget = entry->new_func (factory, context, view_size); widget = entry->new_func (factory, context, view_size);
@ -1388,6 +1387,8 @@ gimp_dialog_factory_constructor (GimpDialogFactory *factory,
*/ */
if (widget && entry->dockable) if (widget && entry->dockable)
{ {
GtkWidget *dockable = NULL;
dockable = gimp_dockable_new (entry->name, entry->blurb, dockable = gimp_dockable_new (entry->name, entry->blurb,
entry->stock_id, entry->help_id); entry->stock_id, entry->help_id);
gtk_container_add (GTK_CONTAINER (dockable), widget); gtk_container_add (GTK_CONTAINER (dockable), widget);
@ -1396,9 +1397,12 @@ gimp_dialog_factory_constructor (GimpDialogFactory *factory,
/* EEK */ /* EEK */
g_object_set_data (G_OBJECT (dockable), "gimp-dialog-identifier", g_object_set_data (G_OBJECT (dockable), "gimp-dialog-identifier",
entry->identifier); entry->identifier);
/* Return the dockable instead */
widget = dockable;
} }
return dockable; return widget;
} }
static void static void