if( ( psz_src == NULL ) || ( *psz_src == '\0' ) )
{
- static char const* ppsz_paths[] = {
+ const char *data_path = config_GetDataDir ();
+ char buf[strlen (data_path) + sizeof ("/http")];
+ snprintf (buf, sizeof (buf), "%s/http", data_path);
+
+ const char const* ppsz_paths[] = {
"share/http",
"../share/http",
- DATA_PATH"/http",
+ buf,
NULL
};
unsigned i;
m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_datadir +
+ "/skins2" );
m_resourcePath.push_back( (string)"share/skins2" );
- m_resourcePath.push_back( (string)DATA_PATH + "/skins2" );
+ m_resourcePath.push_back( (string)config_GetDataDir () + "/skins2" );
return true;
}
|| !S_ISDIR( stat_info.st_mode ) )
{
free(ppsz_dir_list[1]);
- if( asprintf( &ppsz_dir_list[1],
- DATA_PATH DIR_SEP "%s", luadirname ) < 0 )
+ if( asprintf( &ppsz_dir_list[1], "%s" DIR_SEP "%s",
+ config_GetDataDir (), luadirname ) < 0 )
return VLC_ENOMEM;
}
}
free( psz_arturl );
}
else /* else we show state-of-the art logo */
- pix = gdk_pixbuf_new_from_file( DATA_PATH "/vlc48x48.png", &p_error );
+ {
+ const char *data_path = config_GetDataDir ();
+ char buf[strlen (data_path) + sizeof ("/vlc48x48.png")];
+
+ snprintf (buf, sizeof (buf), "%s/vlc48x48.png", data_path);
+ pix = gdk_pixbuf_new_from_file( buf, &p_error );
+ }
/* we need to replace '&' with '&' because '&' is a keyword of
* notification-daemon parser */