GNOME.org
 

[gimp] app: global_dock_window_factory -> global_dock_factory

commit 66197c5d11a670c459e7fe8d8bcdc46f0784b226
Author: Martin Nordholts <martinn src gnome org>
Date:   Tue Jan 19 22:40:06 2010 +0100

    app: global_dock_window_factory -> global_dock_factory
    
    Rename back global_dock_window_factory to
    global_dock_factory. Renaming to global_dock_window_factory was done
    under the assumption that there would be a separate factory that would
    create non-toplevel dockables, but I don't expect this to happen in
    the forseeable future.

 app/actions/data-commands.c            |    2 +-
 app/actions/dialogs-commands.c         |    2 +-
 app/actions/edit-commands.c            |    2 +-
 app/actions/select-commands.c          |    2 +-
 app/actions/view-commands.c            |    2 +-
 app/actions/windows-actions.c          |    8 +++---
 app/actions/windows-commands.c         |    4 +-
 app/dialogs/dialogs-constructors.c     |    8 +++---
 app/dialogs/dialogs.c                  |   39 +++++++++++++++----------------
 app/dialogs/dialogs.h                  |    2 +-
 app/gui/gimpuiconfigurer.c             |    8 +++---
 app/gui/gui-message.c                  |    4 +-
 app/gui/gui-vtable.c                   |    2 +-
 app/gui/gui.c                          |    2 +-
 app/menus/windows-menu.c               |    8 +++---
 app/tests/test-window-management.c     |    2 +-
 app/widgets/gimpdialogfactory.c        |    5 ----
 app/widgets/gimpdockable.c             |    2 +-
 app/widgets/gimpsessioninfo-dock.c     |    5 ----
 app/widgets/gimpsessioninfo-dockable.c |    2 +-
 20 files changed, 50 insertions(+), 61 deletions(-)
---
diff --git a/app/actions/data-commands.c b/app/actions/data-commands.c
index ef9bc3b..753b854 100644
--- a/app/actions/data-commands.c
+++ b/app/actions/data-commands.c
@@ -302,7 +302,7 @@ data_edit_cmd_callback (GtkAction   *action,
       GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (view));
       GtkWidget *dockable;
 
