[gimp] Move the window part of gimp_display_shell_fill() to GimpImageWindow
- From: Michael Natterer <mitch src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gimp] Move the window part of gimp_display_shell_fill() to GimpImageWindow
- Date: Tue, 29 Sep 2009 18:38:19 +0000 (UTC)
commit 9c5e44c566791a445dfb3eae300b560a38b8610f
Author: Michael Natterer <mitch gimp org>
Date: Fri Sep 25 02:03:30 2009 +0200
Move the window part of gimp_display_shell_fill() to GimpImageWindow
app/display/gimpdisplayshell.c | 6 ------
app/display/gimpimagewindow.c | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index 5010c75..511dade 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -1353,16 +1353,10 @@ gimp_display_shell_fill (GimpDisplayShell *shell,
g_return_if_fail (GIMP_IS_DISPLAY (shell->display));
g_return_if_fail (GIMP_IS_IMAGE (image));
- gimp_dialog_factory_remove_dialog (shell->display_factory,
- GTK_WIDGET (shell));
-
gimp_display_shell_set_unit (shell, unit);
gimp_display_shell_set_initial_scale (shell, scale, NULL, NULL);
gimp_display_shell_scale_changed (shell);
- /* FIXME image window */
- gimp_statusbar_fill (GIMP_STATUSBAR (GIMP_IMAGE_WINDOW (shell)->statusbar));
-
gimp_display_shell_sync_config (shell, shell->display->config);
gimp_display_shell_appearance_update (shell);
diff --git a/app/display/gimpimagewindow.c b/app/display/gimpimagewindow.c
index 300a36f..3d1bfc7 100644
--- a/app/display/gimpimagewindow.c
+++ b/app/display/gimpimagewindow.c
@@ -510,6 +510,12 @@ gimp_image_window_image_notify (GimpDisplay *display,
{
if (display->image)
{
+ /* FIXME don't run this code for revert */
+
+ gimp_dialog_factory_remove_dialog (window->display_factory,
+ GTK_WIDGET (window));
+
+ gimp_statusbar_fill (GIMP_STATUSBAR (window->statusbar));
}
else
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]