2008-11-26 [colin] 3.6.1cvs44
[claws.git] / src / main.c
index 5e2480c1e57ca0d9518b3879d47bc610a9fef9a4..dd2092f8afd7d183250ab076fa1d50dcdf5f489a 100644 (file)
 #ifdef HAVE_LIBSM
 #include <X11/SM/SMlib.h>
 #endif
 #ifdef HAVE_LIBSM
 #include <X11/SM/SMlib.h>
 #endif
-#ifdef USE_GNUTLS
-#include <pthread.h>
-#include <gcrypt.h>
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-#endif
 
 #include "wizard.h"
 #ifdef HAVE_STARTUP_NOTIFICATION
 
 #include "wizard.h"
 #ifdef HAVE_STARTUP_NOTIFICATION
@@ -1053,7 +1048,6 @@ int main(int argc, char *argv[])
        GtkUIManager *gui_manager = NULL;
        GSList *plug_list = NULL;
        gboolean never_ran = FALSE;
        GtkUIManager *gui_manager = NULL;
        GSList *plug_list = NULL;
        gboolean never_ran = FALSE;
-
        START_TIMING("startup");
 
        sc_starting = TRUE;
        START_TIMING("startup");
 
        sc_starting = TRUE;
@@ -1444,10 +1438,6 @@ int main(int argc, char *argv[])
        if (claws_crashed())
                main_window_popup(mainwin);
 
        if (claws_crashed())
                main_window_popup(mainwin);
 
-#ifdef USE_GNUTLS
-       gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-#endif
-
 #ifdef HAVE_LIBETPAN
        imap_main_init(prefs_common.skip_ssl_cert_check);
        imap_main_set_timeout(prefs_common.io_timeout_secs);
 #ifdef HAVE_LIBETPAN
        imap_main_init(prefs_common.skip_ssl_cert_check);
        imap_main_set_timeout(prefs_common.io_timeout_secs);