GNOME.org
 

[gimp] app: move the GimpWindowStrategy interface from display/ to widgets/

commit 0a68527edcfcb88936b05c5bf16fdb8a3c292158
Author: Michael Natterer <mitch gimp org>
Date:   Mon Jan 30 23:33:21 2012 +0100

    app: move the GimpWindowStrategy interface from display/ to widgets/

 app/actions/data-commands.c                   |    3 +--
 app/actions/dialogs-commands.c                |    3 +--
 app/actions/edit-commands.c                   |    2 +-
 app/actions/file-commands.c                   |    1 -
 app/actions/select-commands.c                 |    2 +-
 app/actions/tool-options-commands.c           |    3 +--
 app/actions/view-commands.c                   |    2 +-
 app/display/Makefile.am                       |    4 +---
 app/display/display-types.h                   |    1 -
 app/display/gimpmultiwindowstrategy.c         |    2 +-
 app/display/gimpsinglewindowstrategy.c        |    5 ++---
 app/gui/gui-message.c                         |    3 +--
 app/tools/gimpcolortool.c                     |    2 +-
 app/widgets/Makefile.am                       |    2 ++
 app/{display => widgets}/gimpwindowstrategy.c |    5 ++---
 app/{display => widgets}/gimpwindowstrategy.h |    0
 app/widgets/widgets-types.h                   |    1 +
 17 files changed, 17 insertions(+), 24 deletions(-)
---
diff --git a/app/actions/data-commands.c b/app/actions/data-commands.c
index 1821117..f861d7c 100644
--- a/app/actions/data-commands.c
+++ b/app/actions/data-commands.c
@@ -39,8 +39,7 @@
 #include "widgets/gimpdialogfactory.h"
 #include "widgets/gimpmessagebox.h"
 #include "widgets/gimpmessagedialog.h"
-
-#include "display/gimpwindowstrategy.h"
+#include "widgets/gimpwindowstrategy.h"
 
 #include "dialogs/data-delete-dialog.h"
 
diff --git a/app/actions/dialogs-commands.c b/app/actions/dialogs-commands.c
index 2390060..3a5cd69 100644
--- a/app/actions/dialogs-commands.c
+++ b/app/actions/dialogs-commands.c
@@ -26,8 +26,7 @@
 #include "core/gimp.h"
 
 #include "widgets/gimpdialogfactory.h"
-
-#include "display/gimpwindowstrategy.h"
+#include "widgets/gimpwindowstrategy.h"
 
 #include "actions.h"
 #include "dialogs-commands.h"
diff --git a/app/actions/edit-commands.c b/app/actions/edit-commands.c
index 4d44157..c1244be 100644
--- a/app/actions/edit-commands.c
+++ b/app/actions/edit-commands.c
@@ -44,11 +44,11 @@
 #include "widgets/gimpdialogfactory.h"
 #include "widgets/gimpmessagebox.h"
 #include "widgets/gimpmessagedialog.h"
+#include "widgets/gimpwindowstrategy.h"
 
 #include "display/gimpdisplay.h"
 #include "display/gimpdisplayshell.h"
 #include "display/gimpdisplayshell-transform.h"
-#include "display/gimpwindowstrategy.h"
 
 #include "dialogs/fade-dialog.h"
 
diff --git a/app/actions/file-commands.c b/app/actions/file-commands.c
index d8be013..93ee58c 100644
--- a/app/actions/file-commands.c
+++ b/app/actions/file-commands.c
@@ -51,7 +51,6 @@
 
 #include "display/gimpdisplay.h"
 #include "display/gimpdisplay-foreach.h"
-#include "display/gimpwindowstrategy.h"
 
 #include "dialogs/file-save-dialog.h"
 
diff --git a/app/actions/select-commands.c b/app/actions/select-commands.c
index 9aa609b..89e5012 100644
--- a/app/actions/select-commands.c
+++ b/app/actions/select-commands.c
@@ -33,10 +33,10 @@
 
 #include "widgets/gimphelp-ids.h"
 #include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpwindowstrategy.h"
 
 #include "display/gimpdisplay.h"
 #include "display/gimpdisplayshell.h"
