diff options
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | src/main.c | 76 |
2 files changed, 44 insertions, 46 deletions
diff --git a/configure.ac b/configure.ac index d73cf8d..5e41aba 100644 --- a/configure.ac +++ b/configure.ac @@ -94,12 +94,12 @@ fi PKG_CHECK_MODULES([jsonglib], [json-glib-1.0 >= 0.8]) PKG_CHECK_MODULES([gthread], [gthread-2.0]) -PKG_CHECK_MODULES([gtk], [gtk+-3.0 >= 3.00], [ -if test x$with_libappindicator != xno; then - PKG_CHECK_MODULES([libappindicator], [appindicator3-0.1], AC_DEFINE(HAVE_LIBAPPINDICATOR, 1, [Define if libappindicator is available]), AC_MSG_WARN([Ubuntu Unity users should consider building with libappindicator])) -fi -], [ -AC_MSG_WARN([gtk+-3.0 not found, trying gtk+-2.0]) +dnl PKG_CHECK_MODULES([gtk], [gtk+-3.0 >= 3.00], [ +dnl if test x$with_libappindicator != xno; then +dnl PKG_CHECK_MODULES([libappindicator], [appindicator3-0.1], AC_DEFINE(HAVE_LIBAPPINDICATOR, 1, [Define if libappindicator is available]), AC_MSG_WARN([Ubuntu Unity users should consider building with libappindicator])) +dnl fi +dnl ], [ +dnl AC_MSG_WARN([gtk+-3.0 not found, trying gtk+-2.0]) PKG_CHECK_MODULES([gtk], [gtk+-2.0 >= 2.16]) if test x$with_libappindicator != xno; then PKG_CHECK_MODULES([libappindicator], [appindicator-0.1], AC_DEFINE(HAVE_LIBAPPINDICATOR, 1, [Define if libappindicator is available]), AC_MSG_WARN([Ubuntu Unity users should consider building with libappindicator])) @@ -107,7 +107,7 @@ fi if test x$with_libunique != xno; then PKG_CHECK_MODULES([unique], [unique-1.0], AC_DEFINE(HAVE_LIBUNIQUE, 1, [Define if libunique is available]), AC_MSG_WARN([libunique is required for opening torrents on gtk+-2.0. not needed for gtk+-3.0 or win32. ])) fi -]) +dnl ]) PKG_CHECK_MODULES([libcurl], [libcurl]) PKG_CHECK_MODULES([gio], [gio-2.0 >= 2.22]) @@ -209,45 +209,6 @@ static void trg_cleanup() curl_global_cleanup(); } -int main(int argc, char *argv[]) -{ -#if WIN32 || !GTK_CHECK_VERSION( 3, 0, 0 ) - gchar **args = convert_args(argc, argv); -#endif - gint exitCode = EXIT_SUCCESS; - TrgClient *client; - - g_type_init(); - g_thread_init(NULL); - gtk_init(&argc, &argv); - - curl_global_init(CURL_GLOBAL_ALL); - client = trg_client_new(); - - g_set_application_name(PACKAGE_NAME); - bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); - textdomain(GETTEXT_PACKAGE); - -#ifdef WIN32 - exitCode = trg_win32_init(client, argc, argv, args); -#else - trg_non_win32_init(); -#if !GTK_CHECK_VERSION( 3, 0, 0 ) && HAVE_LIBUNIQUE - exitCode = trg_libunique_init(client, argc, argv, args); -#elif GTK_CHECK_VERSION( 3, 0, 0 ) - exitCode = trg_gtkapp_init(client, argc, argv); -#else - exitCode = trg_simple_init(client, argc, argv, args); -#endif -#endif - - trg_cleanup(); - - return exitCode; -} - -/* Utility functions. */ - #if WIN32 || !GTK_CHECK_VERSION( 3, 0, 0 ) static gchar **convert_args(int argc, char *argv[]) @@ -290,3 +251,40 @@ static gchar **convert_args(int argc, char *argv[]) } #endif + +int main(int argc, char *argv[]) +{ +#if WIN32 || !GTK_CHECK_VERSION( 3, 0, 0 ) + gchar **args = convert_args(argc, argv); +#endif + gint exitCode = EXIT_SUCCESS; + TrgClient *client; + + g_type_init(); + g_thread_init(NULL); + gtk_init(&argc, &argv); + + curl_global_init(CURL_GLOBAL_ALL); + client = trg_client_new(); + + g_set_application_name(PACKAGE_NAME); + bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + textdomain(GETTEXT_PACKAGE); + +#ifdef WIN32 + exitCode = trg_win32_init(client, argc, argv, args); +#else + trg_non_win32_init(); +#if !GTK_CHECK_VERSION( 3, 0, 0 ) && HAVE_LIBUNIQUE + exitCode = trg_libunique_init(client, argc, argv, args); +#elif GTK_CHECK_VERSION( 3, 0, 0 ) + exitCode = trg_gtkapp_init(client, argc, argv); +#else + exitCode = trg_simple_init(client, argc, argv, args); +#endif +#endif + + trg_cleanup(); + + return exitCode; +} |