From 774de16743f776439d756f92fc3ee3cf75a6ca76 Mon Sep 17 00:00:00 2001 From: Robert Brady Date: Sat, 28 Oct 2000 02:27:44 +0000 Subject: [PATCH] And fix the marshaller for GtkTextView::delete. --- ChangeLog | 4 ++-- ChangeLog.pre-2-0 | 4 ++-- ChangeLog.pre-2-10 | 4 ++-- ChangeLog.pre-2-2 | 4 ++-- ChangeLog.pre-2-4 | 4 ++-- ChangeLog.pre-2-6 | 4 ++-- ChangeLog.pre-2-8 | 4 ++-- gtk/gtkmarshal.list | 1 + gtk/gtkmarshalers.list | 1 + gtk/gtktextview.c | 2 +- 10 files changed, 17 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3abd82654f..8c5786bff0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,8 @@ Sat Oct 28 02:33:09 2000 Robert Brady - * gtk/gtkmarshal.list: add new marshaller for GtkTextView. + * gtk/gtkmarshal.list: add new marshallers for GtkTextView. - * gtk/gtktextview.c: Use correct marshaller. + * gtk/gtktextview.c: Use correct marshallers. Fri Oct 27 17:56:26 2000 Jonathan Blandford diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3abd82654f..8c5786bff0 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,8 +1,8 @@ Sat Oct 28 02:33:09 2000 Robert Brady - * gtk/gtkmarshal.list: add new marshaller for GtkTextView. + * gtk/gtkmarshal.list: add new marshallers for GtkTextView. - * gtk/gtktextview.c: Use correct marshaller. + * gtk/gtktextview.c: Use correct marshallers. Fri Oct 27 17:56:26 2000 Jonathan Blandford diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3abd82654f..8c5786bff0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,8 +1,8 @@ Sat Oct 28 02:33:09 2000 Robert Brady - * gtk/gtkmarshal.list: add new marshaller for GtkTextView. + * gtk/gtkmarshal.list: add new marshallers for GtkTextView. - * gtk/gtktextview.c: Use correct marshaller. + * gtk/gtktextview.c: Use correct marshallers. Fri Oct 27 17:56:26 2000 Jonathan Blandford diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3abd82654f..8c5786bff0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,8 +1,8 @@ Sat Oct 28 02:33:09 2000 Robert Brady - * gtk/gtkmarshal.list: add new marshaller for GtkTextView. + * gtk/gtkmarshal.list: add new marshallers for GtkTextView. - * gtk/gtktextview.c: Use correct marshaller. + * gtk/gtktextview.c: Use correct marshallers. Fri Oct 27 17:56:26 2000 Jonathan Blandford diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3abd82654f..8c5786bff0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,8 +1,8 @@ Sat Oct 28 02:33:09 2000 Robert Brady - * gtk/gtkmarshal.list: add new marshaller for GtkTextView. + * gtk/gtkmarshal.list: add new marshallers for GtkTextView. - * gtk/gtktextview.c: Use correct marshaller. + * gtk/gtktextview.c: Use correct marshallers. Fri Oct 27 17:56:26 2000 Jonathan Blandford diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3abd82654f..8c5786bff0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,8 +1,8 @@ Sat Oct 28 02:33:09 2000 Robert Brady - * gtk/gtkmarshal.list: add new marshaller for GtkTextView. + * gtk/gtkmarshal.list: add new marshallers for GtkTextView. - * gtk/gtktextview.c: Use correct marshaller. + * gtk/gtktextview.c: Use correct marshallers. Fri Oct 27 17:56:26 2000 Jonathan Blandford diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3abd82654f..8c5786bff0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,8 +1,8 @@ Sat Oct 28 02:33:09 2000 Robert Brady - * gtk/gtkmarshal.list: add new marshaller for GtkTextView. + * gtk/gtkmarshal.list: add new marshallers for GtkTextView. - * gtk/gtktextview.c: Use correct marshaller. + * gtk/gtktextview.c: Use correct marshallers. Fri Oct 27 17:56:26 2000 Jonathan Blandford diff --git a/gtk/gtkmarshal.list b/gtk/gtkmarshal.list index 711f0ce8d0..fe94981656 100644 --- a/gtk/gtkmarshal.list +++ b/gtk/gtkmarshal.list @@ -51,6 +51,7 @@ VOID:INT,INT,INT VOID:INT,INT,INT,INT VOID:INT,INT,POINTER VOID:OBJECT +VOID:ENUM,INT VOID:POINTER VOID:POINTER,BOOLEAN VOID:POINTER,INT diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list index 711f0ce8d0..fe94981656 100644 --- a/gtk/gtkmarshalers.list +++ b/gtk/gtkmarshalers.list @@ -51,6 +51,7 @@ VOID:INT,INT,INT VOID:INT,INT,INT,INT VOID:INT,INT,POINTER VOID:OBJECT +VOID:ENUM,INT VOID:POINTER VOID:POINTER,BOOLEAN VOID:POINTER,INT diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index bb4221bbca..5ead96e26f 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -407,7 +407,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass) GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTextViewClass, delete), - gtk_marshal_VOID__INT_INT, + gtk_marshal_VOID__ENUM_INT, GTK_TYPE_NONE, 2, GTK_TYPE_DELETE_TYPE, GTK_TYPE_INT); signals[CUT_CLIPBOARD] =