Add in missing 'flags' field to target list.

Wed Dec  9 12:23:30 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/testselection.c (main): Add in missing 'flags'
	field to target list.

	* gdk/gdkproperty.c (gdk_atom_intern): Actually
	add the atoms to the local cache.

diff --git a/ChangeLog b/ChangeLog
index 3ee4d7070386cad77dd35dcb7a88d9686ddcca78..d42a8ee051ad33cb2d7811d7ed23247197e37a95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Dec  9 12:23:30 1998  Owen Taylor  <otaylor@redhat.com>
+       
+       * gtk/testselection.c (main): Add in missing 'flags'
+       field to target list.
+
+       * gdk/gdkproperty.c (gdk_atom_intern): Actually
+       add the atoms to the local cache.
+
 Wed Dec  9 04:57:31 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gdk/gdkprivate.h: put text after #endif in comment

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3ee4d7070386cad77dd35dcb7a88d9686ddcca78..d42a8ee051ad33cb2d7811d7ed23247197e37a95 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Wed Dec  9 12:23:30 1998  Owen Taylor  <otaylor@redhat.com>
+       
+       * gtk/testselection.c (main): Add in missing 'flags'
+       field to target list.
+
+       * gdk/gdkproperty.c (gdk_atom_intern): Actually
+       add the atoms to the local cache.
+
 Wed Dec  9 04:57:31 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gdk/gdkprivate.h: put text after #endif in comment

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3ee4d7070386cad77dd35dcb7a88d9686ddcca78..d42a8ee051ad33cb2d7811d7ed23247197e37a95 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Wed Dec  9 12:23:30 1998  Owen Taylor  <otaylor@redhat.com>
+       
+       * gtk/testselection.c (main): Add in missing 'flags'
+       field to target list.
+
+       * gdk/gdkproperty.c (gdk_atom_intern): Actually
+       add the atoms to the local cache.
+
 Wed Dec  9 04:57:31 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gdk/gdkprivate.h: put text after #endif in comment

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3ee4d7070386cad77dd35dcb7a88d9686ddcca78..d42a8ee051ad33cb2d7811d7ed23247197e37a95 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Wed Dec  9 12:23:30 1998  Owen Taylor  <otaylor@redhat.com>
+       
+       * gtk/testselection.c (main): Add in missing 'flags'
+       field to target list.
+
+       * gdk/gdkproperty.c (gdk_atom_intern): Actually
+       add the atoms to the local cache.
+
 Wed Dec  9 04:57:31 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gdk/gdkprivate.h: put text after #endif in comment

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3ee4d7070386cad77dd35dcb7a88d9686ddcca78..d42a8ee051ad33cb2d7811d7ed23247197e37a95 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Wed Dec  9 12:23:30 1998  Owen Taylor  <otaylor@redhat.com>
+       
+       * gtk/testselection.c (main): Add in missing 'flags'
+       field to target list.
+
+       * gdk/gdkproperty.c (gdk_atom_intern): Actually
+       add the atoms to the local cache.
+
 Wed Dec  9 04:57:31 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gdk/gdkprivate.h: put text after #endif in comment

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3ee4d7070386cad77dd35dcb7a88d9686ddcca78..d42a8ee051ad33cb2d7811d7ed23247197e37a95 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Wed Dec  9 12:23:30 1998  Owen Taylor  <otaylor@redhat.com>
+       
+       * gtk/testselection.c (main): Add in missing 'flags'
+       field to target list.
+
+       * gdk/gdkproperty.c (gdk_atom_intern): Actually
+       add the atoms to the local cache.
+
 Wed Dec  9 04:57:31 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gdk/gdkprivate.h: put text after #endif in comment

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3ee4d7070386cad77dd35dcb7a88d9686ddcca78..d42a8ee051ad33cb2d7811d7ed23247197e37a95 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Wed Dec  9 12:23:30 1998  Owen Taylor  <otaylor@redhat.com>
+       
+       * gtk/testselection.c (main): Add in missing 'flags'
+       field to target list.
+
+       * gdk/gdkproperty.c (gdk_atom_intern): Actually
+       add the atoms to the local cache.
+
 Wed Dec  9 04:57:31 PST 1998 Manish Singh <yosh@gimp.org>
 
        * gdk/gdkprivate.h: put text after #endif in comment

diff --git a/gdk/gdkproperty.c b/gdk/gdkproperty.c
index 5b18ba71e76728bb817b0f988389ed7c9bc1c16f..12f0420ddece2724a5d918ea32d79970693f7cbc 100644 (file)
--- a/gdk/gdkproperty.c
+++ b/gdk/gdkproperty.c
@@ -34,7 +34,13 @@ gdk_atom_intern (const gchar *atom_name,
 
   retval = GPOINTER_TO_UINT (g_hash_table_lookup (atom_hash, atom_name));
   if (!retval)
-    retval = XInternAtom (gdk_display, atom_name, only_if_exists);
+    {
+      retval = XInternAtom (gdk_display, atom_name, only_if_exists);
+
+      g_hash_table_insert (atom_hash, 
+                          g_strdup (atom_name), 
+                          GUINT_TO_POINTER (retval));
+    }
 
   return retval;
 }

diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 5b18ba71e76728bb817b0f988389ed7c9bc1c16f..12f0420ddece2724a5d918ea32d79970693f7cbc 100644 (file)
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -34,7 +34,13 @@ gdk_atom_intern (const gchar *atom_name,
 
   retval = GPOINTER_TO_UINT (g_hash_table_lookup (atom_hash, atom_name));
   if (!retval)
-    retval = XInternAtom (gdk_display, atom_name, only_if_exists);
+    {
+      retval = XInternAtom (gdk_display, atom_name, only_if_exists);
+
+      g_hash_table_insert (atom_hash, 
+                          g_strdup (atom_name), 
+                          GUINT_TO_POINTER (retval));
+    }
 
   return retval;
 }

diff --git a/gtk/testselection.c b/gtk/testselection.c
index e88d44347ca2408d11fa4264752af66ce220be43..765f918f28592aa099bddc5378b478ed4de44ce4 100644 (file)
--- a/gtk/testselection.c
+++ b/gtk/testselection.c
@@ -384,9 +384,9 @@ main (int argc, char *argv[])
   GtkWidget *hbox;
 
   static GtkTargetEntry targetlist[] = {
-    { "STRING", STRING },
-    { "TEXT",   TEXT },
-    { "COMPOUND_TEXT", COMPOUND_TEXT }
+    { "STRING",        0, STRING },
+    { "TEXT",          0, TEXT },
+    { "COMPOUND_TEXT", 0, COMPOUND_TEXT }
   };
   static gint ntargets = sizeof(targetlist) / sizeof(targetlist[0]);
   

diff --git a/tests/testselection.c b/tests/testselection.c
index e88d44347ca2408d11fa4264752af66ce220be43..765f918f28592aa099bddc5378b478ed4de44ce4 100644 (file)
--- a/tests/testselection.c
+++ b/tests/testselection.c
@@ -384,9 +384,9 @@ main (int argc, char *argv[])
   GtkWidget *hbox;
 
   static GtkTargetEntry targetlist[] = {
-    { "STRING", STRING },
-    { "TEXT",   TEXT },
-    { "COMPOUND_TEXT", COMPOUND_TEXT }
+    { "STRING",        0, STRING },
+    { "TEXT",          0, TEXT },
+    { "COMPOUND_TEXT", 0, COMPOUND_TEXT }
   };
   static gint ntargets = sizeof(targetlist) / sizeof(targetlist[0]);