Changeset 9b6ca602809f373e1770e32720f7961c3a0febed

Timestamp:

05/05/08 22:34:22 (5 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1210019662 +0300

git-parent:

[f2ba521bb2c966aecce1ed890072c7ff6160e5d6]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1210018610 +0300

Message:

Use config_Get*Dir

Files:

• modules/gui/skins2/win32/win32_factory.cpp (modified) (1 diff)
• modules/gui/skins2/x11/x11_factory.cpp (modified) (1 diff)
• modules/misc/gnutls.c (modified) (2 diffs)
• modules/misc/lua/vlc.c (modified) (2 diffs)

modules/gui/skins2/win32/win32_factory.cpp

@@ -226 +226 @@
-
-    // Initialize the resource path
-
-
+
+
+
-    m_resourcePath.push_back( (string)config_GetDataDir() +
-                              "\\skins" );

modules/gui/skins2/x11/x11_factory.cpp

@@ -72 +72 @@
-
-    // Initialize the resource path
-
-
+
+
+
-    m_resourcePath.push_back( (string)"share/skins2" );
-    m_resourcePath.push_back( (string)config_GetDataDir () + "/skins2" );

modules/misc/gnutls.c

@@ -644 +644 @@
-    p_sys->session.b_handshaked = false;
-
-    const char *homedir = obj->p_libvlc->psz_datadir,
-               *datadir = config_GetDataDir ();
-    size_t l1 = strlen (homedir), l2 = strlen (datadir);
-    char path[((l1 > l2) ? l1 : l2) + sizeof ("/ca-certificates.crt")];
-    //                              > sizeof ("/ssl/private")
-    //                              > sizeof ("/ssl/certs")
-
-    i_val = gnutls_certificate_allocate_credentials (&p_sys->x509_cred);
-    if (i_val != 0)
@@ -659 +652 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    p_session->pf_handshake = gnutls_HandshakeAndValidate;
-    /*p_session->pf_handshake = gnutls_ContinueHandshake;*/
-
-    sprintf (path, "%s/ssl/private", homedir);
-    gnutls_Addx509Directory (VLC_OBJECT (p_session), p_sys->x509_cred,
-                             path, true);
-
-    i_val = gnutls_init (&p_sys->session.session, GNUTLS_CLIENT);

modules/misc/lua/vlc.c

@@ -165 +165 @@
-int vlclua_configdir( lua_State *L )
-{
-
+
+
+
-    return 1;
-}
-int vlclua_cachedir( lua_State *L )
-{
-
+
+
+
-    return 1;
-}
@@ -401 +405 @@
-{
-    int i = 0;
+    char *datadir = config_GetUserDataDir();
+    if( datadir == NULL )
+        return VLC_ENOMEM;
+
-    if( asprintf( &ppsz_dir_list[i], "%s" DIR_SEP "lua" DIR_SEP "%s",
-
+
+
+
-        return VLC_ENOMEM;
+    }
+    free( datadir );
-    i++;
-