[gimp] app: remove gimp_display_shell_update_scrollbars_and_rulers()

[Michael Natterer <mitch src gnome org>]

commit afddcce4e5a05250286da85af0db3cc3b11daf1c
Author: Michael Natterer <mitch gimp org>
Date:   Thu Apr 18 18:45:55 2013 +0200

    app: remove gimp_display_shell_update_scrollbars_and_rulers()
    
    and move its two statements to its two callers.

 app/display/gimpdisplayshell-scale.c  | 14 --------------
 app/display/gimpdisplayshell-scale.h  |  1 -
 app/display/gimpdisplayshell-scroll.c |  7 +++++--
 3 files changed, 5 insertions(+), 17 deletions(-)
---
diff --git a/app/display/gimpdisplayshell-scale.c b/app/display/gimpdisplayshell-scale.c
index 5fd2292..8ce8ab8 100644
--- a/app/display/gimpdisplayshell-scale.c
+++ b/app/display/gimpdisplayshell-scale.c
@@ -86,20 +86,6 @@ static void      gimp_display_shell_scale_get_zoom_focus (GimpDisplayShell *shel
 /*  public functions  */
 
 /**
- * gimp_display_shell_update_scrollbars_and_rulers:
- * @shell: the #GimpDisplayShell
- *
- **/
-void
-gimp_display_shell_update_scrollbars_and_rulers (GimpDisplayShell *shell)
-{
-  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
-
-  gimp_display_shell_scale_update_scrollbars (shell);
-  gimp_display_shell_scale_update_rulers (shell);
-}
-
-/**
  * gimp_display_shell_scale_update_scrollbars:
  * @shell:
  *
diff --git a/app/display/gimpdisplayshell-scale.h b/app/display/gimpdisplayshell-scale.h
index 50185dc..a654ffa 100644
--- a/app/display/gimpdisplayshell-scale.h
+++ b/app/display/gimpdisplayshell-scale.h
@@ -19,7 +19,6 @@
 #define __GIMP_DISPLAY_SHELL_SCALE_H__
 
 
-void     gimp_display_shell_update_scrollbars_and_rulers   (GimpDisplayShell *shell);
 void     gimp_display_shell_scale_update_scrollbars        (GimpDisplayShell *shell);
 void     gimp_display_shell_scale_update_rulers            (GimpDisplayShell *shell);
 
diff --git a/app/display/gimpdisplayshell-scroll.c b/app/display/gimpdisplayshell-scroll.c
index 4a2614f..1c4cce5 100644
--- a/app/display/gimpdisplayshell-scroll.c
+++ b/app/display/gimpdisplayshell-scroll.c
@@ -124,7 +124,8 @@ gimp_display_shell_scroll (GimpDisplayShell *shell,
                                -x_offset, -y_offset);
 
       /*  Update scrollbars and rulers  */
-      gimp_display_shell_update_scrollbars_and_rulers (shell);
+      gimp_display_shell_scale_update_scrollbars (shell);
+      gimp_display_shell_scale_update_rulers (shell);
 
       gimp_display_shell_resume (shell);
 
@@ -258,7 +259,9 @@ void
 gimp_display_shell_scroll_clamp_and_update (GimpDisplayShell *shell)
 {
   gimp_display_shell_scroll_clamp_offsets (shell);
-  gimp_display_shell_update_scrollbars_and_rulers (shell);
+
+  gimp_display_shell_scale_update_scrollbars (shell);
+  gimp_display_shell_scale_update_rulers (shell);
 }
 
 /**