[uzbl] Handle errors in event handlers in uzbl-tabbed
Ben Boeckel
mathstuf at fedoraproject.org
Thu Jun 20 06:17:16 UTC 2013
commit cf491fa2777aadbeb9878a63d234d22cded14bd3
Author: Ben Boeckel <mathstuf at gmail.com>
Date: Thu Jun 20 02:16:42 2013 -0400
Handle errors in event handlers in uzbl-tabbed
uzbl-tab-index.patch | 19 +++++++++++++++++++
uzbl.spec | 3 +++
2 files changed, 22 insertions(+), 0 deletions(-)
---
diff --git a/uzbl-tab-index.patch b/uzbl-tab-index.patch
new file mode 100644
index 0000000..5423d8c
--- /dev/null
+++ b/uzbl-tab-index.patch
@@ -0,0 +1,19 @@
+diff -u -r -U5 uzbl-228bc38cbd/bin/uzbl-tabbed uzbl-228bc38cbd.tab-index/bin/uzbl-tabbed
+--- uzbl-228bc38cbd/bin/uzbl-tabbed 2012-04-28 14:27:17.000000000 -0400
++++ uzbl-228bc38cbd.tab-index/bin/uzbl-tabbed 2013-06-20 02:15:17.813822801 -0400
+@@ -398,11 +398,14 @@
+ method = getattr(self, message_type.lower(), None)
+
+ if method is None:
+ return False
+
+- method(*args)
++ try:
++ method(*args)
++ except:
++ print_exc()
+ return True
+
+ class GlobalEventDispatcher(EventDispatcher):
+ def __init__(self, uzbl_tabbed):
+ self.uzbl_tabbed = uzbl_tabbed
diff --git a/uzbl.spec b/uzbl.spec
index f5a4496..f17c442 100644
--- a/uzbl.spec
+++ b/uzbl.spec
@@ -25,6 +25,7 @@ Patch0: %{name}-makefile.patch
Patch1: 0001-Fedora-specific-error-messages-on-no-configs.patch
# Upstream has moved on. Will drop when updated.
Patch2: uzbl-null-window.patch
+Patch3: uzbl-tab-index.patch
%if %{with gtk3}
BuildRequires: webkitgtk3-devel
@@ -109,6 +110,7 @@ Highlighting files for uzbl's configuration.
%patch0 -p1 -b .makefile
%patch1 -p1 -b .fedora
%patch2 -p1 -b .null-window
+%patch3 -p1 -b .tab-index
mkdir -p icons/hicolor/32x32/apps
mv examples/data/uzbl.png icons/hicolor/32x32/apps
@@ -194,6 +196,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Thu Jun 20 2013 Ben Boeckel <mathstuf at gmail.com> - 0-0.32.20120514git228bc38cbd
- Fix NULL-ptr dereference when setting the UZBL_URI window property
+- Handle errors in uzbl-tabbed
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.31.20120514228bc38cbd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list