diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2005-12-12 14:05:18 +0000 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2005-12-12 14:05:18 +0000 |
| commit | 1c4056a3b6d0ae54773c16231d75b635db618611 (patch) | |
| tree | f25006616989e0c4134a2c39e574df120c6219aa | |
| parent | 756f7354e925f6be0e8a344e2038c60ccf707eb9 (diff) | |
| download | weechat-1c4056a3b6d0ae54773c16231d75b635db618611.zip | |
Added missing #ifdef HAVE_GNUTLS
| -rw-r--r-- | src/common/command.c | 13 | ||||
| -rw-r--r-- | src/common/session.c | 4 | ||||
| -rw-r--r-- | weechat/src/common/command.c | 13 | ||||
| -rw-r--r-- | weechat/src/common/session.c | 4 |
4 files changed, 6 insertions, 28 deletions
diff --git a/src/common/command.c b/src/common/command.c index 4eaaed094..1c76fa02f 100644 --- a/src/common/command.c +++ b/src/common/command.c @@ -3122,19 +3122,6 @@ weechat_cmd_upgrade (t_gui_window *window, int argc, char **argv) fifo_remove (); if (weechat_log_file) fclose (weechat_log_file); - for (ptr_server = irc_servers; ptr_server; - ptr_server = ptr_server->next_server) - { - if (ptr_server->ssl_connected) - { - gnutls_bye (ptr_server->gnutls_sess, GNUTLS_SHUT_RDWR); - gnutls_deinit (ptr_server->gnutls_sess); - } - } -#ifdef HAVE_GNUTLS - gnutls_certificate_free_credentials (gnutls_xcred); - gnutls_global_deinit(); -#endif execvp (exec_args[0], exec_args); diff --git a/src/common/session.c b/src/common/session.c index 371ef1728..e86ce4f9b 100644 --- a/src/common/session.c +++ b/src/common/session.c @@ -194,8 +194,10 @@ int session_save_servers (FILE *file) { int rc; +#ifdef HAVE_GNUTLS void *session_data; size_t session_size; +#endif t_irc_server *ptr_server; t_irc_channel *ptr_channel; @@ -739,10 +741,10 @@ session_load_server (FILE *file) { int object_id, rc; char *server_name; +#ifdef HAVE_GNUTLS void *session_data; size_t session_size; int session_size_int; -#ifdef HAVE_GNUTLS const int cert_type_prio[] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 }; #endif diff --git a/weechat/src/common/command.c b/weechat/src/common/command.c index 4eaaed094..1c76fa02f 100644 --- a/weechat/src/common/command.c +++ b/weechat/src/common/command.c @@ -3122,19 +3122,6 @@ weechat_cmd_upgrade (t_gui_window *window, int argc, char **argv) fifo_remove (); if (weechat_log_file) fclose (weechat_log_file); - for (ptr_server = irc_servers; ptr_server; - ptr_server = ptr_server->next_server) - { - if (ptr_server->ssl_connected) - { - gnutls_bye (ptr_server->gnutls_sess, GNUTLS_SHUT_RDWR); - gnutls_deinit (ptr_server->gnutls_sess); - } - } -#ifdef HAVE_GNUTLS - gnutls_certificate_free_credentials (gnutls_xcred); - gnutls_global_deinit(); -#endif execvp (exec_args[0], exec_args); diff --git a/weechat/src/common/session.c b/weechat/src/common/session.c index 371ef1728..e86ce4f9b 100644 --- a/weechat/src/common/session.c +++ b/weechat/src/common/session.c @@ -194,8 +194,10 @@ int session_save_servers (FILE *file) { int rc; +#ifdef HAVE_GNUTLS void *session_data; size_t session_size; +#endif t_irc_server *ptr_server; t_irc_channel *ptr_channel; @@ -739,10 +741,10 @@ session_load_server (FILE *file) { int object_id, rc; char *server_name; +#ifdef HAVE_GNUTLS void *session_data; size_t session_size; int session_size_int; -#ifdef HAVE_GNUTLS const int cert_type_prio[] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 }; #endif |