From bc25b9b250976f90331b8488745e3abd2a23ae07 Mon Sep 17 00:00:00 2001 From: Alex Larsson Date: Mon, 29 Apr 2002 14:41:04 +0000 Subject: [PATCH] Fix silly bug, noticed by Sven Neumann. 2002-04-29 Alex Larsson * gdk/linux-fb/gdkproperty-fb.c (gdk_property_get): Fix silly bug, noticed by Sven Neumann. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/linux-fb/gdkproperty-fb.c | 2 +- 7 files changed, 31 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c7391e8746..338629a6b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-04-29 Alex Larsson + + * gdk/linux-fb/gdkproperty-fb.c (gdk_property_get): + Fix silly bug, noticed by Sven Neumann. + Sun Apr 28 22:43:55 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c7391e8746..338629a6b6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-04-29 Alex Larsson + + * gdk/linux-fb/gdkproperty-fb.c (gdk_property_get): + Fix silly bug, noticed by Sven Neumann. + Sun Apr 28 22:43:55 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c7391e8746..338629a6b6 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-04-29 Alex Larsson + + * gdk/linux-fb/gdkproperty-fb.c (gdk_property_get): + Fix silly bug, noticed by Sven Neumann. + Sun Apr 28 22:43:55 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c7391e8746..338629a6b6 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-04-29 Alex Larsson + + * gdk/linux-fb/gdkproperty-fb.c (gdk_property_get): + Fix silly bug, noticed by Sven Neumann. + Sun Apr 28 22:43:55 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c7391e8746..338629a6b6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-04-29 Alex Larsson + + * gdk/linux-fb/gdkproperty-fb.c (gdk_property_get): + Fix silly bug, noticed by Sven Neumann. + Sun Apr 28 22:43:55 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c7391e8746..338629a6b6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-04-29 Alex Larsson + + * gdk/linux-fb/gdkproperty-fb.c (gdk_property_get): + Fix silly bug, noticed by Sven Neumann. + Sun Apr 28 22:43:55 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix diff --git a/gdk/linux-fb/gdkproperty-fb.c b/gdk/linux-fb/gdkproperty-fb.c index 70c3fb8222..28c604e5a9 100644 --- a/gdk/linux-fb/gdkproperty-fb.c +++ b/gdk/linux-fb/gdkproperty-fb.c @@ -177,7 +177,7 @@ gdk_property_get (GdkWindow *window, if (nbytes > 0) { *data = g_malloc (nbytes+1); - memcpy (data, prop->data + offset, nbytes); + memcpy (*data, prop->data + offset, nbytes); (*data)[nbytes] = 0; } else