luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[GB.QT4.WEBKIT]

Browse Source 
* BUG: Better error messages in WebSettings.Cache.Clear() method.


git-svn-id: svn://localhost/gambas/trunk@6446 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2014-09-03 12:16:50 +00:00
parent 04f054c93e
commit e5f26eb0d4
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gb.qt4/src/webkit/cwebsettings.cpp
View File

@ -23,6 +23,7 @@
#define __CWEBSETTINGS_CPP
#include <errno.h>
#include <unistd.h>
#include <QNetworkDiskCache>
@ -218,10 +219,25 @@ BEGIN_PROPERTY(WebSettingsCache_Enabled)
END_PROPERTY
static int _clear_error;
static char *_clear_path;
static void remove_file(const char *path)
{
if (unlink(path))
rmdir(path);
if (rmdir(path) == 0)
return;
if (errno == ENOTDIR)
{
if (unlink(path) == 0)
return;
}
if (_clear_error == 0)
{
_clear_error = errno;
_clear_path = GB.NewZeroString(path);
}
}
BEGIN_METHOD_VOID(WebSettingsCache_Clear)
@ -229,8 +245,17 @@ BEGIN_METHOD_VOID(WebSettingsCache_Clear)
if (!_cache_path || !*_cache_path)
return;
_clear_error = 0;
GB.BrowseDirectory(_cache_path, NULL, remove_file);
if (_clear_error)
{
GB.Error("Unable to remove '&1': &2", _clear_path, strerror(_clear_error));
GB.FreeString(&_clear_path);
}
set_cache(_cache_enabled);
END_METHOD