From eb56320d4e66c888a4750f0464d906bb3d916666 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 1 Dec 2008 03:41:00 +0000 Subject: [PATCH] Revert an accidental change svn path=/trunk/; revision=21837 --- ChangeLog | 5 +++++ gtk/gtkentry.c | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4dfa9959cb..da3dc64897 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-12-01 Matthisa Clasen + + * gtk/gtkentry.c: Revert an accidental change that sneaked + in with the last commit. + 2008-12-01 Paul Bolle Bug 562817 – GtkDialog: typo diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 4f55c4804c..b838ac4d07 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -333,6 +333,7 @@ static void gtk_entry_get_cursor_locations (GtkEntry *entry, CursorType type, gint *strong_x, gint *weak_x); +static void gtk_entry_adjust_scroll (GtkEntry *entry); static gint gtk_entry_move_visually (GtkEntry *editable, gint start, gint count); @@ -1479,7 +1480,7 @@ gtk_entry_realize (GtkWidget *widget) gtk_im_context_set_client_window (entry->im_context, entry->text_area); - _gtk_entry_adjust_scroll (entry); + gtk_entry_adjust_scroll (entry); gtk_entry_update_primary_selection (entry); } @@ -3441,7 +3442,7 @@ recompute_idle_func (gpointer data) if (gtk_widget_has_screen (GTK_WIDGET (entry))) { - _gtk_entry_adjust_scroll (entry); + gtk_entry_adjust_scroll (entry); gtk_entry_queue_draw (entry); update_im_cursor_location (entry); @@ -4041,8 +4042,8 @@ gtk_entry_get_cursor_locations (GtkEntry *entry, } } -void -_gtk_entry_adjust_scroll (GtkEntry *entry) +static void +gtk_entry_adjust_scroll (GtkEntry *entry) { GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry); gint min_offset, max_offset;