GSM SMS: follow-up of gd65b7d5

[metze/wireshark/wip.git] / epan / funnel.h

diff --git a/epan/funnel.h b/epan/funnel.h
index 65264a896a650aec438f6b9e8bf11acfd8a17078..2b2282ab75e85554cbafaa8593220751ce8e6eba 100644 (file)
--- a/epan/funnel.h
+++ b/epan/funnel.h
@@ -3,9 +3,7 @@
  *
  * EPAN's GUI mini-API
  *
- * (c) 2006, Luis E. Garcia Ontanon <luis.ontanon@gmail.com>
- *
- * $Id$
+ * (c) 2006, Luis E. Garcia Ontanon <luis@ontanon.org>
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
@@ -23,18 +21,16 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA. 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #ifndef _FUNNEL_H
 #define _FUNNEL_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <glib.h>
-#include "../stat_menu.h"
+#include <epan/stat_groups.h>
+#include "ws_symbol_export.h"
 
+typedef struct _funnel_progress_window_t funnel_progress_window_t ;
 typedef struct _funnel_text_window_t funnel_text_window_t ;
 typedef struct _funnel_tree_window_t funnel_tree_window_t ;
 typedef struct _funnel_node_t funnel_node_t ;
@@ -49,6 +45,8 @@ typedef struct _funnel_bt_t {
        funnel_text_window_t* tw;
        funnel_bt_cb_t func;
        void* data;
+       void (*free_fcn)(void*);
+       void (*free_data_fcn)(void*);
 } funnel_bt_t;
 
 typedef struct _funnel_ops_t {
@@ -62,52 +60,53 @@ typedef struct _funnel_ops_t {
     void (*set_editable)(funnel_text_window_t*  win, gboolean editable);
     void (*destroy_text_window)(funnel_text_window_t*  win);
     void (*add_button)(funnel_text_window_t*  win, funnel_bt_t* cb, const gchar* label);
-#if 0
-    funnel_node_t* (*new_tree_window)(const gchar* title, gchar** columns);
-    funnel_node_t* (*add_node)(funnel_node_t* node, gchar** values);
-    void  (*remove_node)(funnel_node_t* node);
-    void  (*set_cell)(funnel_node_t* node, gchar* column, const gchar* text);
 
-    void (*set_filter)(const gchar* filter_string);
+    void (*new_dialog)(const gchar* title,
+                      const gchar** fieldnames,
+                      funnel_dlg_cb_t dlg_cb,
+                      void* data);
 
-#endif
 
-    void (*new_dialog)(const gchar* title,
-                                   const gchar** fieldnames,
-                                   funnel_dlg_cb_t dlg_cb,
-                                   void* data);
-    
     void (*logger)(const gchar *log_domain,
                    GLogLevelFlags log_level,
                    const gchar *message,
                    gpointer user_data);
-       
-       void (*retap_packets)(void);
-       void (*copy_to_clipboard)(GString *str);
-       void (*set_filter)(const char*);
-       gboolean (*open_file)(const char* fname, const char* filter, char** error);
-       void (*reload)(void);
-} funnel_ops_t;
 
 
-extern const funnel_ops_t* funnel_get_funnel_ops(void);
-extern void funnel_set_funnel_ops(const funnel_ops_t*);
+    void (*retap_packets)(void);
+    void (*copy_to_clipboard)(GString *str);
+
+    gchar * (*get_filter)(void);
+    void (*set_filter)(const char*);
+    void (*set_color_filter_slot)(guint8 flit_nr, const gchar* filter);
+    gboolean (*open_file)(const char* fname, const char* filter, const char** error);
+    void (*reload)(void);
+    void (*apply_filter)(void);
+
+    gboolean (*browser_open_url)(const gchar *url);
+    void (*browser_open_data_file)(const gchar *filename);
 
+    funnel_progress_window_t* (*new_progress_window)(const gchar* label, const gchar* task, gboolean terminate_is_stop, gboolean *stop_flag);
+    void (*update_progress)(funnel_progress_window_t*, float pr, const gchar* task);
+    void (*destroy_progress_window)(funnel_progress_window_t*);
+} funnel_ops_t;
+
+WS_DLL_PUBLIC const funnel_ops_t* funnel_get_funnel_ops(void);
+WS_DLL_PUBLIC void funnel_set_funnel_ops(const funnel_ops_t*);
 
-extern void funnel_register_menu(const char *name,
+WS_DLL_PUBLIC void funnel_register_menu(const char *name,
                                  register_stat_group_t group,
                                  void (*callback)(gpointer),
                                  gpointer callback_data,
                                  gboolean retap);
 
-
 typedef void (*funnel_registration_cb_t)(const char *name,
                                          register_stat_group_t group,
                                          void (*callback)(gpointer),
                                          gpointer callback_data,
                                          gboolean retap);
 
-extern void funnel_register_all_menus(funnel_registration_cb_t r_cb);
+WS_DLL_PUBLIC void funnel_register_all_menus(funnel_registration_cb_t r_cb);
 
 extern void initialize_funnel_ops(void);