[gimp] app: Copy 'dockable' member in gimp_dialog_factory_register_entry()
- From: Martin Nordholts <martinn src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gimp] app: Copy 'dockable' member in gimp_dialog_factory_register_entry()
- Date: Sat, 16 Jan 2010 18:34:19 +0000 (UTC)
commit 2527955c21e80a5213579979a1e77751827e0e1c
Author: Martin Nordholts <martinn src gnome org>
Date: Sat Jan 16 19:35:26 2010 +0100
app: Copy 'dockable' member in gimp_dialog_factory_register_entry()
Copying 'dockable' for a dialog factory entry was forgotten in
gimp_dialog_factory_register_entry().
app/dialogs/dialogs.c | 7 +++++--
app/widgets/gimpdialogfactory.c | 4 +++-
app/widgets/gimpdialogfactory.h | 3 ++-
3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/app/dialogs/dialogs.c b/app/dialogs/dialogs.c
index 490a09a..a1e604c 100644
--- a/app/dialogs/dialogs.c
+++ b/app/dialogs/dialogs.c
@@ -362,7 +362,8 @@ dialogs_init (Gimp *gimp,
toplevel_entries[i].singleton,
toplevel_entries[i].session_managed,
toplevel_entries[i].remember_size,
- toplevel_entries[i].remember_if_open);
+ toplevel_entries[i].remember_if_open,
+ toplevel_entries[i].dockable);
for (i = 0; i < G_N_ELEMENTS (dock_entries); i++)
gimp_dialog_factory_register_entry (global_dock_window_factory,
@@ -376,7 +377,8 @@ dialogs_init (Gimp *gimp,
dock_entries[i].singleton,
dock_entries[i].session_managed,
dock_entries[i].remember_size,
- dock_entries[i].remember_if_open);
+ dock_entries[i].remember_if_open,
+ dock_entries[i].dockable);
gimp_dialog_factory_register_entry (global_display_factory,
"gimp-empty-image-window",
@@ -387,6 +389,7 @@ dialogs_init (Gimp *gimp,
TRUE,
TRUE,
TRUE,
+ FALSE,
FALSE);
global_recent_docks = gimp_list_new (GIMP_TYPE_SESSION_INFO, FALSE);
diff --git a/app/widgets/gimpdialogfactory.c b/app/widgets/gimpdialogfactory.c
index 3d4ac1d..48d5869 100644
--- a/app/widgets/gimpdialogfactory.c
+++ b/app/widgets/gimpdialogfactory.c
@@ -360,7 +360,8 @@ gimp_dialog_factory_register_entry (GimpDialogFactory *factory,
gboolean singleton,
gboolean session_managed,
gboolean remember_size,
- gboolean remember_if_open)
+ gboolean remember_if_open,
+ gboolean dockable)
{
GimpDialogFactoryEntry *entry;
@@ -380,6 +381,7 @@ gimp_dialog_factory_register_entry (GimpDialogFactory *factory,
entry->session_managed = session_managed ? TRUE : FALSE;
entry->remember_size = remember_size ? TRUE : FALSE;
entry->remember_if_open = remember_if_open ? TRUE : FALSE;
+ entry->dockable = dockable ? TRUE : FALSE;
factory->p->registered_dialogs = g_list_prepend (factory->p->registered_dialogs,
entry);
diff --git a/app/widgets/gimpdialogfactory.h b/app/widgets/gimpdialogfactory.h
index bc3f65d..d2b798f 100644
--- a/app/widgets/gimpdialogfactory.h
+++ b/app/widgets/gimpdialogfactory.h
@@ -125,7 +125,8 @@ void gimp_dialog_factory_register_entry (GimpDialogFactory
gboolean singleton,
gboolean session_managed,
gboolean remember_size,
- gboolean remember_if_open);
+ gboolean remember_if_open,
+ gboolean dockable);
GimpDialogFactoryEntry *
gimp_dialog_factory_find_entry (GimpDialogFactory *factory,
const gchar *identifier);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]