2 files changed, 10 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1d13b2955e4..2fc471131ae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-12  Glenn Morris  <rgm@gnu.org>
+
+        * gtkutil.c (cnt): Rename to menu_grab_callback_cnt for clarity.
+        (menu_grab_callback): All uses changed.
+
+        * xselect.c (cnt): Rename to x_reply_selection_request_cnt for clarity.
+        (x_reply_selection_request): All uses changed.
+
 2007-09-06  Pixel  <pixel@mandriva.com>  (tiny change)
 
         * image.c (gif_load): Fix bug: Handle nonexistent colormap.
diff --git a/src/xselect.c b/src/xselect.c
index 43fdc9001ac..073404cb522 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -684,7 +684,7 @@ some_frame_on_display (dpyinfo)
    FORMAT is the unit-size (in bits) of the data to be transmitted.  */
 
 #ifdef TRACE_SELECTION
-static int cnt;
+static int x_reply_selection_request_cnt;
 #endif  /* TRACE_SELECTION */
 
 static void
@@ -727,7 +727,7 @@ x_reply_selection_request (event, format, data, size, type)
   {
     char *sel = XGetAtomName (display, reply.selection);
     char *tgt = XGetAtomName (display, reply.target);
-    TRACE3 ("%s, target %s (%d)", sel, tgt, ++cnt);
+    TRACE3 ("%s, target %s (%d)", sel, tgt, ++x_reply_selection_request_cnt);
     if (sel) XFree (sel);
     if (tgt) XFree (tgt);
   }