Changeset b4c313573076f43fb5c8e8bf0b104d4615441028

Show
Ignore:
Timestamp:
10/02/08 13:31:27 (8 months ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1202646687 +0000
git-parent:

[49bcf08a4e65e9704566586f04a96d8b24972a1b]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1202646687 +0000
Message:

Use config_GetDataDir() instead of DATA_PATH.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/control/http/http.c

    r2bd0742 rb4c3135  
    264264    if( ( psz_src == NULL ) || ( *psz_src == '\0' ) ) 
    265265    { 
    266         static char const* ppsz_paths[] = { 
     266        const char *data_path = config_GetDataDir (); 
     267        char buf[strlen (data_path) + sizeof ("/http")]; 
     268        snprintf (buf, sizeof (buf), "%s/http", data_path); 
     269 
     270        const char const* ppsz_paths[] = { 
    267271            "share/http", 
    268272            "../share/http", 
    269             DATA_PATH"/http", 
     273            buf, 
    270274            NULL 
    271275        }; 

  • modules/gui/skins2/x11/x11_factory.cpp

    r16f32e1 rb4c3135  
    7575                              + "/skins2" ); 
    7676    m_resourcePath.push_back( (string)"share/skins2" ); 
    77     m_resourcePath.push_back( (string)DATA_PATH + "/skins2" ); 
     77    m_resourcePath.push_back( (string)config_GetDataDir () + "/skins2" ); 
    7878 
    7979    return true; 

  • modules/misc/lua/vlc.c

    r99fab90 rb4c3135  
    433433        { 
    434434            free(ppsz_dir_list[1]); 
    435             if( asprintf( &ppsz_dir_list[1], 
    436                           DATA_PATH DIR_SEP "%s", luadirname ) < 0 ) 
     435            if( asprintf( &ppsz_dir_list[1], "%s" DIR_SEP "%s", 
     436                          config_GetDataDir (), luadirname ) < 0 ) 
    437437                return VLC_ENOMEM; 
    438438        } 

  • modules/misc/notify/notify.c

    r94a6747 rb4c3135  
    220220    } 
    221221    else /* else we show state-of-the art logo */ 
    222         pix = gdk_pixbuf_new_from_file( DATA_PATH "/vlc48x48.png", &p_error ); 
     222    { 
     223        const char *data_path = config_GetDataDir (); 
     224        char buf[strlen (data_path) + sizeof ("/vlc48x48.png")]; 
     225 
     226        snprintf (buf, sizeof (buf), "%s/vlc48x48.png", data_path); 
     227        pix = gdk_pixbuf_new_from_file( buf, &p_error ); 
     228    } 
    223229 
    224230    /* we need to replace '&' with '&amp;' because '&' is a keyword of