Fix menu removal of accelerators. This has yet to be more FIXMEd (jpeg :D)

[vlc] / src / network / tls.c

diff --git a/src/network/tls.c b/src/network/tls.c
index 3f5a3c992fead7c6fdabe44fbdd337ba277db398..11e3dd2a24861ce817b2de1bd85aed9ba9252aa8 100644 (file)
--- a/src/network/tls.c
+++ b/src/network/tls.c
@@ -26,7 +26,11 @@
  * libvlc interface to the Transport Layer Security (TLS) plugins.
  */
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include "libvlc.h"
 
 #include <vlc_tls.h>
@@ -69,7 +73,7 @@ tls_ServerCreate (vlc_object_t *obj, const char *cert_path,
     if (srv->p_module == NULL)
     {
         msg_Err (srv, "TLS server plugin not available");
-        vlc_object_destroy (srv);
+        vlc_object_release (srv);
         return NULL;
     }
 
@@ -90,7 +94,7 @@ void tls_ServerDelete (tls_server_t *srv)
 
     module_Unneed (srv, srv->p_module);
     vlc_object_detach (srv);
-    vlc_object_destroy (srv);
+    vlc_object_release (srv);
 }
 
 
@@ -185,7 +189,7 @@ tls_ClientCreate (vlc_object_t *obj, int fd, const char *psz_hostname)
     if (cl->p_module == NULL)
     {
         msg_Err (cl, "TLS client plugin not available");
-        vlc_object_destroy (cl);
+        vlc_object_release (cl);
         return NULL;
     }
 
@@ -204,7 +208,7 @@ tls_ClientCreate (vlc_object_t *obj, int fd, const char *psz_hostname)
     msg_Err (cl, "TLS client session handshake error");
 
     module_Unneed (cl, cl->p_module);
-    vlc_object_destroy (cl);
+    vlc_object_release (cl);
     return NULL;
 }
 
@@ -220,5 +224,5 @@ void tls_ClientDelete (tls_session_t *cl)
 
     module_Unneed (cl, cl->p_module);
     vlc_object_detach (cl);
-    vlc_object_destroy (cl);
+    vlc_object_release (cl);
 }