[gimp] app: Kill GimpImageDock

[Martin Nordholts <martinn src gnome org>]

commit 0fc1a32ad048c67df6d6f070062168dba22fe358
Author: Martin Nordholts <martinn src gnome org>
Date:   Sun Sep 13 09:31:21 2009 +0200

    app: Kill GimpImageDock
    
    Get rid of GimpImageDock and make its subclasses inherit directly from
    GimpDock instead.

 app/widgets/Makefile.am     |    2 -
 app/widgets/gimpdockbook.c  |    4 +-
 app/widgets/gimpimagedock.c |   43 ---------------------------------
 app/widgets/gimpimagedock.h |   55 -------------------------------------------
 app/widgets/gimpmenudock.c  |    2 +-
 app/widgets/gimpmenudock.h  |    6 ++--
 app/widgets/gimptoolbox.c   |    2 +-
 app/widgets/gimptoolbox.h   |    6 ++--
 8 files changed, 10 insertions(+), 110 deletions(-)
---
diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am
index a8698a3..ca25311 100644
--- a/app/widgets/Makefile.am
+++ b/app/widgets/Makefile.am
@@ -179,8 +179,6 @@ libappwidgets_a_sources = \
 	gimphistogrameditor.h		\
 	gimphistogramview.c		\
 	gimphistogramview.h		\
-	gimpimagedock.c			\
-	gimpimagedock.h			\
 	gimpimagecommenteditor.c	\
 	gimpimagecommenteditor.h	\
 	gimpimageeditor.c		\
diff --git a/app/widgets/gimpdockbook.c b/app/widgets/gimpdockbook.c
index 0793f4d..40aeb49 100644
--- a/app/widgets/gimpdockbook.c
+++ b/app/widgets/gimpdockbook.c
@@ -32,11 +32,11 @@
 #include "core/gimpmarshal.h"
 
 #include "gimpdnd.h"
+#include "gimpdock.h"
 #include "gimpdockable.h"
 #include "gimpdockbook.h"
 #include "gimpdocked.h"
 #include "gimphelp-ids.h"
-#include "gimpimagedock.h"
 #include "gimpmenufactory.h"
 #include "gimpstringaction.h"
 #include "gimpuimanager.h"
@@ -450,7 +450,7 @@ gimp_dockbook_create_tab_widget (GimpDockbook *dockbook,
     }
 
   /* EEK */
-  if (GIMP_IS_IMAGE_DOCK (dockbook->dock) &&
+  if (GIMP_IS_DOCK_WINDOW (dockbook->dock) &&
       gimp_dock_window_get_ui_manager (GIMP_DOCK_WINDOW (dockbook->dock)))
     {
       const gchar *dialog_id;
diff --git a/app/widgets/gimpmenudock.c b/app/widgets/gimpmenudock.c
index 3d0cd3f..6cf28a7 100644
--- a/app/widgets/gimpmenudock.c
+++ b/app/widgets/gimpmenudock.c
@@ -87,7 +87,7 @@ static void   gimp_menu_dock_auto_clicked            (GtkWidget      *widget,
                                                       GimpDock       *dock);
 
 
-G_DEFINE_TYPE (GimpMenuDock, gimp_menu_dock, GIMP_TYPE_IMAGE_DOCK)
+G_DEFINE_TYPE (GimpMenuDock, gimp_menu_dock, GIMP_TYPE_DOCK)
 
 #define parent_class gimp_menu_dock_parent_class
 
diff --git a/app/widgets/gimpmenudock.h b/app/widgets/gimpmenudock.h
index 6861968..f7b628a 100644
--- a/app/widgets/gimpmenudock.h
+++ b/app/widgets/gimpmenudock.h
@@ -22,7 +22,7 @@
 #define __GIMP_MENU_DOCK_H__
 
 
-#include "gimpimagedock.h"
+#include "gimpdock.h"
 
 
 #define GIMP_TYPE_MENU_DOCK            (gimp_menu_dock_get_type ())
@@ -37,7 +37,7 @@ typedef struct _GimpMenuDockClass  GimpMenuDockClass;
 
 struct _GimpMenuDock
 {
-  GimpImageDock  parent_instance;
+  GimpDock       parent_instance;
 
   GimpContainer *image_container;
   GimpContainer *display_container;
@@ -53,7 +53,7 @@ struct _GimpMenuDock
 
 struct _GimpMenuDockClass
 {
-  GimpImageDockClass  parent_class;
+  GimpDockClass  parent_class;
 };
 
 
diff --git a/app/widgets/gimptoolbox.c b/app/widgets/gimptoolbox.c
index 5133851..c81b874 100644
--- a/app/widgets/gimptoolbox.c
+++ b/app/widgets/gimptoolbox.c
@@ -129,7 +129,7 @@ static void        toolbox_paste_received          (GtkClipboard   *clipboard,
                                                     gpointer        data);
 
 
-G_DEFINE_TYPE (GimpToolbox, gimp_toolbox, GIMP_TYPE_IMAGE_DOCK)
+G_DEFINE_TYPE (GimpToolbox, gimp_toolbox, GIMP_TYPE_DOCK)
 
 #define parent_class gimp_toolbox_parent_class
 
diff --git a/app/widgets/gimptoolbox.h b/app/widgets/gimptoolbox.h
index 8cf8fff..6d0d766 100644
--- a/app/widgets/gimptoolbox.h
+++ b/app/widgets/gimptoolbox.h
@@ -19,7 +19,7 @@
 #define __GIMP_TOOLBOX_H__
 
 
-#include "gimpimagedock.h"
+#include "gimpdock.h"
 
 
 #define GIMP_TYPE_TOOLBOX            (gimp_toolbox_get_type ())
@@ -34,7 +34,7 @@ typedef struct _GimpToolboxClass GimpToolboxClass;
 
 struct _GimpToolbox
 {
-  GimpImageDock  parent_instance;
+  GimpDock       parent_instance;
 
   GtkWidget     *vbox;
 
@@ -54,7 +54,7 @@ struct _GimpToolbox
 
 struct _GimpToolboxClass
 {
-  GimpImageDockClass  parent_class;
+  GimpDockClass  parent_class;
 };