Permalink
Browse files

updated for version 7.3.059

Problem:    Netbeans: Problem with recursively handling messages for Athena
	    and Motif.
Solution:   Call netbeans_parse_messages() in the main loop, like it's done
	    for GTK. (Xavier de Gaye)
  • Loading branch information...
1 parent 29dfc2c commit 1e08012084f0d293c4046419307835ca4cf06606 @brammool brammool committed Nov 16, 2010
Showing with 10 additions and 25 deletions.
  1. +5 −0 src/gui_x11.c
  2. +3 −25 src/netbeans.c
  3. +2 −0 src/version.c
View
5 src/gui_x11.c
@@ -2895,6 +2895,11 @@ gui_mch_wait_for_chars(wtime)
focus = gui.in_focus;
}
+#if defined(FEAT_NETBEANS_INTG)
+ /* Process any queued netbeans messages. */
+ netbeans_parse_messages();
+#endif
+
/*
* Don't use gui_mch_update() because then we will spin-lock until a
* char arrives, instead we use XtAppProcessEvent() to hang until an
View
28 src/netbeans.c
@@ -726,9 +726,6 @@ netbeans_read()
static char_u *buf = NULL;
int len = 0;
int readlen = 0;
-#if defined(NB_HAS_GUI) && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32)
- static int level = 0;
-#endif
#ifdef HAVE_SELECT
struct timeval tval;
fd_set rfds;
@@ -744,13 +741,6 @@ netbeans_read()
return;
}
-#if defined(NB_HAS_GUI) && !defined(FEAT_GUI_GTK) && !defined(FEAT_GUI_W32)
- /* recursion guard; this will be called from the X event loop at unknown
- * moments */
- if (NB_HAS_GUI)
- ++level;
-#endif
-
/* Allocate a buffer to read into. */
if (buf == NULL)
{
@@ -803,21 +793,9 @@ netbeans_read()
return; /* don't try to parse it */
}
-#if defined(NB_HAS_GUI) && !defined(FEAT_GUI_W32)
- /* Let the main loop handle messages. */
- if (NB_HAS_GUI)
- {
-# ifdef FEAT_GUI_GTK
- if (gtk_main_level() > 0)
- gtk_main_quit();
-# else
- /* Parse the messages now, but avoid recursion. */
- if (level == 1)
- netbeans_parse_messages();
-
- --level;
-# endif
- }
+#if defined(NB_HAS_GUI) && defined(FEAT_GUI_GTK)
+ if (NB_HAS_GUI && gtk_main_level() > 0)
+ gtk_main_quit();
#endif
}
View
2 src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 59,
+/**/
58,
/**/
57,

0 comments on commit 1e08012

Please sign in to comment.