rpms/wireshark
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Disable overlay scrolling

Browse Source
This commit is contained in:
Peter Hatina 2015-06-26 13:13:36 +02:00
parent 3eb69c351a
commit 22f47f873a
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wireshark-0011-Disable-overlay-scrolling.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c
index 66f756f..f05f8de 100644
--- a/ui/gtk/gui_utils.c
+++ b/ui/gtk/gui_utils.c
@@ -770,6 +770,9 @@ setup_scrolled_window(GtkWidget *scrollw)
{
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollw),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+#if GTK_CHECK_VERSION(3,16,0)
+ gtk_scrolled_window_set_overlay_scrolling(GTK_SCROLLED_WINDOW(scrollw), FALSE);
+#endif /* OVERLAY_SCROLLING */
scrolled_windows = g_list_append(scrolled_windows, scrollw);

10
wireshark.spec
View File

@ -21,7 +21,7 @@
Summary: Network traffic analyzer Summary: Network traffic analyzer
Name: wireshark Name: wireshark
Version: 1.12.6 Version: 1.12.6
Release: 2%{?dist} Release: 3%{?dist}
License: GPL+ License: GPL+
Group: Applications/Internet Group: Applications/Internet
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@ -44,7 +44,8 @@ Patch7: wireshark-0007-Install-autoconf-related-file.patch
Patch8: wireshark-0008-move-default-temporary-directory-to-var-tmp.patch Patch8: wireshark-0008-move-default-temporary-directory-to-var-tmp.patch
# Fedora-specific # Fedora-specific
Patch9: wireshark-0009-Fix-paths-in-a-wireshark.desktop-file.patch Patch9: wireshark-0009-Fix-paths-in-a-wireshark.desktop-file.patch
Patch10: wireshark-0010-gdk.patch Patch10: wireshark-0010-gdk.patch
Patch11: wireshark-0011-Disable-overlay-scrolling.patch
Url: http://www.wireshark.org/ Url: http://www.wireshark.org/
BuildRequires: libpcap-devel >= 0.9 BuildRequires: libpcap-devel >= 0.9
@ -166,6 +167,7 @@ Cflags: -I\${includedir}" > wireshark.pc.in
%patch8 -p1 -b .tmp_dir %patch8 -p1 -b .tmp_dir
%patch9 -p1 -b .fix_paths %patch9 -p1 -b .fix_paths
%patch10 -p1 -b .gdk %patch10 -p1 -b .gdk
%patch11 -p1 -b .overlay_scrolling
%build %build
%ifarch s390 s390x sparcv9 sparc64 %ifarch s390 s390x sparcv9 sparc64
@ -413,6 +415,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{_datadir}/aclocal/* %{_datadir}/aclocal/*
%changelog %changelog
* Fri Jun 26 2015 Peter Hatina <phatina@redhat.com> - 1.12.6-3
- Disable overlay scrolling in main window
- Resolves: rhbz#1235830
* Fri Jun 26 2015 Peter Hatina <phatina@redhat.com> - 1.12.6-2 * Fri Jun 26 2015 Peter Hatina <phatina@redhat.com> - 1.12.6-2
- Add symlink plugins/current -> plugins/%{version} - Add symlink plugins/current -> plugins/%{version}