-#include "display/gimpwindowstrategy.h"
 
 #include "dialogs/stroke-dialog.h"
 
diff --git a/app/actions/tool-options-commands.c b/app/actions/tool-options-commands.c
index 12466b7..78f2c7b 100644
--- a/app/actions/tool-options-commands.c
+++ b/app/actions/tool-options-commands.c
@@ -41,8 +41,7 @@
 #include "widgets/gimpmessagedialog.h"
 #include "widgets/gimptooloptionseditor.h"
 #include "widgets/gimpuimanager.h"
-
-#include "display/gimpwindowstrategy.h"
+#include "widgets/gimpwindowstrategy.h"
 
 #include "dialogs/data-delete-dialog.h"
 
diff --git a/app/actions/view-commands.c b/app/actions/view-commands.c
index 47292c8..fbd291d 100644
--- a/app/actions/view-commands.c
+++ b/app/actions/view-commands.c
@@ -39,6 +39,7 @@
 #include "widgets/gimpdock.h"
 #include "widgets/gimpdialogfactory.h"
 #include "widgets/gimpuimanager.h"
+#include "widgets/gimpwindowstrategy.h"
 
 #include "display/gimpdisplay.h"
 #include "display/gimpdisplay-foreach.h"
@@ -49,7 +50,6 @@
 #include "display/gimpdisplayshell-scale-dialog.h"
 #include "display/gimpdisplayshell-scroll.h"
 #include "display/gimpimagewindow.h"
-#include "display/gimpwindowstrategy.h"
 
 #include "actions.h"
 #include "view-commands.h"
diff --git a/app/display/Makefile.am b/app/display/Makefile.am
index 7b65bb0..ab4111b 100644
--- a/app/display/Makefile.am
+++ b/app/display/Makefile.am
@@ -144,9 +144,7 @@ libappdisplay_a_sources = \
 	gimpstatusbar.c				\
 	gimpstatusbar.h				\
 	gimptooldialog.c			\
-	gimptooldialog.h			\
-	gimpwindowstrategy.c			\
-	gimpwindowstrategy.h
+	gimptooldialog.h
 
 libappdisplay_a_built_sources = display-enums.c
 
diff --git a/app/display/display-types.h b/app/display/display-types.h
index e7201a5..77e5c59 100644
--- a/app/display/display-types.h
+++ b/app/display/display-types.h
@@ -35,7 +35,6 @@ typedef struct _GimpMotionBuffer         GimpMotionBuffer;
 typedef struct _GimpImageWindow          GimpImageWindow;
 typedef struct _GimpMultiWindowStrategy  GimpMultiWindowStrategy;
 typedef struct _GimpSingleWindowStrategy GimpSingleWindowStrategy;
-typedef struct _GimpWindowStrategy       GimpWindowStrategy;
 
 typedef struct _GimpCursorView           GimpCursorView;
 typedef struct _GimpNavigationEditor     GimpNavigationEditor;
diff --git a/app/display/gimpmultiwindowstrategy.c b/app/display/gimpmultiwindowstrategy.c
index cdaf4ef..f736e72 100644
--- a/app/display/gimpmultiwindowstrategy.c
+++ b/app/display/gimpmultiwindowstrategy.c
@@ -28,9 +28,9 @@
 #include "core/gimp.h"
 
 #include "widgets/gimpdialogfactory.h"
+#include "widgets/gimpwindowstrategy.h"
 
 #include "gimpmultiwindowstrategy.h"
-#include "gimpwindowstrategy.h"
 
 
 static void        gimp_multi_window_strategy_window_strategy_iface_init (GimpWindowStrategyInterface *iface);
diff --git a/app/display/gimpsinglewindowstrategy.c b/app/display/gimpsinglewindowstrategy.c
index 600d34f..0c46888 100644
--- a/app/display/gimpsinglewindowstrategy.c
+++ b/app/display/gimpsinglewindowstrategy.c
@@ -33,11 +33,10 @@
 #include "widgets/gimpdock.h"
 #include "widgets/gimpdockbook.h"
 #include "widgets/gimpdockcolumns.h"
+#include "widgets/gimpwindowstrategy.h"
 
