diff options
| author | sfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-04-07 05:22:54 +0000 |
|---|---|---|
| committer | sfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-04-07 05:22:54 +0000 |
| commit | c3af6aae8a8dc5a8d82dcb207ff75f6ab3565cc7 (patch) | |
| tree | 3f861f04f60e8872bcf7f82f56de654af93a7590 /epan/dissectors/packet-jxta.c | |
| parent | b8844e230b5391353b659cb5bcd87a4c8b94dc89 (diff) | |
- Remove GLIB1 code
- Change ugly GLIB version checking statements to GLIB_CHECK_VERSION
- Remove ws_strsplit files because we no longer need to borrow GLIB2's
g_strsplit code for the no longer supported GLIB1 builds
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24829 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-jxta.c')
| -rw-r--r-- | epan/dissectors/packet-jxta.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index b25fd3dcfe..a3bc5d4257 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -49,7 +49,6 @@ #include <epan/prefs.h> #include <epan/tap.h> #include <epan/emem.h> -#include <epan/ws_strsplit.h> #include "packet-jxta.h" @@ -2263,15 +2262,11 @@ static int dissect_media( const gchar* fullmediatype, tvbuff_t * tvb, packet_inf pinfo->match_string = ep_strdup(mediatype); /* force to lower case */ -#if GLIB_MAJOR_VERSION < 2 - g_strdown(mediatype); -#else { gchar *mediatype_lowercase = g_ascii_strdown(mediatype, -1); mediatype = ep_strdup(mediatype_lowercase); g_free(mediatype_lowercase); } -#endif if (0 == strcmp("application/x-jxta-tls-block", mediatype)) { /* If we recognize it as a TLS packet then we shuffle it off to ssl dissector. */ |