diff --git a/ChangeLog b/ChangeLog
index c5e4feb9a5..e36f5a9248 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-07 16:19:16  Tim Janik  <timj@imendio.com>
+
+	* gdk/gdkrgb.c (gdk_rgb_select_conv): use g_error() instead of a
+	combination of g_warning+exit to avoid misleading the user.
+
 2008-08-07  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtkactiongroup.c
diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index 9b6a1b11f2..347ff59e0b 100644
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -3265,15 +3265,12 @@ gdk_rgb_select_conv (GdkRgbInfo *image_info)
     conv = gdk_rgb_convert_4_pack;
 
   if (!conv)
-    {
-      g_warning ("Visual type=%d depth=%d, image bpp=%d, %s first\n"
-		 "is not supported by GdkRGB. Please submit a bug report\n"
-		 "with the above values to bugzilla.gnome.org",
-		 vtype, depth, bpp,
-		 byte_order == GDK_LSB_FIRST ? "lsb" : "msb");
-      exit (1);
-    }
-  
+    g_error ("Visual type=%d depth=%d, image bpp=%d, %s first\n"
+             "is not supported by GdkRGB. Please submit a bug report\n"
+             "with the above values to bugzilla.gnome.org",
+             vtype, depth, bpp,
+             byte_order == GDK_LSB_FIRST ? "lsb" : "msb");
+
   if (conv_d == NULL)
     conv_d = conv;