[Emacs-diffs] Changes to emacs/src/gtkutil.c,v [EMACS_22_BASE]

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Glenn Morris <gm>       07/09/12 17:18:00

Index: gtkutil.c
===================================================================
RCS file: /sources/emacs/emacs/src/gtkutil.c,v
retrieving revision 1.106.2.6
retrieving revision 1.106.2.7
diff -u -b -r1.106.2.6 -r1.106.2.7
--- gtkutil.c   6 Sep 2007 07:01:23 -0000       1.106.2.6
+++ gtkutil.c   12 Sep 2007 17:17:59 -0000      1.106.2.7
@@ -1781,18 +1781,18 @@
    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