From 9ff27f0f4c5780707bd0b70d37983453d8b98dea Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 9 Feb 2002 01:29:14 +0000 Subject: [PATCH] Fix problem with string-valued parameters (#70012, Johan Dahlin.) Fri Feb 8 20:24:58 2002 Owen Taylor * gtk/gtkbindings.c (binding_compose_params): Fix problem with string-valued parameters (#70012, Johan Dahlin.) * gtk/gtkentry.c (gtk_entry_delete_whitespace): Fix white space deletion. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/Makefile.am | 8 +++++++- gtk/gtkbindings.c | 2 +- gtk/gtkentry.c | 2 +- 10 files changed, 72 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9fc3db38e7..8ceaed0b54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri Feb 8 20:24:58 2002 Owen Taylor + + + * gtk/gtkbindings.c (binding_compose_params): Fix problem + with string-valued parameters (#70012, Johan Dahlin.) + + * gtk/gtkentry.c (gtk_entry_delete_whitespace): Fix + white space deletion. + Fri Feb 8 21:25:56 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): fix diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9fc3db38e7..8ceaed0b54 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Fri Feb 8 20:24:58 2002 Owen Taylor + + + * gtk/gtkbindings.c (binding_compose_params): Fix problem + with string-valued parameters (#70012, Johan Dahlin.) + + * gtk/gtkentry.c (gtk_entry_delete_whitespace): Fix + white space deletion. + Fri Feb 8 21:25:56 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9fc3db38e7..8ceaed0b54 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Fri Feb 8 20:24:58 2002 Owen Taylor + + + * gtk/gtkbindings.c (binding_compose_params): Fix problem + with string-valued parameters (#70012, Johan Dahlin.) + + * gtk/gtkentry.c (gtk_entry_delete_whitespace): Fix + white space deletion. + Fri Feb 8 21:25:56 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): fix diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9fc3db38e7..8ceaed0b54 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Fri Feb 8 20:24:58 2002 Owen Taylor + + + * gtk/gtkbindings.c (binding_compose_params): Fix problem + with string-valued parameters (#70012, Johan Dahlin.) + + * gtk/gtkentry.c (gtk_entry_delete_whitespace): Fix + white space deletion. + Fri Feb 8 21:25:56 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9fc3db38e7..8ceaed0b54 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Fri Feb 8 20:24:58 2002 Owen Taylor + + + * gtk/gtkbindings.c (binding_compose_params): Fix problem + with string-valued parameters (#70012, Johan Dahlin.) + + * gtk/gtkentry.c (gtk_entry_delete_whitespace): Fix + white space deletion. + Fri Feb 8 21:25:56 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9fc3db38e7..8ceaed0b54 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Fri Feb 8 20:24:58 2002 Owen Taylor + + + * gtk/gtkbindings.c (binding_compose_params): Fix problem + with string-valued parameters (#70012, Johan Dahlin.) + + * gtk/gtkentry.c (gtk_entry_delete_whitespace): Fix + white space deletion. + Fri Feb 8 21:25:56 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9fc3db38e7..8ceaed0b54 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Fri Feb 8 20:24:58 2002 Owen Taylor + + + * gtk/gtkbindings.c (binding_compose_params): Fix problem + with string-valued parameters (#70012, Johan Dahlin.) + + * gtk/gtkentry.c (gtk_entry_delete_whitespace): Fix + white space deletion. + Fri Feb 8 21:25:56 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_deleted): fix diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 50e0a421fe..8299e45a16 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -580,10 +580,14 @@ libgtk_target_ldflags = $(gtk_win32_symbols) -lwsock32 endif EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-linux-fb-1.3.la libgtk-win32-1.3.la -# Install a RC file for the default GTK+ theme +# Install a RC file for the default GTK+ theme, and key themes install-data-local: install-ms-lib install-libtool-import-lib $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0 $(INSTALL) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc + $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key + $(INSTALL) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc + $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key + $(INSTALL) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc @@ -627,6 +631,8 @@ EXTRA_DIST += @STRIP_BEGIN@ \ gtk-win32.rc \ gtk-win32.rc.in \ gtkrc.default \ + gtkrc.key.default \ + gtkrc.key.emacs \ makefile.mingw \ makefile.mingw.in \ makefile.msc \ diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c index 626bdd6eb4..676ff3ed8d 100644 --- a/gtk/gtkbindings.c +++ b/gtk/gtkbindings.c @@ -350,7 +350,7 @@ binding_compose_params (GtkObject *object, else { g_value_init (&tmp_value, G_TYPE_STRING); - g_value_set_static_string (params, args->d.string_data); + g_value_set_static_string (&tmp_value, args->d.string_data); } break; default: diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 23729f0003..c836371776 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -3091,7 +3091,7 @@ gtk_entry_delete_whitespace (GtkEntry *entry) while (start > 0 && log_attrs[start-1].is_white) start--; - while (end < n_attrs && log_attrs[start-1].is_white) + while (end < n_attrs && log_attrs[end].is_white) end++; g_free (log_attrs);