diff options
author | gal <gal@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-05-11 16:42:38 +0000 |
---|---|---|
committer | gal <gal@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-05-11 16:42:38 +0000 |
commit | 72ff56547147bb346157e603c7eb1365c835ca8e (patch) | |
tree | 1de83b1eeea4c8f44d0d01a36a7748a9ea6cb545 | |
parent | 0c88e6aa597c59cdb2649df70850bb3770d9194b (diff) |
Removal of useless "Field Information" introduced in r18125
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18133 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r-- | epan/libethereal.def | 1 | ||||
-rw-r--r-- | epan/oid_resolv.c | 29 | ||||
-rw-r--r-- | epan/oid_resolv.h | 5 | ||||
-rw-r--r-- | gtk/main.c | 24 | ||||
-rw-r--r-- | gtk/main.h | 12 | ||||
-rw-r--r-- | gtk/menu.c | 6 |
6 files changed, 0 insertions, 77 deletions
diff --git a/epan/libethereal.def b/epan/libethereal.def index d73cdc76ce..a6a118e4b7 100644 --- a/epan/libethereal.def +++ b/epan/libethereal.def @@ -347,7 +347,6 @@ get_hostname6 get_host_ipaddr get_host_ipaddr6 get_manuf_name_if_known -get_oid_url get_persconffile_path get_plugins_global_dir get_plugins_pers_dir diff --git a/epan/oid_resolv.c b/epan/oid_resolv.c index cda4e31137..73e530a92c 100644 --- a/epan/oid_resolv.c +++ b/epan/oid_resolv.c @@ -35,9 +35,6 @@ static GHashTable *oid_table = NULL; -/* this should be configurable - but where ? */ -static const gchar *oid_url_template = "http://www.alvestrand.no/objectid/%s.html"; - void oid_resolv_init(void) { oid_table = g_hash_table_new(g_str_hash, g_str_equal); } @@ -98,29 +95,3 @@ extern void add_oid_name(const guint8 *oid, gint oid_len, const gchar *name) { extern void add_oid_str_name(const gchar *oid_str, const gchar *name) { g_hash_table_insert(oid_table, (gpointer)g_strdup(oid_str), (gpointer)name); } - -gboolean get_oid_url(field_info *finfo, gchar **ret_url) -{ - const char *oid; - - if(finfo && (finfo->hfinfo->type == FT_OID) && - (oid_url_template != NULL) && (*oid_url_template != NULL)) { - if(ret_url) { - /* return the URL */ - oid = oid_to_str(tvb_get_ptr(finfo->ds_tvb, finfo->start, finfo->length), - finfo->length); - - /* the URL will be freed */ - *ret_url = g_strdup_printf(oid_url_template, oid); - return TRUE; - } else { - /* return TRUE if we are configured to return URLs */ - - if((oid_url_template != NULL) && (*oid_url_template != NULL)) - return TRUE; - - } - } - - return FALSE; -} diff --git a/epan/oid_resolv.h b/epan/oid_resolv.h index 3886755585..7176a65efe 100644 --- a/epan/oid_resolv.h +++ b/epan/oid_resolv.h @@ -32,8 +32,6 @@ #ifndef __OID_RESOLV_H__ #define __OID_RESOLV_H__ -#include <epan/proto.h> - /* init and clenup funcions called from epan.h */ extern void oid_resolv_init(void); extern void oid_resolv_cleanup(void); @@ -48,8 +46,5 @@ extern const gchar *get_oid_str_name(const gchar *oid_str); extern void add_oid_name(const guint8 *oid, gint oid_len, const gchar *name); extern void add_oid_str_name(const gchar *oid_str, const gchar *name); -/* get a URL for an OID in the given field */ -/* if ret_url is NULL, just return TRUE if we are configured to provide one */ -extern gboolean get_oid_url(field_info *finfo, gchar **ret_url); #endif /* __OID_RESOLV_H__ */ diff --git a/gtk/main.c b/gtk/main.c index c6335cb7e2..d5503a73b9 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -89,7 +89,6 @@ #include "cmdarg_err.h" #include "version_info.h" #include "merge.h" -#include <epan/oid_resolv.h> #ifdef HAVE_LIBPCAP #include "capture-pcap-util.h" @@ -383,29 +382,6 @@ selected_ptree_ref_cb(GtkWidget *widget _U_, gpointer data _U_) } } -void -selected_ptree_field_url_cb(GtkWidget *widget _U_, gpointer data _U_) -{ - gchar *selected_info_url; - - /* only OIDs for now */ - if(cfile.finfo_selected->hfinfo->type == FT_OID) { - if(get_oid_url(cfile.finfo_selected, &selected_info_url)) { - browser_open_url(selected_info_url); - g_free(selected_info_url); - } - } -} - -gboolean selected_ptree_has_field_url() -{ - /* only OIDs for now */ - if(cfile.finfo_selected->hfinfo->type == FT_OID) - return get_oid_url(cfile.finfo_selected, NULL); - - return FALSE; -} - static gchar * get_text_from_packet_list(gpointer data) { diff --git a/gtk/main.h b/gtk/main.h index 7db0c64241..3a822ce6d0 100644 --- a/gtk/main.h +++ b/gtk/main.h @@ -105,18 +105,6 @@ extern void selected_ptree_info_cb(GtkWidget *widget, gpointer data); */ extern void selected_ptree_ref_cb(GtkWidget *widget, gpointer data); -/** User requested "Field Information" by ptree context menu. - * - * @param widget parent widget (unused) - * @param data unused - */ -extern void selected_ptree_field_url_cb(GtkWidget *widget, gpointer data); - -/** Determine if "Field Information" should be enabled in ptree context menu. - * - */ -extern gboolean selected_ptree_has_field_url(); - /** "Apply as Filter" / "Prepare a Filter" action type. */ typedef enum { MATCH_SELECTED_REPLACE, /**< "Selected" */ diff --git a/gtk/menu.c b/gtk/menu.c index 1add529e5b..000a40ec00 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -523,8 +523,6 @@ static GtkItemFactoryEntry tree_view_menu_items[] = 0, ETHEREAL_STOCK_WIKI), ITEM_FACTORY_STOCK_ENTRY("/Filter Field Reference", NULL, selected_ptree_ref_cb, 0, ETHEREAL_STOCK_INTERNET), - ITEM_FACTORY_STOCK_ENTRY("/Field Information", NULL, selected_ptree_field_url_cb, - 0, ETHEREAL_STOCK_INTERNET), ITEM_FACTORY_ENTRY("/Protocol Preferences...", NULL, properties_cb, 0, NULL, NULL), ITEM_FACTORY_ENTRY("/<separator>", NULL, NULL, 0, "<Separator>", NULL), @@ -2144,8 +2142,6 @@ set_menus_for_selected_tree_row(capture_file *cf) TRUE); set_menu_sensitivity(tree_view_menu_factory, "/Filter Field Reference", TRUE); - set_menu_sensitivity(tree_view_menu_factory, "/Field Information", - selected_ptree_has_field_url()); } else { set_menu_sensitivity(main_menu_factory, "/Go/Go to Corresponding Packet", FALSE); @@ -2163,8 +2159,6 @@ set_menus_for_selected_tree_row(capture_file *cf) FALSE); set_menu_sensitivity(tree_view_menu_factory, "/Filter Field Reference", FALSE); - set_menu_sensitivity(tree_view_menu_factory, "/Field Information", - FALSE); } walk_menu_tree_for_selected_tree_row(tap_menu_tree_root, cf->finfo_selected); |