remove GDK_IMAGE_SHARED_PIXMAP from switch statements, since Tor removed

Fri Aug 25 12:16:15 2000  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkimage-x11.c: remove GDK_IMAGE_SHARED_PIXMAP
	from switch statements, since Tor removed the enumeration
	value.

	* gdk/x11/gdkimage-x11.c (gdk_image_get):
	s/GDK_IS_WINDOW/GDK_IS_DRAWABLE/.

diff --git a/ChangeLog b/ChangeLog
index c50a362921d805302602f74b9ce4b62006702a4b..af3a8f5709699c08d01871db4f039e34d3d87a14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Aug 25 12:16:15 2000  Owen Taylor  <otaylor@redhat.com>
+
+        * gdk/x11/gdkimage-x11.c: remove GDK_IMAGE_SHARED_PIXMAP
+       from switch statements, since Tor removed the enumeration
+       value.
+       
+       * gdk/x11/gdkimage-x11.c (gdk_image_get): 
+       s/GDK_IS_WINDOW/GDK_IS_DRAWABLE/.
+
 2000-08-29 Elliot Lee <sopwith@redhat.com>
        * */*.h: Use G_GNUC_CONST.
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c50a362921d805302602f74b9ce4b62006702a4b..af3a8f5709699c08d01871db4f039e34d3d87a14 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Fri Aug 25 12:16:15 2000  Owen Taylor  <otaylor@redhat.com>
+
+        * gdk/x11/gdkimage-x11.c: remove GDK_IMAGE_SHARED_PIXMAP
+       from switch statements, since Tor removed the enumeration
+       value.
+       
+       * gdk/x11/gdkimage-x11.c (gdk_image_get): 
+       s/GDK_IS_WINDOW/GDK_IS_DRAWABLE/.
+
 2000-08-29 Elliot Lee <sopwith@redhat.com>
        * */*.h: Use G_GNUC_CONST.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c50a362921d805302602f74b9ce4b62006702a4b..af3a8f5709699c08d01871db4f039e34d3d87a14 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Fri Aug 25 12:16:15 2000  Owen Taylor  <otaylor@redhat.com>
+
+        * gdk/x11/gdkimage-x11.c: remove GDK_IMAGE_SHARED_PIXMAP
+       from switch statements, since Tor removed the enumeration
+       value.
+       
+       * gdk/x11/gdkimage-x11.c (gdk_image_get): 
+       s/GDK_IS_WINDOW/GDK_IS_DRAWABLE/.
+
 2000-08-29 Elliot Lee <sopwith@redhat.com>
        * */*.h: Use G_GNUC_CONST.
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c50a362921d805302602f74b9ce4b62006702a4b..af3a8f5709699c08d01871db4f039e34d3d87a14 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Fri Aug 25 12:16:15 2000  Owen Taylor  <otaylor@redhat.com>
+
+        * gdk/x11/gdkimage-x11.c: remove GDK_IMAGE_SHARED_PIXMAP
+       from switch statements, since Tor removed the enumeration
+       value.
+       
+       * gdk/x11/gdkimage-x11.c (gdk_image_get): 
+       s/GDK_IS_WINDOW/GDK_IS_DRAWABLE/.
+
 2000-08-29 Elliot Lee <sopwith@redhat.com>
        * */*.h: Use G_GNUC_CONST.
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c50a362921d805302602f74b9ce4b62006702a4b..af3a8f5709699c08d01871db4f039e34d3d87a14 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Fri Aug 25 12:16:15 2000  Owen Taylor  <otaylor@redhat.com>
+
+        * gdk/x11/gdkimage-x11.c: remove GDK_IMAGE_SHARED_PIXMAP
+       from switch statements, since Tor removed the enumeration
+       value.
+       
+       * gdk/x11/gdkimage-x11.c (gdk_image_get): 
+       s/GDK_IS_WINDOW/GDK_IS_DRAWABLE/.
+
 2000-08-29 Elliot Lee <sopwith@redhat.com>
        * */*.h: Use G_GNUC_CONST.
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c50a362921d805302602f74b9ce4b62006702a4b..af3a8f5709699c08d01871db4f039e34d3d87a14 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Fri Aug 25 12:16:15 2000  Owen Taylor  <otaylor@redhat.com>
+
+        * gdk/x11/gdkimage-x11.c: remove GDK_IMAGE_SHARED_PIXMAP
+       from switch statements, since Tor removed the enumeration
+       value.
+       
+       * gdk/x11/gdkimage-x11.c (gdk_image_get): 
+       s/GDK_IS_WINDOW/GDK_IS_DRAWABLE/.
+
 2000-08-29 Elliot Lee <sopwith@redhat.com>
        * */*.h: Use G_GNUC_CONST.
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c50a362921d805302602f74b9ce4b62006702a4b..af3a8f5709699c08d01871db4f039e34d3d87a14 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Fri Aug 25 12:16:15 2000  Owen Taylor  <otaylor@redhat.com>
+
+        * gdk/x11/gdkimage-x11.c: remove GDK_IMAGE_SHARED_PIXMAP
+       from switch statements, since Tor removed the enumeration
+       value.
+       
+       * gdk/x11/gdkimage-x11.c (gdk_image_get): 
+       s/GDK_IS_WINDOW/GDK_IS_DRAWABLE/.
+
 2000-08-29 Elliot Lee <sopwith@redhat.com>
        * */*.h: Use G_GNUC_CONST.
 

diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c
index cfc54e2966093a1e8aee1e2fe9e08215b553258c..fea5c5bbfd73bb2bc716a0f8425699e822e04368 100644 (file)
--- a/gdk/x11/gdkimage-x11.c
+++ b/gdk/x11/gdkimage-x11.c
@@ -355,7 +355,6 @@ gdk_image_new (GdkImageType  type,
          break;
 
        case GDK_IMAGE_FASTEST:
-       case GDK_IMAGE_SHARED_PIXMAP:
          g_assert_not_reached ();
        }
 
@@ -381,9 +380,9 @@ gdk_image_get (GdkWindow *window,
   GdkImage *image;
   GdkImagePrivateX11 *private;
 
-  g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
+  g_return_val_if_fail (GDK_IS_DRAWABLE (window), NULL);
 
-  if (GDK_WINDOW_DESTROYED (window))
+  if (GDK_IS_WINDOW (window) && GDK_WINDOW_DESTROYED (window))
     return NULL;
 
   image = g_object_new (gdk_image_get_type (), NULL);
@@ -492,7 +491,6 @@ gdk_x11_image_destroy (GdkImage *image)
       break;
 
     case GDK_IMAGE_FASTEST:
-    case GDK_IMAGE_SHARED_PIXMAP:
       g_assert_not_reached ();
     }