-      dockable = gimp_dialog_factory_dialog_raise (global_dock_window_factory, screen,
+      dockable = gimp_dialog_factory_dialog_raise (global_dock_factory, screen,
                                                    value, -1);
 
       gimp_data_editor_set_data (GIMP_DATA_EDITOR (gtk_bin_get_child (GTK_BIN (dockable))),
diff --git a/app/actions/dialogs-commands.c b/app/actions/dialogs-commands.c
index 0116905..54512d9 100644
--- a/app/actions/dialogs-commands.c
+++ b/app/actions/dialogs-commands.c
@@ -56,7 +56,7 @@ dialogs_create_dockable_cmd_callback (GtkAction   *action,
   return_if_no_widget (widget, data);
 
   if (value)
-    gimp_dialog_factory_dialog_raise (global_dock_window_factory,
+    gimp_dialog_factory_dialog_raise (global_dock_factory,
                                       gtk_widget_get_screen (widget),
                                       value, -1);
 }
diff --git a/app/actions/edit-commands.c b/app/actions/edit-commands.c
index 0cb64ee..cc0a735 100644
--- a/app/actions/edit-commands.c
+++ b/app/actions/edit-commands.c
@@ -448,7 +448,7 @@ edit_named_paste_cmd_callback (GtkAction *action,
   GtkWidget *widget;
   return_if_no_widget (widget, data);
 
-  gimp_dialog_factory_dialog_raise (global_dock_window_factory,
+  gimp_dialog_factory_dialog_raise (global_dock_factory,
                                     gtk_widget_get_screen (widget),
                                     "gimp-buffer-list|gimp-buffer-grid", -1);
 }
diff --git a/app/actions/select-commands.c b/app/actions/select-commands.c
index 95360d0..7073564 100644
--- a/app/actions/select-commands.c
+++ b/app/actions/select-commands.c
@@ -319,7 +319,7 @@ select_save_cmd_callback (GtkAction *action,
   gimp_selection_save (GIMP_SELECTION (gimp_image_get_mask (image)));
   gimp_image_flush (image);
 
-  gimp_dialog_factory_dialog_raise (global_dock_window_factory,
+  gimp_dialog_factory_dialog_raise (global_dock_factory,
                                     gtk_widget_get_screen (widget),
                                     "gimp-channel-list", -1);
 }
diff --git a/app/actions/view-commands.c b/app/actions/view-commands.c
index 38bf7a8..cacdd16 100644
--- a/app/actions/view-commands.c
+++ b/app/actions/view-commands.c
@@ -338,7 +338,7 @@ view_navigation_window_cmd_callback (GtkAction *action,
 
   shell = gimp_display_get_shell (display);
 
-  gimp_dialog_factory_dialog_raise (global_dock_window_factory,
+  gimp_dialog_factory_dialog_raise (global_dock_factory,
                                     gtk_widget_get_screen (GTK_WIDGET (shell)),
                                     "gimp-navigation-view", -1);
 }
diff --git a/app/actions/windows-actions.c b/app/actions/windows-actions.c
index 33e1d73..628d255 100644
--- a/app/actions/windows-actions.c
+++ b/app/actions/windows-actions.c
@@ -137,21 +137,21 @@ windows_actions_setup (GimpActionGroup *group)
       windows_actions_display_add (group->gimp->displays, display, group);
     }
 
-  g_signal_connect_object (global_dock_window_factory, "dock-window-added",
+  g_signal_connect_object (global_dock_factory, "dock-window-added",
                            G_CALLBACK (windows_actions_dock_window_added),
                            group, 0);
-  g_signal_connect_object (global_dock_window_factory, "dock-window-removed",
+  g_signal_connect_object (global_dock_factory, "dock-window-removed",
                            G_CALLBACK (windows_actions_dock_window_removed),
                            group, 0);
 
-  for (list = gimp_dialog_factory_get_open_dialogs (global_dock_window_factory);
+  for (list = gimp_dialog_factory_get_open_dialogs (global_dock_factory);
        list;
        list = g_list_next (list))
     {
       GimpDockWindow *dock_window = list->data;
 
       if (GIMP_IS_DOCK_WINDOW (dock_window))
-        windows_actions_dock_window_added (global_dock_window_factory,
+        windows_actions_dock_window_added (global_dock_factory,
                                            dock_window,
                                            group);
     }
diff --git a/app/actions/windows-commands.c b/app/actions/windows-commands.c
index b099642..fe21942 100644
--- a/app/actions/windows-commands.c
+++ b/app/actions/windows-commands.c
@@ -114,9 +114,9 @@ windows_open_recent_cmd_callback (GtkAction *action,
   g_object_ref (info);
   gimp_container_remove (global_recent_docks, GIMP_OBJECT (info));
 
-  gimp_dialog_factory_add_session_info (global_dock_window_factory, info);
+  gimp_dialog_factory_add_session_info (global_dock_factory, info);
 
-  gimp_session_info_restore (info, global_dock_window_factory);
+  gimp_session_info_restore (info, global_dock_factory);
   gimp_session_info_clear_info (info);
 }
 
diff --git a/app/dialogs/dialogs-constructors.c b/app/dialogs/dialogs-constructors.c
index d546999..301d3f5 100644
--- a/app/dialogs/dialogs-constructors.c
+++ b/app/dialogs/dialogs-constructors.c
@@ -235,11 +235,11 @@ dialogs_toolbox_new (GimpDialogFactory *factory,
                      GimpUIManager     *ui_manager,
                      gint               view_size)
 {
-  /*  we pass "global_dock_window_factory", _not_
-   *  "global_toolbox_factory" to the toolbox constructor, because the
-   *  global_toolbox_factory has no dockables registered
+  /*  we pass "global_dock_factory", _not_ "global_toolbox_factory" to
+   *  the toolbox constructor, because the global_toolbox_factory has
+   *  no dockables registered
    */
-  return gimp_toolbox_new (global_dock_window_factory,
+  return gimp_toolbox_new (global_dock_factory,
                            context,
                            ui_manager);
 }
diff --git a/app/dialogs/dialogs.c b/app/dialogs/dialogs.c
index 6aa2714..3c093dd 100644
--- a/app/dialogs/dialogs.c
+++ b/app/dialogs/dialogs.c
@@ -40,12 +40,12 @@
 #include "gimp-intl.h"
 
 
-GimpDialogFactory *global_dialog_factory      = NULL;
-GimpDialogFactory *global_dock_window_factory = NULL;
-GimpDialogFactory *global_toolbox_factory     = NULL;
-GimpDialogFactory *global_display_factory     = NULL;
+GimpDialogFactory *global_dialog_factory  = NULL;
+GimpDialogFactory *global_dock_factory    = NULL;
+GimpDialogFactory *global_toolbox_factory = NULL;
+GimpDialogFactory *global_display_factory = NULL;
 
-GimpContainer     *global_recent_docks        = NULL;
+GimpContainer     *global_recent_docks    = NULL;
 
 
 #define FOREIGN(id, singleton, remember_size) \
@@ -224,7 +224,7 @@ static const GimpDialogFactoryEntry toplevel_entries[] =
 
 static const GimpDialogFactoryEntry dock_entries[] =
 {
-  /* docks */
+  /*  docks  */
   DOCK ("gimp-dock",
         dialogs_dock_new),
   DOCK ("gimp-toolbox",
@@ -378,11 +378,11 @@ dialogs_init (Gimp            *gimp,
                                                     menu_factory,
                                                     TRUE);
 
-  /* Dock window */
-  global_dock_window_factory = gimp_dialog_factory_new ("dock",
-                                                        gimp_get_user_context (gimp),
-                                                        menu_factory,
-                                                        TRUE);
+  /* Dock windows and docks */
+  global_dock_factory = gimp_dialog_factory_new ("dock",
+                                                 gimp_get_user_context (gimp),
+                                                 menu_factory,
+                                                 TRUE);
 
   /* Display */
   global_display_factory = gimp_dialog_factory_new ("display",
@@ -407,7 +407,7 @@ dialogs_init (Gimp            *gimp,
                                         toplevel_entries[i].dockable);
 
   for (i = 0; i < G_N_ELEMENTS (dock_entries); i++)
-    gimp_dialog_factory_register_entry (global_dock_window_factory,
+    gimp_dialog_factory_register_entry (global_dock_factory,
                                         dock_entries[i].identifier,
                                         gettext (dock_entries[i].name),
                                         gettext (dock_entries[i].blurb),
@@ -463,11 +463,10 @@ dialogs_exit (Gimp *gimp)
     }
 
   /*  destroy the "global_toolbox_factory" _before_ destroying the
-   *  "global_dock_window_factory" because the
-   *  "global_toolbox_factory" owns dockables which were created by
-   *  the "global_dock_window_factory".  This way they are properly
-   *  removed from the "global_dock_window_factory", which would
-   *  complain about stale entries otherwise.
+   *  "global_dock_factory" because the "global_toolbox_factory" owns
+   *  dockables which were created by the "global_dock_factory".  This
+   *  way they are properly removed from the "global_dock_factory",
+   *  which would complain about stale entries otherwise.
    */
   if (global_toolbox_factory)
     {
@@ -475,10 +474,10 @@ dialogs_exit (Gimp *gimp)
       global_toolbox_factory = NULL;
     }
 
-  if (global_dock_window_factory)
+  if (global_dock_factory)
     {
-      g_object_unref (global_dock_window_factory);
-      global_dock_window_factory = NULL;
+      g_object_unref (global_dock_factory);
+      global_dock_factory = NULL;
     }
 
   if (global_display_factory)
diff --git a/app/dialogs/dialogs.h b/app/dialogs/dialogs.h
index b5c0d61..84b227d 100644
--- a/app/dialogs/dialogs.h
+++ b/app/dialogs/dialogs.h
@@ -20,7 +20,7 @@
 
 
 extern GimpDialogFactory *global_dialog_factory;
-extern GimpDialogFactory *global_dock_window_factory;
+extern GimpDialogFactory *global_dock_factory;
 extern GimpDialogFactory *global_toolbox_factory;
 extern GimpDialogFactory *global_display_factory;
 
diff --git a/app/gui/gimpuiconfigurer.c b/app/gui/gimpuiconfigurer.c
index 92e7bdd..ed81402 100644
--- a/app/gui/gimpuiconfigurer.c
+++ b/app/gui/gimpuiconfigurer.c
@@ -187,7 +187,7 @@ gimp_ui_configurer_move_docks_to_columns (GimpUIConfigurer  *ui_configurer,
       g_list_free (docks);
 
       /* Kill the window if removing the dock didn't destroy it
-       * already. This will be the case forthe toolbox dock window
+       * already. This will be the case for the toolbox dock window
        */
       if (GTK_IS_WIDGET (dock_window))
         {
@@ -273,7 +273,7 @@ gimp_ui_configurer_move_docks_to_window (GimpUIConfigurer *ui_configurer,
       dock_window =
         gimp_dialog_factory_dialog_new ((GIMP_IS_TOOLBOX (dock) ?
                                          global_toolbox_factory :
-                                         global_dock_window_factory),
+                                         global_dock_factory),
                                         screen,
                                         (GIMP_IS_TOOLBOX (dock) ?
                                          "gimp-toolbox-window" :
@@ -316,7 +316,7 @@ gimp_ui_configurer_separate_shells (GimpUIConfigurer *ui_configurer,
                                                 NULL,
                                                 global_menu_factory,
                                                 global_display_factory,
-                                                global_dock_window_factory);
+                                                global_dock_factory);
       /* Move the shell there */
       shell = gimp_image_window_get_shell (source_image_window, 1);
 
@@ -369,7 +369,7 @@ gimp_ui_configurer_configure_for_single_window (GimpUIConfigurer *ui_configurer)
    * window
    */
   gimp_ui_configurer_move_docks_to_columns (ui_configurer,
-                                            global_dock_window_factory,
+                                            global_dock_factory,
                                             right_docks);
 
   /* Show the docks in the window */
diff --git a/app/gui/gui-message.c b/app/gui/gui-message.c
index f92f0fb..0763e3e 100644
--- a/app/gui/gui-message.c
+++ b/app/gui/gui-message.c
@@ -102,7 +102,7 @@ gui_message_error_console (GimpMessageSeverity  severity,
     {
       GimpSessionInfo *info;
 
-      info = gimp_dialog_factory_find_session_info (global_dock_window_factory,
+      info = gimp_dialog_factory_find_session_info (global_dock_factory,
                                                     "gimp-error-console");
 
       if (info && GIMP_IS_DOCKABLE (gimp_session_info_get_widget (info)))
@@ -110,7 +110,7 @@ gui_message_error_console (GimpMessageSeverity  severity,
     }
 
   if (! dockable)
-    dockable = gimp_dialog_factory_dialog_raise (global_dock_window_factory,
+    dockable = gimp_dialog_factory_dialog_raise (global_dock_factory,
                                                  gdk_screen_get_default (),
                                                  "gimp-error-console", -1);
 
diff --git a/app/gui/gui-vtable.c b/app/gui/gui-vtable.c
index b64a73e..0aded2b 100644
--- a/app/gui/gui-vtable.c
+++ b/app/gui/gui-vtable.c
@@ -352,7 +352,7 @@ gui_display_create (Gimp      *gimp,
                                   global_menu_factory,
                                   image_managers->data,
                                   global_display_factory,
-                                  global_dock_window_factory);
+                                  global_dock_factory);
    }
 
   if (gimp_context_get_display (context) == display)
diff --git a/app/gui/gui.c b/app/gui/gui.c
index d182c8f..e765c99 100644
--- a/app/gui/gui.c
+++ b/app/gui/gui.c
@@ -704,7 +704,7 @@ gui_device_change_notify (Gimp *gimp)
 {
   GimpSessionInfo *session_info;
 
-  session_info = gimp_dialog_factory_find_session_info (global_dock_window_factory,
+  session_info = gimp_dialog_factory_find_session_info (global_dock_factory,
                                                         "gimp-device-status");
 
   if (session_info && gimp_session_info_get_widget (session_info))
diff --git a/app/menus/windows-menu.c b/app/menus/windows-menu.c
index f4420bb..4fd3aa2 100644
--- a/app/menus/windows-menu.c
+++ b/app/menus/windows-menu.c
@@ -104,21 +104,21 @@ windows_menu_setup (GimpUIManager *manager,
       windows_menu_display_add (manager->gimp->displays, display, manager);
     }
 
-  g_signal_connect_object (global_dock_window_factory, "dock-window-added",
+  g_signal_connect_object (global_dock_factory, "dock-window-added",
                            G_CALLBACK (windows_menu_dock_window_added),
                            manager, 0);
-  g_signal_connect_object (global_dock_window_factory, "dock-window-removed",
+  g_signal_connect_object (global_dock_factory, "dock-window-removed",
                            G_CALLBACK (windows_menu_dock_window_removed),
                            manager, 0);
 
-  for (list = gimp_dialog_factory_get_open_dialogs (global_dock_window_factory);
+  for (list = gimp_dialog_factory_get_open_dialogs (global_dock_factory);
        list;
        list = g_list_next (list))
     {
       GimpDockWindow *dock_window = list->data;
 
       if (GIMP_IS_DOCK_WINDOW (dock_window))
-        windows_menu_dock_window_added (global_dock_window_factory,
+        windows_menu_dock_window_added (global_dock_factory,
                                         dock_window,
                                         manager);
     }
diff --git a/app/tests/test-window-management.c b/app/tests/test-window-management.c
index 45dde24..1b58d71 100644
--- a/app/tests/test-window-management.c
+++ b/app/tests/test-window-management.c
@@ -93,7 +93,7 @@ gimp_test_window_roles (GimpTestFixture *fixture,
   GimpDockWindow *dock_window    = NULL;
   GimpDockWindow *toolbox_window = NULL;
 
-  dock           = gimp_dialog_factory_dock_with_window_new (global_dock_window_factory,
+  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 ());
diff --git a/app/widgets/gimpdialogfactory.c b/app/widgets/gimpdialogfactory.c
index 74fa9ff..b76b54e 100644
--- a/app/widgets/gimpdialogfactory.c
+++ b/app/widgets/gimpdialogfactory.c
@@ -30,11 +30,6 @@
 
 #include "widgets-types.h"
 
-/* FIXME: Remove when the toolbox and dock window factories have been
- * merged
- */
-#include "dialogs/dialogs.h"
-
 #include "core/gimpcontext.h"
 #include "core/gimpmarshal.h"
 
diff --git a/app/widgets/gimpdockable.c b/app/widgets/gimpdockable.c
index 4022dcb..1194a32 100644
--- a/app/widgets/gimpdockable.c
+++ b/app/widgets/gimpdockable.c
@@ -1205,7 +1205,7 @@ gimp_dockable_detach (GimpDockable *dockable)
   src_dock = gimp_dockbook_get_dock (dockable->p->dockbook);
   src_dock_window = gimp_dock_window_from_dock (src_dock);
 
-  dock = gimp_dialog_factory_dock_with_window_new (global_dock_window_factory,
+  dock = gimp_dialog_factory_dock_with_window_new (global_dock_factory,
                                                    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);
diff --git a/app/widgets/gimpsessioninfo-dock.c b/app/widgets/gimpsessioninfo-dock.c
index b743bfd..4366620 100644
--- a/app/widgets/gimpsessioninfo-dock.c
+++ b/app/widgets/gimpsessioninfo-dock.c
@@ -26,11 +26,6 @@
 
 #include "widgets-types.h"
 
-/* FIXME: Remove when the toolbox and dock window factories have been
- * merged
- */
-#include "dialogs/dialogs.h"
-
 #include "gimpdialogfactory.h"
 #include "gimpdock.h"
 #include "gimpdockwindow.h"
diff --git a/app/widgets/gimpsessioninfo-dockable.c b/app/widgets/gimpsessioninfo-dockable.c
index 52c292c..1d9973d 100644
--- a/app/widgets/gimpsessioninfo-dockable.c
+++ b/app/widgets/gimpsessioninfo-dockable.c
@@ -282,7 +282,7 @@ gimp_session_info_dockable_restore (GimpSessionInfoDockable *info,
       info->view_size > GIMP_VIEW_SIZE_GIGANTIC)
     info->view_size = -1;
 
-  /* FIXME: Merge global_dock_window_factory and global_toolbox_factory
+  /* FIXME: Merge global_dock_factory and global_toolbox_factory
    * somehow so we don't need this hack
    */
   dockable = gimp_dialog_factory_dockable_new ((GIMP_IS_TOOLBOX (dock) ?
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]