[Ummm, maybe we should do the same change to the selection_owner variable?]

1998-03-05  Federico Mena Quintero  <federico@nuclecu.unam.mx>

	* gdk/gdkprivate.h: Changed the name of default_filters to
	gdk_default_filters to avoid namespace pollution.  Yes, it just
	happened to me.
	* gdk/gdk.c (gdk_event_translate):
	* gdk/gdkglobals.c:
	* gdk/gdkwindow.c (gdk_window_add_filter gdk_window_remove_filter): Likewise.

diff --git a/ChangeLog b/ChangeLog
index a59ecaa3103580cdf39f8d1db3b084eb68ee1468..d04f246cb3cf18327b50822aaeeb7088822c74a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1998-03-05  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gdk/gdkprivate.h: Changed the name of default_filters to
+       gdk_default_filters to avoid namespace pollution.  Yes, it just
+       happened to me.
+       * gdk/gdk.c (gdk_event_translate):
+       * gdk/gdkglobals.c: 
+       * gdk/gdkwindow.c (gdk_window_add_filter gdk_window_remove_filter): Likewise.
+
 Thu Mar  5 12:32:06 1998  Marc Ewing  <marc@redhat.com>
 
        * gtk/gtkclist.c (select_row): emit UNselect on rows

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a59ecaa3103580cdf39f8d1db3b084eb68ee1468..d04f246cb3cf18327b50822aaeeb7088822c74a3 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+1998-03-05  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gdk/gdkprivate.h: Changed the name of default_filters to
+       gdk_default_filters to avoid namespace pollution.  Yes, it just
+       happened to me.
+       * gdk/gdk.c (gdk_event_translate):
+       * gdk/gdkglobals.c: 
+       * gdk/gdkwindow.c (gdk_window_add_filter gdk_window_remove_filter): Likewise.
+
 Thu Mar  5 12:32:06 1998  Marc Ewing  <marc@redhat.com>
 
        * gtk/gtkclist.c (select_row): emit UNselect on rows

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a59ecaa3103580cdf39f8d1db3b084eb68ee1468..d04f246cb3cf18327b50822aaeeb7088822c74a3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+1998-03-05  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gdk/gdkprivate.h: Changed the name of default_filters to
+       gdk_default_filters to avoid namespace pollution.  Yes, it just
+       happened to me.
+       * gdk/gdk.c (gdk_event_translate):
+       * gdk/gdkglobals.c: 
+       * gdk/gdkwindow.c (gdk_window_add_filter gdk_window_remove_filter): Likewise.
+
 Thu Mar  5 12:32:06 1998  Marc Ewing  <marc@redhat.com>
 
        * gtk/gtkclist.c (select_row): emit UNselect on rows

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a59ecaa3103580cdf39f8d1db3b084eb68ee1468..d04f246cb3cf18327b50822aaeeb7088822c74a3 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+1998-03-05  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gdk/gdkprivate.h: Changed the name of default_filters to
+       gdk_default_filters to avoid namespace pollution.  Yes, it just
+       happened to me.
+       * gdk/gdk.c (gdk_event_translate):
+       * gdk/gdkglobals.c: 
+       * gdk/gdkwindow.c (gdk_window_add_filter gdk_window_remove_filter): Likewise.
+
 Thu Mar  5 12:32:06 1998  Marc Ewing  <marc@redhat.com>
 
        * gtk/gtkclist.c (select_row): emit UNselect on rows

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a59ecaa3103580cdf39f8d1db3b084eb68ee1468..d04f246cb3cf18327b50822aaeeb7088822c74a3 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+1998-03-05  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gdk/gdkprivate.h: Changed the name of default_filters to
+       gdk_default_filters to avoid namespace pollution.  Yes, it just
+       happened to me.
+       * gdk/gdk.c (gdk_event_translate):
+       * gdk/gdkglobals.c: 
+       * gdk/gdkwindow.c (gdk_window_add_filter gdk_window_remove_filter): Likewise.
+
 Thu Mar  5 12:32:06 1998  Marc Ewing  <marc@redhat.com>
 
        * gtk/gtkclist.c (select_row): emit UNselect on rows

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a59ecaa3103580cdf39f8d1db3b084eb68ee1468..d04f246cb3cf18327b50822aaeeb7088822c74a3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+1998-03-05  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gdk/gdkprivate.h: Changed the name of default_filters to
+       gdk_default_filters to avoid namespace pollution.  Yes, it just
+       happened to me.
+       * gdk/gdk.c (gdk_event_translate):
+       * gdk/gdkglobals.c: 
+       * gdk/gdkwindow.c (gdk_window_add_filter gdk_window_remove_filter): Likewise.
+
 Thu Mar  5 12:32:06 1998  Marc Ewing  <marc@redhat.com>
 
        * gtk/gtkclist.c (select_row): emit UNselect on rows

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a59ecaa3103580cdf39f8d1db3b084eb68ee1468..d04f246cb3cf18327b50822aaeeb7088822c74a3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+1998-03-05  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gdk/gdkprivate.h: Changed the name of default_filters to
+       gdk_default_filters to avoid namespace pollution.  Yes, it just
+       happened to me.
+       * gdk/gdk.c (gdk_event_translate):
+       * gdk/gdkglobals.c: 
+       * gdk/gdkwindow.c (gdk_window_add_filter gdk_window_remove_filter): Likewise.
+
 Thu Mar  5 12:32:06 1998  Marc Ewing  <marc@redhat.com>
 
        * gtk/gtkclist.c (select_row): emit UNselect on rows

