From 26a67305472e9476f2ba41ce5f0cc4951b99b572 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 6 May 2002 20:08:17 +0000 Subject: [PATCH] [ merged from stable ] Mon May 6 16:06:23 2002 Owen Taylor [ merged from stable ] * gobject.c: Remove PROPERTIES_CHANGED enumeration value that wasn't used any more. (#78833, Matthias Clasen) * gboxed.c (g_boxed_copy): Remove check on data[2] that no longer exists. (#80814, Daniel Elstner) --- gobject/ChangeLog | 11 +++++++++++ gobject/gboxed.c | 7 +++---- gobject/gobject.c | 1 - 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 2f79d008..5b75491e 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,14 @@ +Mon May 6 16:06:23 2002 Owen Taylor + + [ merged from stable ] + + * gobject.c: Remove PROPERTIES_CHANGED enumeration + value that wasn't used any more. (#78833, + Matthias Clasen) + + * gboxed.c (g_boxed_copy): Remove check on data[2] + that no longer exists. (#80814, Daniel Elstner) + Tue Mar 26 15:21:47 2002 Owen Taylor * gsignal.h (g_signal_handlers_*_by_func): Add explicit diff --git a/gobject/gboxed.c b/gobject/gboxed.c index a78b5434..a16b359e 100644 --- a/gobject/gboxed.c +++ b/gobject/gboxed.c @@ -355,7 +355,7 @@ g_boxed_copy (GType boxed_type, { GValue src_value, dest_value; - /* we heavil rely on third-party boxed type value vtable + /* we heavily rely on third-party boxed type value vtable * implementations to follow normal boxed value storage * (data[0].v_pointer is the boxed struct, and * data[1].v_uint holds the G_VALUE_NOCOPY_CONTENTS flag, @@ -370,13 +370,12 @@ g_boxed_copy (GType boxed_type, src_value.data[0].v_pointer = (gpointer) src_boxed; src_value.data[1].v_uint = G_VALUE_NOCOPY_CONTENTS; - /* call third-party code copy fucntion, fingers-crossed */ + /* call third-party code copy function, fingers-crossed */ value_meminit (&dest_value, boxed_type); value_table->value_copy (&src_value, &dest_value); /* double check and grouse if things went wrong */ - if (dest_value.data[1].v_ulong || - dest_value.data[2].v_ulong) + if (dest_value.data[1].v_ulong) g_warning ("the copy_value() implementation of type `%s' seems to make use of reserved GValue fields", g_type_name (boxed_type)); diff --git a/gobject/gobject.c b/gobject/gobject.c index 624838ed..7edd8f0d 100644 --- a/gobject/gobject.c +++ b/gobject/gobject.c @@ -41,7 +41,6 @@ /* --- signals --- */ enum { - PROPERTIES_CHANGED, NOTIFY, LAST_SIGNAL }; -- 2.34.1