summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog9
-rw-r--r--ChangeLog.pre-2-09
-rw-r--r--ChangeLog.pre-2-109
-rw-r--r--ChangeLog.pre-2-129
-rw-r--r--ChangeLog.pre-2-29
-rw-r--r--ChangeLog.pre-2-49
-rw-r--r--ChangeLog.pre-2-69
-rw-r--r--ChangeLog.pre-2-89
-rw-r--r--docs/reference/glib/tmpl/iochannels.sgml19
-rw-r--r--glib/ghash.c8
-rw-r--r--glib/giochannel.h1
11 files changed, 95 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 50e04eac9..1af9a15f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Aug 23 11:09:58 2001 Owen Taylor <otaylor@redhat.com>
+
+ * glib/ghash.c (g_hash_table_foreach_remove_or_steal):
+ Patch from Josh Pritikin to fix reversed key and value destroy
+ functions. (#59433)
+
+ * glib/giochannel.h (struct _GIOChannel): Mark structure
+ /*< private >*/
+
Thu Aug 23 16:14:17 2001 Tim Janik <timj@gtk.org>
* glib/gmacros.h (G_GNUC_NO_INSTRUMENT): new macro.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 50e04eac9..1af9a15f9 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Thu Aug 23 11:09:58 2001 Owen Taylor <otaylor@redhat.com>
+
+ * glib/ghash.c (g_hash_table_foreach_remove_or_steal):
+ Patch from Josh Pritikin to fix reversed key and value destroy
+ functions. (#59433)
+
+ * glib/giochannel.h (struct _GIOChannel): Mark structure
+ /*< private >*/
+
Thu Aug 23 16:14:17 2001 Tim Janik <timj@gtk.org>
* glib/gmacros.h (G_GNUC_NO_INSTRUMENT): new macro.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 50e04eac9..1af9a15f9 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Thu Aug 23 11:09:58 2001 Owen Taylor <otaylor@redhat.com>
+
+ * glib/ghash.c (g_hash_table_foreach_remove_or_steal):
+ Patch from Josh Pritikin to fix reversed key and value destroy
+ functions. (#59433)
+
+ * glib/giochannel.h (struct _GIOChannel): Mark structure
+ /*< private >*/
+
Thu Aug 23 16:14:17 2001 Tim Janik <timj@gtk.org>
* glib/gmacros.h (G_GNUC_NO_INSTRUMENT): new macro.
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 50e04eac9..1af9a15f9 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,12 @@
+Thu Aug 23 11:09:58 2001 Owen Taylor <otaylor@redhat.com>
+
+ * glib/ghash.c (g_hash_table_foreach_remove_or_steal):
+ Patch from Josh Pritikin to fix reversed key and value destroy
+ functions. (#59433)
+
+ * glib/giochannel.h (struct _GIOChannel): Mark structure
+ /*< private >*/
+
Thu Aug 23 16:14:17 2001 Tim Janik <timj@gtk.org>
* glib/gmacros.h (G_GNUC_NO_INSTRUMENT): new macro.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 50e04eac9..1af9a15f9 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Thu Aug 23 11:09:58 2001 Owen Taylor <otaylor@redhat.com>
+
+ * glib/ghash.c (g_hash_table_foreach_remove_or_steal):
+ Patch from Josh Pritikin to fix reversed key and value destroy
+ functions. (#59433)
+
+ * glib/giochannel.h (struct _GIOChannel): Mark structure
+ /*< private >*/
+
Thu Aug 23 16:14:17 2001 Tim Janik <timj@gtk.org>
* glib/gmacros.h (G_GNUC_NO_INSTRUMENT): new macro.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 50e04eac9..1af9a15f9 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Thu Aug 23 11:09:58 2001 Owen Taylor <otaylor@redhat.com>
+
+ * glib/ghash.c (g_hash_table_foreach_remove_or_steal):
+ Patch from Josh Pritikin to fix reversed key and value destroy
+ functions. (#59433)
+
+ * glib/giochannel.h (struct _GIOChannel): Mark structure
+ /*< private >*/
+
Thu Aug 23 16:14:17 2001 Tim Janik <timj@gtk.org>
* glib/gmacros.h (G_GNUC_NO_INSTRUMENT): new macro.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 50e04eac9..1af9a15f9 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Thu Aug 23 11:09:58 2001 Owen Taylor <otaylor@redhat.com>
+
+ * glib/ghash.c (g_hash_table_foreach_remove_or_steal):
+ Patch from Josh Pritikin to fix reversed key and value destroy
+ functions. (#59433)
+
+ * glib/giochannel.h (struct _GIOChannel): Mark structure
+ /*< private >*/
+
Thu Aug 23 16:14:17 2001 Tim Janik <timj@gtk.org>
* glib/gmacros.h (G_GNUC_NO_INSTRUMENT): new macro.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 50e04eac9..1af9a15f9 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Thu Aug 23 11:09:58 2001 Owen Taylor <otaylor@redhat.com>
+
+ * glib/ghash.c (g_hash_table_foreach_remove_or_steal):
+ Patch from Josh Pritikin to fix reversed key and value destroy
+ functions. (#59433)
+
+ * glib/giochannel.h (struct _GIOChannel): Mark structure
+ /*< private >*/
+
Thu Aug 23 16:14:17 2001 Tim Janik <timj@gtk.org>
* glib/gmacros.h (G_GNUC_NO_INSTRUMENT): new macro.
diff --git a/docs/reference/glib/tmpl/iochannels.sgml b/docs/reference/glib/tmpl/iochannels.sgml
index a4286a0df..4a6c86480 100644
--- a/docs/reference/glib/tmpl/iochannels.sgml
+++ b/docs/reference/glib/tmpl/iochannels.sgml
@@ -77,7 +77,6 @@ A data structure representing an IO Channel. The fields should be considered
private and should only be accessed with the following functions.
</para>
-@close_on_unref:
<!-- ##### FUNCTION g_io_channel_unix_new ##### -->
<para>
@@ -584,6 +583,24 @@ generic way.
@Returns:
+<!-- ##### FUNCTION g_io_channel_get_close_on_unref ##### -->
+<para>
+
+</para>
+
+@channel:
+@Returns:
+
+
+<!-- ##### FUNCTION g_io_channel_set_close_on_unref ##### -->
+<para>
+
+</para>
+
+@channel:
+@do_close:
+
+
<!-- ##### FUNCTION g_io_channel_read ##### -->
<para>
</para>
diff --git a/glib/ghash.c b/glib/ghash.c
index 28bc1c3e8..40be7d391 100644
--- a/glib/ghash.c
+++ b/glib/ghash.c
@@ -509,16 +509,16 @@ g_hash_table_foreach_remove_or_steal (GHashTable *hash_table,
{
prev->next = node->next;
g_hash_node_destroy (node,
- notify ? hash_table->value_destroy_func : NULL,
- notify ? hash_table->key_destroy_func : NULL);
+ notify ? hash_table->key_destroy_func : NULL,
+ notify ? hash_table->value_destroy_func : NULL);
node = prev;
}
else
{
hash_table->nodes[i] = node->next;
g_hash_node_destroy (node,
- notify ? hash_table->value_destroy_func : NULL,
- notify ? hash_table->key_destroy_func : NULL);
+ notify ? hash_table->key_destroy_func : NULL,
+ notify ? hash_table->value_destroy_func : NULL);
goto restart;
}
}
diff --git a/glib/giochannel.h b/glib/giochannel.h
index a84670c32..9abd5112c 100644
--- a/glib/giochannel.h
+++ b/glib/giochannel.h
@@ -103,6 +103,7 @@ typedef enum
struct _GIOChannel
{
+ /*< private >*/
guint ref_count;
GIOFuncs *funcs;
View Lorry Controller Status