From 58bfca360d6a94a6aa5c02987e1fef3439b0cdc3 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Mon, 9 Apr 2001 17:03:55 +0000 Subject: [PATCH] increment version to 1.3.4 (binary 0, interface 0). Mon Apr 9 18:57:44 2001 Tim Janik * configure.in: increment version to 1.3.4 (binary 0, interface 0). Mon Apr 9 18:56:15 2001 Tim Janik * gclosure.c (g_closure_invoke): only require marshal/meta_marshal if we're valid (about to actually do marshalling). --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-12 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ configure.in | 2 +- gobject/ChangeLog | 5 +++++ gobject/gclosure.c | 3 ++- 11 files changed, 40 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90b6e86..9da2643 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Apr 9 18:57:44 2001 Tim Janik + + * configure.in: increment version to 1.3.4 (binary 0, interface 0). + 2001-04-05 Christian Rose * configure.in: Added sv to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 90b6e86..9da2643 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +Mon Apr 9 18:57:44 2001 Tim Janik + + * configure.in: increment version to 1.3.4 (binary 0, interface 0). + 2001-04-05 Christian Rose * configure.in: Added sv to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 90b6e86..9da2643 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +Mon Apr 9 18:57:44 2001 Tim Janik + + * configure.in: increment version to 1.3.4 (binary 0, interface 0). + 2001-04-05 Christian Rose * configure.in: Added sv to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 90b6e86..9da2643 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +Mon Apr 9 18:57:44 2001 Tim Janik + + * configure.in: increment version to 1.3.4 (binary 0, interface 0). + 2001-04-05 Christian Rose * configure.in: Added sv to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 90b6e86..9da2643 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +Mon Apr 9 18:57:44 2001 Tim Janik + + * configure.in: increment version to 1.3.4 (binary 0, interface 0). + 2001-04-05 Christian Rose * configure.in: Added sv to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 90b6e86..9da2643 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +Mon Apr 9 18:57:44 2001 Tim Janik + + * configure.in: increment version to 1.3.4 (binary 0, interface 0). + 2001-04-05 Christian Rose * configure.in: Added sv to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 90b6e86..9da2643 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +Mon Apr 9 18:57:44 2001 Tim Janik + + * configure.in: increment version to 1.3.4 (binary 0, interface 0). + 2001-04-05 Christian Rose * configure.in: Added sv to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 90b6e86..9da2643 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +Mon Apr 9 18:57:44 2001 Tim Janik + + * configure.in: increment version to 1.3.4 (binary 0, interface 0). + 2001-04-05 Christian Rose * configure.in: Added sv to ALL_LINGUAS. diff --git a/configure.in b/configure.in index 37fb5aa..a2861c1 100644 --- a/configure.in +++ b/configure.in @@ -31,7 +31,7 @@ GLIB_AC_DIVERT_BEFORE_HELP([ # GLIB_MAJOR_VERSION=1 GLIB_MINOR_VERSION=3 -GLIB_MICRO_VERSION=3 +GLIB_MICRO_VERSION=4 GLIB_INTERFACE_AGE=0 GLIB_BINARY_AGE=0 GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 5b1d244..1a4ef23 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 9 18:56:15 2001 Tim Janik + + * gclosure.c (g_closure_invoke): only require marshal/meta_marshal if + we're valid (about to actually do marshalling). + Tue Apr 3 20:23:24 2001 Tim Janik * NEWS: updates. diff --git a/gobject/gclosure.c b/gobject/gclosure.c index 79aa66c..532e73d 100644 --- a/gobject/gclosure.c +++ b/gobject/gclosure.c @@ -410,7 +410,6 @@ g_closure_invoke (GClosure *closure, gpointer invocation_hint) { g_return_if_fail (closure != NULL); - g_return_if_fail (closure->marshal || closure->meta_marshal); if (!closure->is_invalid) { @@ -418,6 +417,8 @@ g_closure_invoke (GClosure *closure, gpointer marshal_data; gboolean in_marshal = closure->in_marshal; + g_return_if_fail (closure->marshal || closure->meta_marshal); + closure->ref_count += 1; /* preserve floating flag */ closure->in_marshal = TRUE; if (closure->meta_marshal) -- 2.7.4