Branch: refs/heads/master Author: Atanas Beloborodov arrtedone@gmail.com Committer: Matthew Brush matt@geany.org Date: Fri, 26 Apr 2013 00:30:09 UTC Commit: a3da0467d4808ec729667b866f13eda2e480d43e https://github.com/geany/geany/commit/a3da0467d4808ec729667b866f13eda2e480d4...

Log Message: ----------- Add version check around deprecated g_thread_init() call.

g_thread_init has been deprecated since GLib version 2.32

Modified Paths: -------------- src/main.c

Modified: src/main.c 8 files changed, 6 insertions(+), 2 deletions(-) =================================================================== @@ -1050,12 +1050,16 @@ gint main(gint argc, gchar **argv) #endif parse_command_line_options(&argc, &argv);

+#if ! GLIB_CHECK_VERSION(2, 32, 0) /* Initialize GLib's thread system in case any plugins want to use it or their - * dependencies (e.g. WebKit, Soup, ...) */ + * dependencies (e.g. WebKit, Soup, ...). Deprecated since GLIB 2.32. */ if (!g_thread_supported()) g_thread_init(NULL); - /* removed as signal handling was wrong, see signal_cb() +#endif + + /* removed as signal handling was wrong, see signal_cb() signal(SIGTERM, signal_cb); */ + #ifdef G_OS_UNIX /* ignore SIGPIPE signal for preventing sudden death of program */ signal(SIGPIPE, SIG_IGN);

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).