summaryrefslogtreecommitdiff
path: root/ui/gtk/main.c
diff options
context:
space:
mode:
authorBalint Reczey <balint@balintreczey.hu>2016-06-13 20:01:08 -0700
committerAnders Broman <a.broman58@gmail.com>2016-06-14 04:50:16 +0000
commitaf6936c9ce1fe13081cdee1aa356dfb867235b92 (patch)
tree298bc5e5a72f3b17a17f0a69db260b52a3870ed1 /ui/gtk/main.c
parent048ba7a3a39e691d4c3e35501904daf52e5c3110 (diff)
downloadwireshark-af6936c9ce1fe13081cdee1aa356dfb867235b92.tar.gz
GTK: Disable liboverlay-scrollbar that crashed wireshark on Ubuntu
Bug: 11400 Change-Id: I40d901ab3ef43a61ef984014dabc0547605ef77c Reviewed-on: https://code.wireshark.org/review/15888 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/gtk/main.c')
-rw-r--r--ui/gtk/main.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 378d4ab37a..320b32d6ba 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -2470,6 +2470,13 @@ main(int argc, char *argv[])
g_thread_init(NULL);
#endif
+ /* Disable liboverlay scrollbar which broke Wireshark on Ubuntu */
+#if !GTK_CHECK_VERSION(3,16,0)
+ if (NULL == g_getenv("LIBOVERLAY_SCROLLBAR")) {
+ g_setenv("LIBOVERLAY_SCROLLBAR", "0", FALSE);
+ }
+#endif
+
/* Set the current locale according to the program environment.
* We haven't localized anything, but some GTK widgets are localized
* (the file selection dialogue, for example).