diff options
Diffstat (limited to 'plugins/epan/pluginifdemo/pluginifdemo.c')
| -rw-r--r-- | plugins/epan/pluginifdemo/pluginifdemo.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/plugins/epan/pluginifdemo/pluginifdemo.c b/plugins/epan/pluginifdemo/pluginifdemo.c index e6c42b47..e34d7e11 100644 --- a/plugins/epan/pluginifdemo/pluginifdemo.c +++ b/plugins/epan/pluginifdemo/pluginifdemo.c @@ -24,18 +24,18 @@ void proto_register_pluginifdemo(void); void proto_reg_handoff_pluginifdemo(void); -static int proto_pluginifdemo = -1; +static int proto_pluginifdemo; -void toolbar_cb(gpointer object, gpointer item_data, gpointer user_data); +void toolbar_cb(void *object, void *item_data, void *user_data); void -menu_cb(ext_menubar_gui_type gui_type, gpointer gui_data, gpointer user_data _U_) +menu_cb(ext_menubar_gui_type gui_type, void *gui_data, void *user_data _U_) { pluginifdemo_ui_main(gui_type, gui_data); } void -about_cb(ext_menubar_gui_type gui_type _U_, gpointer gui_data _U_, gpointer user_data _U_) +about_cb(ext_menubar_gui_type gui_type _U_, void *gui_data _U_, void *user_data _U_) { pluginifdemo_ui_about(gui_type, gui_data); } @@ -51,7 +51,7 @@ proto_register_pluginifdemo(void) proto_pluginifdemo = proto_register_protocol("Plugin IF Demo Protocol", "Pluginifdemo", "pluginifdemo"); - ext_menu = ext_menubar_register_menu ( proto_pluginifdemo, "Plugin IF Demonstration", TRUE ); + ext_menu = ext_menubar_register_menu ( proto_pluginifdemo, "Plugin IF Demonstration", true ); ext_menubar_set_parentmenu (ext_menu, "Tools"); ext_menubar_add_entry(ext_menu, "Toolbar Action Demonstrator", "Action demonstrator for the plugin toolbar", menu_cb, NULL); @@ -66,21 +66,21 @@ proto_register_pluginifdemo(void) ext_toolbar_t * tb = ext_toolbar_register_toolbar("Plugin Interface Demo Toolbar"); - ext_toolbar_add_entry(tb, EXT_TOOLBAR_BUTTON, "Button 1", 0, "Button 1 to press", FALSE, 0, FALSE, 0, toolbar_cb, 0); - ext_toolbar_add_entry(tb, EXT_TOOLBAR_BUTTON, "Button 2", 0, "Button 2 to press", TRUE, 0, FALSE, 0, toolbar_cb, 0); - ext_toolbar_add_entry(tb, EXT_TOOLBAR_BOOLEAN, "Checkbox", 0, "Checkbox to Select", FALSE, 0, FALSE, 0, toolbar_cb, 0); - ext_toolbar_add_entry(tb, EXT_TOOLBAR_STRING, "String 1", "Default String", "String without validation", FALSE, 0, TRUE, 0, toolbar_cb, 0); - ext_toolbar_add_entry(tb, EXT_TOOLBAR_STRING, "String 2", "ABC", "String with validation", FALSE, 0, FALSE, "^[A-Z]+", toolbar_cb, 0); + ext_toolbar_add_entry(tb, EXT_TOOLBAR_BUTTON, "Button 1", 0, "Button 1 to press", false, 0, false, 0, toolbar_cb, 0); + ext_toolbar_add_entry(tb, EXT_TOOLBAR_BUTTON, "Button 2", 0, "Button 2 to press", true, 0, false, 0, toolbar_cb, 0); + ext_toolbar_add_entry(tb, EXT_TOOLBAR_BOOLEAN, "Checkbox", 0, "Checkbox to Select", false, 0, false, 0, toolbar_cb, 0); + ext_toolbar_add_entry(tb, EXT_TOOLBAR_STRING, "String 1", "Default String", "String without validation", false, 0, true, 0, toolbar_cb, 0); + ext_toolbar_add_entry(tb, EXT_TOOLBAR_STRING, "String 2", "ABC", "String with validation", false, 0, false, "^[A-Z]+", toolbar_cb, 0); GList * entries = 0; - entries = ext_toolbar_add_val( entries, "1", "ABCD", FALSE ); - entries = ext_toolbar_add_val(entries, "2", "EFG", FALSE ); - entries = ext_toolbar_add_val(entries, "3", "HIJ", TRUE ); - entries = ext_toolbar_add_val(entries, "4", "KLM", FALSE ); - entries = ext_toolbar_add_val(entries, "5", "NOP", FALSE ); - entries = ext_toolbar_add_val(entries, "6", "QRS", FALSE ); - entries = ext_toolbar_add_val(entries, "7", "TUVW", FALSE ); - entries = ext_toolbar_add_val(entries, "8", "XYZ", FALSE ); - ext_toolbar_add_entry(tb, EXT_TOOLBAR_SELECTOR, "Selector", 0, "Selector to choose from", FALSE, entries, FALSE, 0, toolbar_cb, 0); + entries = ext_toolbar_add_val( entries, "1", "ABCD", false ); + entries = ext_toolbar_add_val(entries, "2", "EFG", false ); + entries = ext_toolbar_add_val(entries, "3", "HIJ", true ); + entries = ext_toolbar_add_val(entries, "4", "KLM", false ); + entries = ext_toolbar_add_val(entries, "5", "NOP", false ); + entries = ext_toolbar_add_val(entries, "6", "QRS", false ); + entries = ext_toolbar_add_val(entries, "7", "TUVW", false ); + entries = ext_toolbar_add_val(entries, "8", "XYZ", false ); + ext_toolbar_add_entry(tb, EXT_TOOLBAR_SELECTOR, "Selector", 0, "Selector to choose from", false, entries, false, 0, toolbar_cb, 0); pluginifdemo_toolbar_register(tb); } @@ -93,22 +93,22 @@ void* get_capture_file_cb(capture_file* cf, void* user_data _U_) { return cf->filename; } -void toolbar_cb(gpointer toolbar_item, gpointer item_data, gpointer user_data _U_) +void toolbar_cb(void *toolbar_item, void *item_data, void *user_data _U_) { if ( ! toolbar_item ) return; - gchar * message = 0; + char * message = 0; ext_toolbar_t * entry = (ext_toolbar_t *)toolbar_item; if (entry->item_type == EXT_TOOLBAR_BUTTON) { pluginifdemo_toolbar_log("Button pressed at toolbar"); - guint32 fnum = GPOINTER_TO_UINT(plugin_if_get_frame_data(get_frame_data_cb, NULL)); + uint32_t fnum = GPOINTER_TO_UINT(plugin_if_get_frame_data(get_frame_data_cb, NULL)); if (fnum) { message = ws_strdup_printf("Current frame is: %u", fnum); pluginifdemo_toolbar_log(message); } - const gchar* fnm = (const gchar*)plugin_if_get_capture_file(get_capture_file_cb, NULL); + const char* fnm = (const char*)plugin_if_get_capture_file(get_capture_file_cb, NULL); if (fnm) { message = ws_strdup_printf("Capture file name is: %s", fnm); pluginifdemo_toolbar_log(message); @@ -116,13 +116,13 @@ void toolbar_cb(gpointer toolbar_item, gpointer item_data, gpointer user_data _U } else if ( entry->item_type == EXT_TOOLBAR_BOOLEAN ) { - gboolean data = *((gboolean *)item_data); + bool data = *((bool *)item_data); message = ws_strdup_printf( "Checkbox selected value: %d", (int) (data) ); pluginifdemo_toolbar_log(message); } else if ( entry->item_type == EXT_TOOLBAR_STRING ) { - gchar * data = (gchar *)item_data; + char * data = (char *)item_data; message = ws_strdup_printf( "String entered in toolbar: %s", data ); pluginifdemo_toolbar_log(message); } |