[gimp] app: gimp_dialog_factory_dock_new() -> _dock_with_window_new()

[Martin Nordholts <martinn src gnome org>]

commit 95bab5da5ff6a341a8f2950d94bbc576ac8a05bb
Author: Martin Nordholts <martinn src gnome org>
Date:   Tue Dec 1 21:42:24 2009 +0100

    app: gimp_dialog_factory_dock_new() -> _dock_with_window_new()

 app/actions/windows-commands.c     |    4 ++--
 app/tests/test-window-management.c |    8 ++++----
 app/widgets/gimpdialogfactory.c    |   19 ++++++++++---------
 app/widgets/gimpdialogfactory.h    |    2 +-
 app/widgets/gimpdockable.c         |    4 ++--
 app/widgets/gimpsessioninfo-dock.c |    2 +-
 6 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/app/actions/windows-commands.c b/app/actions/windows-commands.c
index 4938fd5..eee568b 100644
--- a/app/actions/windows-commands.c
+++ b/app/actions/windows-commands.c
@@ -107,8 +107,8 @@ windows_show_toolbox (void)
     {
       GtkWidget *toolbox;
 
-      toolbox = gimp_dialog_factory_dock_new (global_toolbox_factory,
-                                              gdk_screen_get_default ());
+      toolbox = gimp_dialog_factory_dock_with_window_new (global_toolbox_factory,
+                                                          gdk_screen_get_default ());
 
       gtk_widget_show (toolbox);
     }
diff --git a/app/tests/test-window-management.c b/app/tests/test-window-management.c
index e5fea31..414a9df 100644
--- a/app/tests/test-window-management.c
+++ b/app/tests/test-window-management.c
@@ -92,10 +92,10 @@ gimp_test_window_roles (GimpTestFixture *fixture,
   GimpDockWindow *dock_window    = NULL;
   GimpDockWindow *toolbox_window = NULL;
 
-  dock           = gimp_dialog_factory_dock_new (global_dock_factory,
-                                                 gdk_screen_get_default ());
-  toolbox        = gimp_dialog_factory_dock_new (global_toolbox_factory,
-                                                 gdk_screen_get_default ());
+  dock           = gimp_dialog_factory_dock_with_window_new (global_dock_factory,
+                                                             gdk_screen_get_default ());
+  toolbox        = gimp_dialog_factory_dock_with_window_new (global_toolbox_factory,
+                                                             gdk_screen_get_default ());
   dock_window    = gimp_dock_window_from_dock (GIMP_DOCK (dock));
   toolbox_window = gimp_dock_window_from_dock (GIMP_DOCK (toolbox));
 
diff --git a/app/widgets/gimpdialogfactory.c b/app/widgets/gimpdialogfactory.c
index c9036a7..659926c 100644
--- a/app/widgets/gimpdialogfactory.c
+++ b/app/widgets/gimpdialogfactory.c
@@ -502,7 +502,7 @@ gimp_dialog_factory_dialog_new_internal (GimpDialogFactory *factory,
         {
           GtkWidget *dockbook;
 
-          dock     = gimp_dialog_factory_dock_new (factory, screen);
+          dock     = gimp_dialog_factory_dock_with_window_new (factory, screen);
           dockbook = gimp_dockbook_new (factory->menu_factory);
 
           gimp_dock_add_book (GIMP_DOCK (dock),
@@ -759,20 +759,21 @@ gimp_dialog_factory_dockable_new (GimpDialogFactory *factory,
 }
 
 /**
- * gimp_dialog_factory_dock_new:
+ * gimp_dialog_factory_dock_with_window_new:
  * @factory: a #GimpDialogFacotry
- * @screen:  the #GdkScreen the dock should appear on
+ * @screen:  the #GdkScreen the dock window should appear on
  *
- * Returns a new #GimpDock in this %factory's context. We use a function
- * pointer passed to this %factory's constructor instead of simply
- * gimp_dock_new() because we may want different instances of
- * #GimpDialogFactory create different subclasses of #GimpDock.
+ * Returns a new #GimpDock in this %factory's context, put inside a
+ * #GimpDockWindow. We use a function pointer passed to this
+ * %factory's constructor instead of simply gimp_dock_new() because we
+ * may want different instances of #GimpDialogFactory create different
+ * subclasses of #GimpDock.
  *
  * Return value: the newly created #GimpDock.
  **/
 GtkWidget *
-gimp_dialog_factory_dock_new (GimpDialogFactory *factory,
-                              GdkScreen         *screen)
+gimp_dialog_factory_dock_with_window_new (GimpDialogFactory *factory,
+                                          GdkScreen         *screen)
 {
   GtkWidget     *dock_window = NULL;
   GtkWidget     *dock        = NULL;
diff --git a/app/widgets/gimpdialogfactory.h b/app/widgets/gimpdialogfactory.h
index e777460..e3b687a 100644
--- a/app/widgets/gimpdialogfactory.h
+++ b/app/widgets/gimpdialogfactory.h
@@ -159,7 +159,7 @@ GtkWidget *         gimp_dialog_factory_dockable_new         (GimpDialogFactory
                                                               GimpDock                *dock,
                                                               const gchar             *identifier,
                                                               gint                     view_size);
-GtkWidget *         gimp_dialog_factory_dock_new             (GimpDialogFactory       *factory,
+GtkWidget *         gimp_dialog_factory_dock_with_window_new (GimpDialogFactory       *factory,
                                                               GdkScreen               *screen);
 GtkWidget *         gimp_dialog_factory_dock_window_new      (GimpDialogFactory       *factory,
                                                               GdkScreen               *screen);
diff --git a/app/widgets/gimpdockable.c b/app/widgets/gimpdockable.c
index c258d70..3d736b6 100644
--- a/app/widgets/gimpdockable.c
+++ b/app/widgets/gimpdockable.c
@@ -1085,8 +1085,8 @@ gimp_dockable_detach (GimpDockable *dockable)
 
   src_dock = gimp_dockbook_get_dock (dockable->dockbook);
 
-  dock = gimp_dialog_factory_dock_new (gimp_dock_get_dialog_factory (src_dock),
-                                       gtk_widget_get_screen (GTK_WIDGET (dockable)));
+  dock = gimp_dialog_factory_dock_with_window_new (gimp_dock_get_dialog_factory (src_dock),
+                                                   gtk_widget_get_screen (GTK_WIDGET (dockable)));
   dock_window = gimp_dock_window_from_dock (GIMP_DOCK (dock));
   gtk_window_set_position (GTK_WINDOW (dock_window), GTK_WIN_POS_MOUSE);
   gimp_dock_setup (GIMP_DOCK (dock), src_dock);
diff --git a/app/widgets/gimpsessioninfo-dock.c b/app/widgets/gimpsessioninfo-dock.c
index 8d751eb..bce46ca 100644
--- a/app/widgets/gimpsessioninfo-dock.c
+++ b/app/widgets/gimpsessioninfo-dock.c
@@ -184,7 +184,7 @@ gimp_session_info_dock_restore (GimpSessionInfo   *info,
   g_return_if_fail (GIMP_IS_DIALOG_FACTORY (factory));
   g_return_if_fail (GDK_IS_SCREEN (screen));
 
-  dock        = GIMP_DOCK (gimp_dialog_factory_dock_new (factory, screen));
+  dock        = GIMP_DOCK (gimp_dialog_factory_dock_with_window_new (factory, screen));
   dock_window = gimp_dock_window_from_dock (GIMP_DOCK (dock));
 
   if (dock && info->p->aux_info)