-#include "display/gimpimagewindow.h"
-
+#include "gimpimagewindow.h"
 #include "gimpsinglewindowstrategy.h"
-#include "gimpwindowstrategy.h"
 
 
 static void        gimp_single_window_strategy_window_strategy_iface_init (GimpWindowStrategyInterface *iface);
diff --git a/app/gui/gui-message.c b/app/gui/gui-message.c
index 522bfc8..7303415 100644
--- a/app/gui/gui-message.c
+++ b/app/gui/gui-message.c
@@ -40,8 +40,7 @@
 #include "widgets/gimpprogressdialog.h"
 #include "widgets/gimpsessioninfo.h"
 #include "widgets/gimpwidgets-utils.h"
-
-#include "display/gimpwindowstrategy.h"
+#include "widgets/gimpwindowstrategy.h"
 
 #include "gui-message.h"
 
diff --git a/app/tools/gimpcolortool.c b/app/tools/gimpcolortool.c
index 6b5a32d..1e0d0eb 100644
--- a/app/tools/gimpcolortool.c
+++ b/app/tools/gimpcolortool.c
@@ -42,6 +42,7 @@
 #include "widgets/gimpdockable.h"
 #include "widgets/gimppaletteeditor.h"
 #include "widgets/gimpsessioninfo.h"
+#include "widgets/gimpwindowstrategy.h"
 
 #include "display/gimpcanvasitem.h"
 #include "display/gimpdisplay.h"
@@ -49,7 +50,6 @@
 #include "display/gimpdisplayshell-appearance.h"
 #include "display/gimpdisplayshell-selection.h"
 #include "display/gimpdisplayshell-transform.h"
-#include "display/gimpwindowstrategy.h"
 
 #include "gimpcoloroptions.h"
 #include "gimpcolortool.h"
diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am
index f6b3fa5..55dacc5 100644
--- a/app/widgets/Makefile.am
+++ b/app/widgets/Makefile.am
@@ -402,6 +402,8 @@ libappwidgets_a_sources = \
 	gimpwidgets-utils.h		\
 	gimpwindow.c			\
 	gimpwindow.h			\
+	gimpwindowstrategy.c		\
+	gimpwindowstrategy.h		\
 	gtkwrapbox.c			\
 	gtkwrapbox.h			\
 	gtkhwrapbox.c			\
diff --git a/app/display/gimpwindowstrategy.c b/app/widgets/gimpwindowstrategy.c
similarity index 95%
rename from app/display/gimpwindowstrategy.c
rename to app/widgets/gimpwindowstrategy.c
index c53f33a..e29dfde 100644
--- a/app/display/gimpwindowstrategy.c
+++ b/app/widgets/gimpwindowstrategy.c
@@ -22,12 +22,12 @@
 
 #include <gtk/gtk.h>
 
-#include "display-types.h"
+#include "widgets-types.h"
 
 #include "gimpwindowstrategy.h"
 
 
-static void   gimp_window_strategy_iface_base_init   (GimpWindowStrategyInterface *strategy_iface);
+static void   gimp_window_strategy_iface_base_init (GimpWindowStrategyInterface *strategy_iface);
 
 
 GType
@@ -88,4 +88,3 @@ gimp_window_strategy_show_dockable_dialog (GimpWindowStrategy *strategy,
 
   return NULL;
 }
-
diff --git a/app/display/gimpwindowstrategy.h b/app/widgets/gimpwindowstrategy.h
similarity index 100%
rename from app/display/gimpwindowstrategy.h
rename to app/widgets/gimpwindowstrategy.h
diff --git a/app/widgets/widgets-types.h b/app/widgets/widgets-types.h
index 36a88e1..0df8469 100644
--- a/app/widgets/widgets-types.h
+++ b/app/widgets/widgets-types.h
@@ -235,6 +235,7 @@ typedef struct _GimpCellRendererViewable     GimpCellRendererViewable;
 typedef struct _GimpDialogFactory            GimpDialogFactory;
 typedef struct _GimpTextBuffer               GimpTextBuffer;
 typedef struct _GimpUIConfigurer             GimpUIConfigurer;
+typedef struct _GimpWindowStrategy           GimpWindowStrategy;
 
 
 /*  session management objects and structs  */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]