diff options
| author | Jan Djärv | 2009-11-10 19:06:40 +0000 |
|---|---|---|
| committer | Jan Djärv | 2009-11-10 19:06:40 +0000 |
| commit | e90292a90cdb9a3b4d28b21db39f5f44ad3de805 (patch) | |
| tree | 2bf6f977a64392335dd3365c845b6d589bfc6726 /src/process.c | |
| parent | 045b83c00aabaaaa5d4e363f848a1826f8f27338 (diff) | |
| download | emacs-e90292a90cdb9a3b4d28b21db39f5f44ad3de805.tar.gz emacs-e90292a90cdb9a3b4d28b21db39f5f44ad3de805.zip | |
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
* keyboard.h: Declare timer_check.
* keyboard.c (timer_check_2): New function that does what the old
timer_check did.
(timer_check): Call timer_check_2 until -1 or a non-zero time is
returned, i.e. don't return -1 with timers pending.
* process.c: Remove extern declaration of timer_check.
* xmenu.c (x_menu_wait_for_event): Remove code that did a timeout
even if timer_check returned -1.
* gtkutil.c (xg_dialog_response_cb): data is now a struct xg_dialog_data
(pop_down_dialog): Destroy widget (if any), cancel timer and unref
the event loop.
(xg_maybe_add_timer, xg_dialog_run): New functions (bug #4574).
(xg_get_file_name, xg_get_font_name): Call xg_dialog_run (bug #4574).
Destroy the dialog after xg_dialog_run.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c index 08495d2d8bd..fd94731a413 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -296,7 +296,6 @@ static void create_pty P_ ((Lisp_Object)); | |||
| 296 | static Lisp_Object get_process (); | 296 | static Lisp_Object get_process (); |
| 297 | static void exec_sentinel (); | 297 | static void exec_sentinel (); |
| 298 | 298 | ||
| 299 | extern EMACS_TIME timer_check (); | ||
| 300 | extern int timers_run; | 299 | extern int timers_run; |
| 301 | 300 | ||
| 302 | /* Mask of bits indicating the descriptors that we wait for input on. */ | 301 | /* Mask of bits indicating the descriptors that we wait for input on. */ |