diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-04-16 23:17:13 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-04-16 23:17:13 +0000 |
| commit | d209115ba38e1f5082ecdf702782da0f09a727d2 (patch) | |
| tree | 16229621c009c052580c6152892a945af94e5bba /simple_dialog.h | |
| parent | a0146ed5bedbbee168eb8f0fc226cd56fa1dbd92 (diff) | |
Add a "report_failure()" routine to allow dissectors to report arbitrary
errors to the user. Use that, rather than "g_warning()", in the
Diameter dissector to report errors reading the dictionary.
Make the format argument to "simple_dialog()" a "const" pointer.
Fix up the read-error message in Tethereal to end with a newline.
If a simple dialog is requested before the main window or the
capture-control window is popped up, queue it up and pop the queued
messages up once the main or capture-control window is displayed.
svn path=/trunk/; revision=10616
Diffstat (limited to 'simple_dialog.h')
| -rw-r--r-- | simple_dialog.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/simple_dialog.h b/simple_dialog.h index e729aab654..44df274c57 100644 --- a/simple_dialog.h +++ b/simple_dialog.h @@ -2,7 +2,7 @@ * Definitions for alert box routines with toolkit-independent APIs but * toolkit-dependent implementations. * - * $Id: simple_dialog.h,v 1.11 2004/02/12 22:24:27 guy Exp $ + * $Id: simple_dialog.h,v 1.12 2004/04/16 23:16:28 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -60,10 +60,16 @@ extern "C" { /* show a simple dialog */ #if __GNUC__ >= 2 -extern gpointer simple_dialog(gint type, gint btn_mask, gchar *msg_format, ...) +extern gpointer simple_dialog(gint type, gint btn_mask, + const gchar *msg_format, ...) __attribute__((format (printf, 3, 4))); +extern gpointer vsimple_dialog(gint type, gint btn_mask, + const gchar *msg_format, va_list ap); #else -extern gpointer simple_dialog(gint type, gint btn_mask, gchar *msg_format, ...); +extern gpointer simple_dialog(gint type, gint btn_mask, + const gchar *msg_format, ...); +extern gpointer vsimple_dialog(gint type, gint btn_mask, + const gchar *msg_format, va_list ap); #endif /* callback function type */ @@ -75,6 +81,14 @@ extern void simple_dialog_set_cb(gpointer dialog, simple_dialog_cb_t callback_fc extern char *simple_dialog_primary_start(void); extern char *simple_dialog_primary_end(void); +/* + * If a routine is called to display a dialog before there are any windows + * open, information to use to display the dialog is queued up. This + * routine should be called once there are windows open, so that the queued + * up dialogs are displayed on top of those windows. + */ +extern void display_queued_messages(void); + #ifdef __cplusplus } #endif /* __cplusplus */ |