Fix silly bug, noticed by Sven Neumann.

2002-04-29  Alex Larsson  <alexl@redhat.com>

	* gdk/linux-fb/gdkproperty-fb.c (gdk_property_get):
	Fix silly bug, noticed by Sven Neumann.

diff --git a/ChangeLog b/ChangeLog
index c7391e87462ce1064e39ce1ea017cf75bec8600b..338629a6b658c5b257c747afcd170175bb12c5a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-29  Alex Larsson  <alexl@redhat.com>
+
+       * 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  <jrb@gnome.org>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c7391e87462ce1064e39ce1ea017cf75bec8600b..338629a6b658c5b257c747afcd170175bb12c5a5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-04-29  Alex Larsson  <alexl@redhat.com>
+
+       * 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  <jrb@gnome.org>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c7391e87462ce1064e39ce1ea017cf75bec8600b..338629a6b658c5b257c747afcd170175bb12c5a5 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-04-29  Alex Larsson  <alexl@redhat.com>
+
+       * 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  <jrb@gnome.org>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c7391e87462ce1064e39ce1ea017cf75bec8600b..338629a6b658c5b257c747afcd170175bb12c5a5 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-04-29  Alex Larsson  <alexl@redhat.com>
+
+       * 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  <jrb@gnome.org>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c7391e87462ce1064e39ce1ea017cf75bec8600b..338629a6b658c5b257c747afcd170175bb12c5a5 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-04-29  Alex Larsson  <alexl@redhat.com>
+
+       * 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  <jrb@gnome.org>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c7391e87462ce1064e39ce1ea017cf75bec8600b..338629a6b658c5b257c747afcd170175bb12c5a5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-04-29  Alex Larsson  <alexl@redhat.com>
+
+       * 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  <jrb@gnome.org>
 
        * 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 70c3fb82221c124acc53be4fe495c0142dd28eb9..28c604e5a93f5f417fb32895d99c55be6fb999f4 100644 (file)
--- 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