X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgtlsbackend.c;h=aa46e3a3c6df90b924fd780012f32809d1c07259;hb=356a3987cee7ceddcb3fe623edf0bd2881895add;hp=13fff178aa0d340a8f1d962b0ba34d0fa6520162;hpb=1b033919845cef366842373da9f1cfb56f522d01;p=platform%2Fupstream%2Fglib.git

diff --git a/gio/gtlsbackend.c b/gio/gtlsbackend.c
index 13fff17..aa46e3a 100644
--- a/gio/gtlsbackend.c
+++ b/gio/gtlsbackend.c
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -67,8 +65,9 @@
 /**
  * GTlsBackend:
  *
- * Type implemented by TLS #GIOModules to provide access to additional
- * TLS-related types.
+ * TLS (Transport Layer Security, aka SSL) backend. This is an
+ * internal type used to coordinate the different classes implemented
+ * by a TLS backend.
  *
  * Since: 2.28
  */
@@ -80,36 +79,6 @@ g_tls_backend_default_init (GTlsBackendInterface *iface)
 {
 }
 
-static gpointer
-get_default_tls_backend (gpointer arg)
-{
-  const char *use_this;
-  GList *extensions;
-  GIOExtensionPoint *ep;
-  GIOExtension *extension;
-
-  _g_io_modules_ensure_loaded ();
-
-  ep = g_io_extension_point_lookup (G_TLS_BACKEND_EXTENSION_POINT_NAME);
-
-  use_this = g_getenv ("GIO_USE_TLS");
-  if (use_this)
-    {
-      extension = g_io_extension_point_get_extension_by_name (ep, use_this);
-      if (extension)
-	return g_object_new (g_io_extension_get_type (extension), NULL);
-    }
-
-  extensions = g_io_extension_point_get_extensions (ep);
-  if (extensions)
-    {
-      extension = extensions->data;
-      return g_object_new (g_io_extension_get_type (extension), NULL);
-    }
-
-  return NULL;
-}
-
 /**
  * g_tls_backend_get_default:
  *
@@ -122,9 +91,8 @@ get_default_tls_backend (gpointer arg)
 GTlsBackend *
 g_tls_backend_get_default (void)
 {
-  static GOnce once_init = G_ONCE_INIT;
-
-  return g_once (&once_init, get_default_tls_backend, NULL);
+  return _g_io_module_get_default (G_TLS_BACKEND_EXTENSION_POINT_NAME,
+				   "GIO_USE_TLS", NULL);
 }
 
 /**
@@ -134,7 +102,7 @@ g_tls_backend_get_default (void)
  * Checks if TLS is supported; if this returns %FALSE for the default
  * #GTlsBackend, it means no "real" TLS backend is available.
  *
- * Return value: whether or not TLS is supported
+ * Returns: whether or not TLS is supported
  *
  * Since: 2.28
  */
@@ -155,7 +123,7 @@ g_tls_backend_supports_tls (GTlsBackend *backend)
  *
  * Gets the default #GTlsDatabase used to verify TLS connections.
  *
- * Return value: (transfer full): the default database, which should be
+ * Returns: (transfer full): the default database, which should be
  *               unreffed when done.
  *
  * Since: 2.30
@@ -178,7 +146,7 @@ g_tls_backend_get_default_database (GTlsBackend *backend)
  *
  * Gets the #GType of @backend's #GTlsCertificate implementation.
  *
- * Return value: the #GType of @backend's #GTlsCertificate
+ * Returns: the #GType of @backend's #GTlsCertificate
  *   implementation.
  *
  * Since: 2.28
@@ -195,7 +163,7 @@ g_tls_backend_get_certificate_type (GTlsBackend *backend)
  *
  * Gets the #GType of @backend's #GTlsClientConnection implementation.
  *
- * Return value: the #GType of @backend's #GTlsClientConnection
+ * Returns: the #GType of @backend's #GTlsClientConnection
  *   implementation.
  *
  * Since: 2.28
@@ -212,7 +180,7 @@ g_tls_backend_get_client_connection_type (GTlsBackend *backend)
  *
  * Gets the #GType of @backend's #GTlsServerConnection implementation.
  *
- * Return value: the #GType of @backend's #GTlsServerConnection
+ * Returns: the #GType of @backend's #GTlsServerConnection
  *   implementation.
  *
  * Since: 2.28
@@ -227,9 +195,9 @@ g_tls_backend_get_server_connection_type (GTlsBackend *backend)
  * g_tls_backend_get_file_database_type:
  * @backend: the #GTlsBackend
  *
- * Gets the #GTyep of @backend's #GTlsFileDatabase implementation.
+ * Gets the #GType of @backend's #GTlsFileDatabase implementation.
  *
- * Return value: the #GType of backend's #GTlsFileDatabase implementation.
+ * Returns: the #GType of backend's #GTlsFileDatabase implementation.
  *
  * Since: 2.30
  */