gimp r27588 - in trunk: . app/display

[martinn svn gnome org]

Author: martinn
Date: Sun Nov  9 20:01:44 2008
New Revision: 27588
URL: http://svn.gnome.org/viewvc/gimp?rev=27588&view=rev

Log:
* app/display/gimpnavigationeditor.c: Clean up and simplify
little.


Modified:
   trunk/ChangeLog
   trunk/app/display/gimpnavigationeditor.c

Modified: trunk/app/display/gimpnavigationeditor.c
==============================================================================
--- trunk/app/display/gimpnavigationeditor.c	(original)
+++ trunk/app/display/gimpnavigationeditor.c	Sun Nov  9 20:01:44 2008
@@ -161,7 +161,7 @@
 }
 
 static void
-gimp_navigation_editor_context_changed (GimpContext          *context,
+gimp_navigation_editor_display_changed (GimpContext          *context,
                                         GimpDisplay          *display,
                                         GimpNavigationEditor *editor)
 {
@@ -179,21 +179,20 @@
 {
   GimpNavigationEditor *editor  = GIMP_NAVIGATION_EDITOR (docked);
   GimpDisplay          *display = NULL;
-  GimpDisplayShell     *shell   = NULL;
 
   if (editor->context)
     {
       g_signal_handlers_disconnect_by_func (editor->context,
-                                            gimp_navigation_editor_context_changed,
+                                            gimp_navigation_editor_display_changed,
                                             editor);
     }
 
   editor->context = context;
 
-  if (context)
+  if (editor->context)
     {
       g_signal_connect (context, "display-changed",
-                        G_CALLBACK (gimp_navigation_editor_context_changed),
+                        G_CALLBACK (gimp_navigation_editor_display_changed),
                         editor);
 
       display = gimp_context_get_display (context);
@@ -202,10 +201,9 @@
   gimp_view_renderer_set_context (GIMP_VIEW (editor->view)->renderer,
                                   context);
 
-  if (display)
-    shell = GIMP_DISPLAY_SHELL (display->shell);
-
-  gimp_navigation_editor_set_shell (editor, shell);
+  gimp_navigation_editor_display_changed (editor->context,
+                                          display,
+                                          editor);
 }