Fix problem with g_return_if_fail return value.

Sun Oct 21 23:27:00 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwidget.c (gtk_widget_translate_coordinates): Fix
	problem with g_return_if_fail return value.

 	* gdk/x11/gdkproperty-x11.c docs/Changes-2.0.txt: Move over the
	virtual atom code from the gdk-multihead branch, removing the per-display
	part. Virtualizing atoms needs to be done now to prevent compat
	breakage in direct Xlib accessing code in the future. (#62208)

 	* gdk/x11/gdkx.h: gdk/gdk/x11/gdkproperty-x11.c: Export
 	gdk_x11_xatom_to_atom, gdk_x11_atom_to_xatom().

	* gdk/gdktypes.h docs/Changes-2.0.txt: Make GdkAtom
	an opaque pointer type so the compiler catches attempts
	to mingle it with X atoms.

	* gdk/x11/{gdkdnd-x11.c,gdkevents-x11.c,gdkglobals-x11.c,
	  gdkkeys-x11.c, gdkmain-x11.c, gdkprivate-x11.c,
	  gdkproperty-x11.c, gdkselection-x11.c, gdkwindow-x11.c}
	  gtk/{gtkclist.c,gtkctree.c,gtkdnd.c,gtkplug.c,gtksocket.c}
	  tests/testdnd.c,tests/testselection.c:
	Fix up for above atom changes.

	* gdk/gdkselection.h (GDK_SELECTION_CLIPBOARD): Add, since we
	now have the ability to add custom predefines.

	* gtk/{gtkentry.c,gtklabel.c,gtkoldeditable.c,gtktextview.c}:
	Use GDK_SELECTION_CLIPBOARD instead of GDK_NONE in calls
	to gtk_clipboard_get().

	* gdk/win32/gdkproperty-win32.c: Add CLIPBOARD, fix up
	for GdkAtom => pointer change.

	* gdk/linux-fb/gdkproperty-fb.c: Fix handling of predefined
	atoms, fix for GdkAtom => pointer change.

1 files changed, 47 insertions, 2 deletions

diff --git a/gdk/linux-fb/gdkproperty-fb.c b/gdk/linux-fb/gdkproperty-fb.c
index e870f3543..38156e6ee 100644
--- a/gdk/linux-fb/gdkproperty-fb.c
+++ b/gdk/linux-fb/gdkproperty-fb.c
@@ -38,13 +38,58 @@ gdk_atom_intern (const gchar *atom_name,
 {
   g_return_val_if_fail (atom_name != NULL, GDK_NONE);
 
-  return g_quark_from_string (atom_name);
+  if (strcmp (atom_name, "PRIMARY") == 0)
+    return GDK_SELECTION_PRIMARY;
+  else if (strcmp (atom_name, "SECONDARY") == 0)
+    return GDK_SELECTION_SECONDARY;
+  else if (strcmp (atom_name, "CLIPBOARD") == 0)
+    return GDK_SELECTION_CLIPBOARD;
+  else if (strcmp (atom_name, "ATOM") == 0)
+    return GDK_SELECTION_TYPE_ATOM;
+  else if (strcmp (atom_name, "BITMAP") == 0)
+    return GDK_SELECTION_TYPE_BITMAP;
+  else if (strcmp (atom_name, "COLORMAP") == 0)
+    return GDK_SELECTION_TYPE_COLORMAP;
+  else if (strcmp (atom_name, "DRAWABLE") == 0)
+    return GDK_SELECTION_TYPE_DRAWABLE;
+  else if (strcmp (atom_name, "INTEGER") == 0)
+    return GDK_SELECTION_TYPE_INTEGER;
+  else if (strcmp (atom_name, "PIXMAP") == 0)
+    return GDK_SELECTION_TYPE_PIXMAP;
+  else if (strcmp (atom_name, "WINDOW") == 0)
+    return GDK_SELECTION_TYPE_WINDOW;
+  else if (strcmp (atom_name, "STRING") == 0)
+    return GDK_SELECTION_TYPE_STRING;
+  else
+    return GUINT_TO_POINTER (256 + g_quark_from_string (atom_name));
 }
 
 gchar*
 gdk_atom_name (GdkAtom atom)
 {
-  return g_strdup (g_quark_to_string (atom));
+  if (atom < 256)
+    {
+      
+      switch (GPOINTER_TO_UINT (atom))
+	{
+	case GDK_SELECTION_PRIMARY: return g_strdup ("PRIMARY");
+	case GDK_SELECTION_SECONDARY: return g_strdup ("SECONDARY");
+	case GDK_SELECTION_CLIPBOARD: return g_strdup ("CLIPBOARD");
+	case GDK_SELECTION_TYPE_ATOM: return g_strdup ("ATOM");
+	case GDK_SELECTION_TYPE_BITMAP: return g_strdup ("BITMAP");
+	case GDK_SELECTION_TYPE_COLORMAP: return g_strdup ("COLORMAP");
+	case GDK_SELECTION_TYPE_DRAWABLE: return g_strdup ("DRAWABLE");
+	case GDK_SELECTION_TYPE_INTEGER: return g_strdup ("INTEGER");
+	case GDK_SELECTION_TYPE_PIXMAP: return g_strdup ("PIXMAP");
+	case GDK_SELECTION_TYPE_WINDOW: return g_strdup ("WINDOW");
+	case GDK_SELECTION_TYPE_STRING: return g_strdup ("STRING");
+	default:
+	  g_warning (G_STRLOC "Invalid atom");
+	  return g_strdup ("<invalid>");
+	}
+    }
+  else
+    return g_strdup (g_quark_to_string (atom - 256));
 }
 
 static void