Initialize image->bits_per_pixel from the drawable, not from the root

2001-07-26  Alex Larsson  <alexl@redhat.com>

	* gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image):
	Initialize image->bits_per_pixel from the drawable, not from
	the root window.

	* gdk/linux-fb/gdkdrawable-fb2.c (gdk_fb_get_depth):
	Fix cast. argument is an IMPL already.

diff --git a/ChangeLog b/ChangeLog
index 726bb5e78685bb4918ee1edbb277c3f1ea9fda03..272b4ddcb56a900812b3c28243fb8b356a308675 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-07-26  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image):
+       Initialize image->bits_per_pixel from the drawable, not from
+       the root window.
+
+       * gdk/linux-fb/gdkdrawable-fb2.c (gdk_fb_get_depth):
+       Fix cast. argument is an IMPL already.
+
 2001-07-15  James Henstridge  <james@daa.com.au>
 
        * gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 726bb5e78685bb4918ee1edbb277c3f1ea9fda03..272b4ddcb56a900812b3c28243fb8b356a308675 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+2001-07-26  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image):
+       Initialize image->bits_per_pixel from the drawable, not from
+       the root window.
+
+       * gdk/linux-fb/gdkdrawable-fb2.c (gdk_fb_get_depth):
+       Fix cast. argument is an IMPL already.
+
 2001-07-15  James Henstridge  <james@daa.com.au>
 
        * gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 726bb5e78685bb4918ee1edbb277c3f1ea9fda03..272b4ddcb56a900812b3c28243fb8b356a308675 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2001-07-26  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image):
+       Initialize image->bits_per_pixel from the drawable, not from
+       the root window.
+
+       * gdk/linux-fb/gdkdrawable-fb2.c (gdk_fb_get_depth):
+       Fix cast. argument is an IMPL already.
+
 2001-07-15  James Henstridge  <james@daa.com.au>
 
        * gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 726bb5e78685bb4918ee1edbb277c3f1ea9fda03..272b4ddcb56a900812b3c28243fb8b356a308675 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+2001-07-26  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image):
+       Initialize image->bits_per_pixel from the drawable, not from
+       the root window.
+
+       * gdk/linux-fb/gdkdrawable-fb2.c (gdk_fb_get_depth):
+       Fix cast. argument is an IMPL already.
+
 2001-07-15  James Henstridge  <james@daa.com.au>
 
        * gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 726bb5e78685bb4918ee1edbb277c3f1ea9fda03..272b4ddcb56a900812b3c28243fb8b356a308675 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+2001-07-26  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image):
+       Initialize image->bits_per_pixel from the drawable, not from
+       the root window.
+
+       * gdk/linux-fb/gdkdrawable-fb2.c (gdk_fb_get_depth):
+       Fix cast. argument is an IMPL already.
+
 2001-07-15  James Henstridge  <james@daa.com.au>
 
        * gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 726bb5e78685bb4918ee1edbb277c3f1ea9fda03..272b4ddcb56a900812b3c28243fb8b356a308675 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2001-07-26  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image):
+       Initialize image->bits_per_pixel from the drawable, not from
+       the root window.
+
+       * gdk/linux-fb/gdkdrawable-fb2.c (gdk_fb_get_depth):
+       Fix cast. argument is an IMPL already.
+
 2001-07-15  James Henstridge  <james@daa.com.au>
 
        * gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 726bb5e78685bb4918ee1edbb277c3f1ea9fda03..272b4ddcb56a900812b3c28243fb8b356a308675 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2001-07-26  Alex Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image):
+       Initialize image->bits_per_pixel from the drawable, not from
+       the root window.
+
+       * gdk/linux-fb/gdkdrawable-fb2.c (gdk_fb_get_depth):
+       Fix cast. argument is an IMPL already.
+
 2001-07-15  James Henstridge  <james@daa.com.au>
 
        * gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.

diff --git a/gdk/linux-fb/gdkdrawable-fb2.c b/gdk/linux-fb/gdkdrawable-fb2.c
index 5df25c3be6331234abd7a8499f8187c3bf809335..471ced65d57ca86ad1efaa3106f138af34653b5d 100644 (file)
--- a/gdk/linux-fb/gdkdrawable-fb2.c
+++ b/gdk/linux-fb/gdkdrawable-fb2.c
@@ -1304,7 +1304,7 @@ gdk_fb_draw_image (GdkDrawable *drawable,
 static gint
 gdk_fb_get_depth (GdkDrawable *drawable)
 {
-  return GDK_DRAWABLE_IMPL_FBDATA (drawable)->depth;
+  return GDK_DRAWABLE_FBDATA (drawable)->depth;
 }
 
 static GdkVisual*

diff --git a/gdk/linux-fb/gdkimage-fb.c b/gdk/linux-fb/gdkimage-fb.c
index a698f11a4b40d1e8d6e5dd663902f198f1a9b3fe..10609fa001fa84e36275d78270d6817f47773be9 100644 (file)
--- a/gdk/linux-fb/gdkimage-fb.c
+++ b/gdk/linux-fb/gdkimage-fb.c
@@ -184,7 +184,7 @@ _gdk_fb_get_image (GdkDrawable *drawable,
   image->visual = gdk_drawable_get_visual (drawable);
   image->width = width;
   image->height = height;
-  image->bits_per_pixel = GDK_DRAWABLE_IMPL_FBDATA (gdk_parent_root)->depth;
+  image->bits_per_pixel = GDK_DRAWABLE_FBDATA (drawable)->depth;
   image->depth = image->bits_per_pixel;
 
   if (image->bits_per_pixel <= 8)