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

6 files changed, 10 insertions, 2 deletions

diff --git a/plugins/Xass-list b/plugins/Xass-list
index 2ce7c2135b..fac836700d 100644
--- a/plugins/Xass-list
+++ b/plugins/Xass-list
@@ -80,4 +80,5 @@ dissect_ber_sequence, dissect_ber_sequence_of, dissect_ber_set_of,
 dissect_ber_octet_string, dissect_ber_bitstring, dissect_ber_restricted_string,
 dissect_ber_object_identifier, get_ber_identifier, get_ber_length,
 proto_item_get_subtree, proto_tree_get_parent, proto_item_get_parent,
-proto_item_get_parent_nth, get_ber_last_created_item, 
+proto_item_get_parent_nth, get_ber_last_created_item, report_failure,
+
diff --git a/plugins/Xplugin_api.c b/plugins/Xplugin_api.c
index b34b3aa2ca..d3226071b4 100644
--- a/plugins/Xplugin_api.c
+++ b/plugins/Xplugin_api.c
@@ -273,3 +273,4 @@ p_proto_tree_get_parent = pat->p_proto_tree_get_parent;
 p_proto_item_get_parent = pat->p_proto_item_get_parent;
 p_proto_item_get_parent_nth = pat->p_proto_item_get_parent_nth;
 p_get_ber_last_created_item = pat->p_get_ber_last_created_item;
+p_report_failure = pat->p_report_failure;
diff --git a/plugins/Xplugin_api.h b/plugins/Xplugin_api.h
index 1cb990247a..ed3e3347a6 100644
--- a/plugins/Xplugin_api.h
+++ b/plugins/Xplugin_api.h
@@ -273,3 +273,4 @@
 #define proto_item_get_parent (*p_proto_item_get_parent)
 #define proto_item_get_parent_nth (*p_proto_item_get_parent_nth)
 #define get_ber_last_created_item (*p_get_ber_last_created_item)
+#define report_failure (*p_report_failure)
diff --git a/plugins/Xplugin_api_decls.h b/plugins/Xplugin_api_decls.h
index 7473bfc15c..b684430a83 100644
--- a/plugins/Xplugin_api_decls.h
+++ b/plugins/Xplugin_api_decls.h
@@ -273,3 +273,4 @@ addr_proto_tree_get_parent p_proto_tree_get_parent;
 addr_proto_item_get_parent p_proto_item_get_parent;
 addr_proto_item_get_parent_nth p_proto_item_get_parent_nth;
 addr_get_ber_last_created_item p_get_ber_last_created_item;
+addr_report_failure p_report_failure;
diff --git a/plugins/Xplugin_table.h b/plugins/Xplugin_table.h
index 9c5d45f858..64ed5a0d50 100644
--- a/plugins/Xplugin_table.h
+++ b/plugins/Xplugin_table.h
@@ -273,3 +273,4 @@ typedef proto_item *(*addr_proto_tree_get_parent) (proto_tree *);
 typedef proto_item *(*addr_proto_item_get_parent) (proto_item *);
 typedef proto_item *(*addr_proto_item_get_parent_nth) (proto_item *, int);
 typedef proto_item *(*addr_get_ber_last_created_item) (void);
+typedef void (*addr_report_failure) (const char *, ...);
diff --git a/plugins/plugin_api_list.c b/plugins/plugin_api_list.c
index 5ba305759d..2b47dbd7a0 100644
--- a/plugins/plugin_api_list.c
+++ b/plugins/plugin_api_list.c
@@ -1,7 +1,7 @@
 /* plugin_api_list.c
  * Used to generate various included files for plugin API
  *
- * $Id: plugin_api_list.c,v 1.33 2004/03/25 23:55:21 guy Exp $
+ * $Id: plugin_api_list.c,v 1.34 2004/04/16 23:16:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -434,3 +434,6 @@ proto_item* proto_tree_get_parent(proto_tree *tree);
 proto_item* proto_item_get_parent(proto_item *ti);
 proto_item* proto_item_get_parent_nth(proto_item *ti, int gen);
 proto_item *get_ber_last_created_item(void);
+
+void report_failure(const char *msg_format, ...);
+