diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-11-12 19:12:40 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-11-12 19:12:40 +0000 |
| commit | 4299d4e26a41ff57fb7921de225037147fb9191d (patch) | |
| tree | 1901c32f6037c0b244ffd79f36f37827c74b0c52 | |
| parent | a97460a39c7e41019d86431b7d9ae49ae234fb63 (diff) | |
| download | wireshark-4299d4e26a41ff57fb7921de225037147fb9191d.tar.gz | |
Try to fix compilation for GLib < 2.30.
svn path=/trunk/; revision=53279
| -rw-r--r-- | ui/tap-sequence-analysis.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/tap-sequence-analysis.c b/ui/tap-sequence-analysis.c index dfbf2f3c3b..9a88184dee 100644 --- a/ui/tap-sequence-analysis.c +++ b/ui/tap-sequence-analysis.c @@ -324,7 +324,12 @@ static void overwrite (GString *gstr, char *text_to_insert, guint32 p1, guint32 if (len > ins_len) { len = ins_len; } else if (len < ins_len) { +#if GLIB_CHECK_VERSION(2,30,0) ins_str = g_utf8_substring(text_to_insert, 0, len); +#else + gchar *end = g_utf8_offset_to_pointer(text_to_insert, len); + ins_str = g_strndup(text_to_insert, end - tex_to_insert); +#endif } if (!ins_str) ins_str = g_strdup(text_to_insert); |