[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 04/16: grc: Add check for GTK initializatio
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 04/16: grc: Add check for GTK initialization |
Date: |
Sun, 26 Apr 2015 23:18:03 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 839b933dd40f876a3a85351462575bac46ffd441
Author: Doug Geiger <address@hidden>
Date: Tue Apr 21 21:36:34 2015 -0400
grc: Add check for GTK initialization
Ensure GTK can be initialized before application start-up (e.g. if X11
forwarding is not enabled on an SSH connection) to avoid a fatal error (e.g.
segfault)
---
grc/scripts/gnuradio-companion | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion
index 7a407ea..b8b960a 100755
--- a/grc/scripts/gnuradio-companion
+++ b/grc/scripts/gnuradio-companion
@@ -55,6 +55,14 @@ def show_gtk_error_dialog(title, message):
d.run()
+def check_gtk_init():
+ try:
+ gtk.init_check()
+ except RuntimeError:
+ print 'GTK initialization failed - bailing'
+ exit(-1)
+
+
def check_gnuradio_import():
try:
from gnuradio import gr
@@ -108,6 +116,7 @@ def main():
if __name__ == '__main__':
+ check_gtk_init()
check_gnuradio_import()
ensure_blocks_path()
main()
- [Commit-gnuradio] [gnuradio] branch master updated (c0a88be -> 327f070), git, 2015/04/26
- [Commit-gnuradio] [gnuradio] 16/16: Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg', git, 2015/04/26
- [Commit-gnuradio] [gnuradio] 14/16: Merge remote-tracking branch 'tom/qtgui/range_type', git, 2015/04/26
- [Commit-gnuradio] [gnuradio] 15/16: Merge remote-tracking branch 'nowls/burst_shaping', git, 2015/04/26
- [Commit-gnuradio] [gnuradio] 04/16: grc: Add check for GTK initialization,
git <=
- [Commit-gnuradio] [gnuradio] 13/16: Merge remote-tracking branch 'mmueller/pwr_squelch_add_tags', git, 2015/04/26
- [Commit-gnuradio] [gnuradio] 12/16: Merge remote-tracking branch 'tom/ctrlport/fixes1', git, 2015/04/26
- [Commit-gnuradio] [gnuradio] 06/16: controlport: use proper default return value from prefs get_bool., git, 2015/04/26
- [Commit-gnuradio] [gnuradio] 08/16: digital: fix skipped sample handling in burst_shaper, git, 2015/04/26
- [Commit-gnuradio] [gnuradio] 05/16: qtgui: improved type checking for range block and simplifies python., git, 2015/04/26
- [Commit-gnuradio] [gnuradio] 02/16: controlport: fixed up performance monitor., git, 2015/04/26
- [Commit-gnuradio] [gnuradio] 03/16: qtgui: adds Type setting for Range widget., git, 2015/04/26
- [Commit-gnuradio] [gnuradio] 01/16: controlport: fixed controlport probes., git, 2015/04/26
- [Commit-gnuradio] [gnuradio] 07/16: analog: Power Squelch now emit tags on start/end of bursts, git, 2015/04/26
- [Commit-gnuradio] [gnuradio] 09/16: digital: added tag propagation to burst_shaper blocks, git, 2015/04/26