diff --git a/gdk/gdk.c b/gdk/gdk.c
index acddb598091f8af958b2de3f4aa4bdc03285a9d9..10714aa1438278e4347d39737af5993df7b2f3e8 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -1713,7 +1713,7 @@ gdk_event_translate (GdkEvent *event,
     result = gdk_event_apply_filters (xevent, event,
                                      window_private
                                      ?window_private->filters
-                                     :default_filters);
+                                     :gdk_default_filters);
     
     if (result != GDK_FILTER_CONTINUE)
       {

diff --git a/gdk/gdkglobals.c b/gdk/gdkglobals.c
index 367df7d83b76874d98ca09d43d2f8bbf5503faa3..0fcbef3fc204fe529027eec09d3fc6e18ecd2403 100644 (file)
--- a/gdk/gdkglobals.c
+++ b/gdk/gdkglobals.c
@@ -49,4 +49,4 @@ gchar            *gdk_progclass = NULL;
 gint              gdk_error_code;
 gint              gdk_error_warnings = TRUE;
 gint              gdk_null_window_warnings = TRUE;
-GList            *default_filters = NULL;
+GList            *gdk_default_filters = NULL;

diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h
index c6672c504b004259c90c08e4bd567921ccae02a0..ee8456fb12c95d87407a29dd4e82c458d42b0855 100644 (file)
--- a/gdk/gdkprivate.h
+++ b/gdk/gdkprivate.h
@@ -251,7 +251,7 @@ extern gchar                *gdk_progclass;
 extern gint             gdk_error_code;
 extern gint             gdk_error_warnings;
 extern gint              gdk_null_window_warnings;
-extern GList            *default_filters;
+extern GList            *gdk_default_filters;
 
 /* Debugging support */
 

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 1e644fc68b65d9456032224841963fee399ad582..0194be75759004b67d3686c0b657be66403df555 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -1482,7 +1482,7 @@ gdk_window_add_filter     (GdkWindow     *window,
   if(private)
     tmp_list = private->filters;
   else
-    tmp_list = default_filters;
+    tmp_list = gdk_default_filters;
 
   while (tmp_list)
     {
@@ -1499,7 +1499,7 @@ gdk_window_add_filter     (GdkWindow     *window,
   if(private)
     private->filters = g_list_append (private->filters, filter);
   else
-    default_filters = g_list_append (default_filters, filter);
+    gdk_default_filters = g_list_append (gdk_default_filters, filter);
 }
 
 void
@@ -1516,7 +1516,7 @@ gdk_window_remove_filter  (GdkWindow     *window,
   if(private)
     tmp_list = private->filters;
   else
-    tmp_list = default_filters;
+    tmp_list = gdk_default_filters;
 
   while (tmp_list)
     {
@@ -1528,7 +1528,7 @@ gdk_window_remove_filter  (GdkWindow     *window,
          if(private)
            private->filters = g_list_remove_link (private->filters, tmp_list);
          else
-           default_filters = g_list_remove_link (default_filters, tmp_list);
+           gdk_default_filters = g_list_remove_link (gdk_default_filters, tmp_list);
          g_list_free_1 (tmp_list);
          g_free (filter);
          

diff --git a/gdk/x11/gdkglobals-x11.c b/gdk/x11/gdkglobals-x11.c
index 367df7d83b76874d98ca09d43d2f8bbf5503faa3..0fcbef3fc204fe529027eec09d3fc6e18ecd2403 100644 (file)
--- a/gdk/x11/gdkglobals-x11.c
+++ b/gdk/x11/gdkglobals-x11.c
@@ -49,4 +49,4 @@ gchar            *gdk_progclass = NULL;
 gint              gdk_error_code;
 gint              gdk_error_warnings = TRUE;
 gint              gdk_null_window_warnings = TRUE;
-GList            *default_filters = NULL;
+GList            *gdk_default_filters = NULL;

diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index acddb598091f8af958b2de3f4aa4bdc03285a9d9..10714aa1438278e4347d39737af5993df7b2f3e8 100644 (file)
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -1713,7 +1713,7 @@ gdk_event_translate (GdkEvent *event,
     result = gdk_event_apply_filters (xevent, event,
                                      window_private
                                      ?window_private->filters
-                                     :default_filters);
+                                     :gdk_default_filters);
     
     if (result != GDK_FILTER_CONTINUE)
       {

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 1e644fc68b65d9456032224841963fee399ad582..0194be75759004b67d3686c0b657be66403df555 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1482,7 +1482,7 @@ gdk_window_add_filter     (GdkWindow     *window,
   if(private)
     tmp_list = private->filters;
   else
-    tmp_list = default_filters;
+    tmp_list = gdk_default_filters;
 
   while (tmp_list)
     {
@@ -1499,7 +1499,7 @@ gdk_window_add_filter     (GdkWindow     *window,
   if(private)
     private->filters = g_list_append (private->filters, filter);
   else
-    default_filters = g_list_append (default_filters, filter);
+    gdk_default_filters = g_list_append (gdk_default_filters, filter);
 }
 
 void
@@ -1516,7 +1516,7 @@ gdk_window_remove_filter  (GdkWindow     *window,
   if(private)
     tmp_list = private->filters;
   else
-    tmp_list = default_filters;
+    tmp_list = gdk_default_filters;
 
   while (tmp_list)
     {
@@ -1528,7 +1528,7 @@ gdk_window_remove_filter  (GdkWindow     *window,
          if(private)
            private->filters = g_list_remove_link (private->filters, tmp_list);
          else
-           default_filters = g_list_remove_link (default_filters, tmp_list);
+           gdk_default_filters = g_list_remove_link (gdk_default_filters, tmp_list);
          g_list_free_1 (tmp_list);
          g_free (filter);