From 94bd00e457099cfa06793199887cfb89c21d4a18 Mon Sep 17 00:00:00 2001
From: Robert Ancell <rancell@src.gnome.org>
Date: Wed, 7 Nov 2007 03:16:32 +0000
Subject: [PATCH] Remove unused UI routines

svn path=/trunk/; revision=1810
---
 gcalctool/display.c   |  2 +-
 gcalctool/functions.c | 15 ---------------
 gcalctool/gtk.c       | 36 +++---------------------------------
 gcalctool/ui.h        |  3 ---
 4 files changed, 4 insertions(+), 52 deletions(-)

diff --git a/gcalctool/display.c b/gcalctool/display.c
index e4f725be..909a2e6a 100644
--- a/gcalctool/display.c
+++ b/gcalctool/display.c
@@ -608,7 +608,7 @@ refresh_display()
                         str_replace(&str, reg, reg_val);
                     }
                 }
-                ui_write_display(str);
+                ui_set_display(str, FALSE);
                 free(str);
                 v->ghost_zero = 0;
             } else {
diff --git a/gcalctool/functions.c b/gcalctool/functions.c
index 06c0b92d..dcbbf013 100644
--- a/gcalctool/functions.c
+++ b/gcalctool/functions.c
@@ -277,21 +277,6 @@ exp_append(char *text)
 }
 
 
-void
-exp_insert(char *text)
-{
-    // struct exprm_state *e;
-    // e = get_state();
-    // ui_write_display(e->expression);
-    if (v->ghost_zero) {
-        ui_write_display("");
-        v->ghost_zero = 0;
-    }
-    ui_insert_display(text);
-    ui_parse_display();
-}
-
-
 void 
 exp_del() 
 {
diff --git a/gcalctool/gtk.c b/gcalctool/gtk.c
index 79c73399..9a33edf1 100644
--- a/gcalctool/gtk.c
+++ b/gcalctool/gtk.c
@@ -875,10 +875,10 @@ ui_set_display(char *str, int minimize_changes)
     gint len1, len2;
     gboolean done;
 
-    if (str == NULL || *str == 0) {
+    if (str == NULL || str[0] == '\0') {
         str = " ";
     } else {
-        if (!v->noparens) {
+        if (v->noparens == 0) {
             localize_number(localized, str);
             str = localized;
         }
@@ -914,27 +914,6 @@ ui_set_display(char *str, int minimize_changes)
 }
 
 
-void
-ui_write_display(char *str)
-{
-    gchar *text;
-    GtkTextIter start, end;
-
-    if (str == NULL ) {
-        str = " ";
-    }
-
-    gtk_text_buffer_get_bounds(X->display_buffer, &start, &end);
-    text = gtk_text_buffer_get_text(X->display_buffer, &start, &end, TRUE);
-
-    gtk_text_buffer_delete(X->display_buffer, &start, &end);
-    
-    gtk_text_buffer_insert(X->display_buffer, &end, str, -1);
-    scroll_right();
-    g_free(text);
-}
-
-
 /* When an error condition occurs:
  *
  * - make insensitive all buttons except Clr.
@@ -1996,7 +1975,7 @@ check_for_localized_numeric_point(int keyval)
 }
 
 
-void
+static void
 ui_parse_display()
 {
     char *text;
@@ -2021,15 +2000,6 @@ ui_get_cursor(void)
 }
 
 
-void
-ui_insert_display(char *text)
-{
-    gtk_text_buffer_insert_at_cursor(X->display_buffer,
-                                     text,
-                                     strlen(text));
-}
-
-
 /*ARGSUSED*/
 static gboolean
 display_focus_out_cb(GtkWidget *widget, GdkEventKey *event)
diff --git a/gcalctool/ui.h b/gcalctool/ui.h
index 256c5d4b..1760b023 100644
--- a/gcalctool/ui.h
+++ b/gcalctool/ui.h
@@ -32,9 +32,6 @@ void ui_make_registers(void);
 void ui_set_undo_enabled(int, int);
 
 void ui_set_display(char *, int);
-void ui_write_display(char *); /* FIXME: What is the difference between ui_write_display() and ui_set_display() */
-void ui_insert_display(char *);
-void ui_parse_display(void);
 int ui_get_cursor(void);
 
 void ui_set_registers_visible(int);
-- 
2.11.4.GIT