From: Glenn Morris <rgm@gnu.org>
Date: Wed, 12 Sep 2007 17:17:59 +0000 (+0000)
Subject: (cnt): Rename to menu_grab_callback_cnt for clarity.
X-Git-Tag: emacs-pretest-22.1.90~836
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c29ec096c7d43dc6449bc9cc12e100737eae031b;p=emacs.git

(cnt): Rename to menu_grab_callback_cnt for clarity.
(menu_grab_callback): All uses changed.
---

diff --git a/src/gtkutil.c b/src/gtkutil.c
index c057cc719e0..7b1e4c5272d 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1781,18 +1781,18 @@ menu_destroy_callback (w, client_data)
    CLIENT_DATA is NULL (not used).  */
 
 /* Keep track of total number of grabs.  */
-static int cnt;
+static int menu_grab_callback_cnt;
 
 static void
 menu_grab_callback (GtkWidget *widget,
                     gboolean ungrab_p,
                     gpointer client_data)
 {
-  if (ungrab_p) cnt--;
-  else cnt++;
+  if (ungrab_p) menu_grab_callback_cnt--;
+  else menu_grab_callback_cnt++;
 
-  if (cnt > 0 && ! xg_timer) xg_start_timer ();
-  else if (cnt == 0 && xg_timer) xg_stop_timer ();
+  if (menu_grab_callback_cnt > 0 && ! xg_timer) xg_start_timer ();
+  else if (menu_grab_callback_cnt == 0 && xg_timer) xg_stop_timer ();
 }
 
 /* Make a GTK widget that contains both UTF8_LABEL and UTF8_KEY (both