forked from enlightenment/efl
parent
b784b8142a
commit
0de6ba55b1
|
@ -169,9 +169,9 @@ efreet_desktop_cache_check(Efreet_Desktop *desktop)
|
|||
|
||||
/* have we modified this file since we last read it in? */
|
||||
if ((desktop->cache_flush != cache_flush) ||
|
||||
(stat(desktop->orig_path, &buf) ||
|
||||
(buf.st_mtime > desktop->load_time)))
|
||||
return 0;
|
||||
(stat(desktop->orig_path, &buf) ||
|
||||
(buf.st_mtime > desktop->load_time)))
|
||||
return 0;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
@ -194,20 +194,20 @@ efreet_desktop_get(const char *file)
|
|||
if (desktop)
|
||||
{
|
||||
if (efreet_desktop_cache_check(desktop))
|
||||
{
|
||||
desktop->ref++;
|
||||
{
|
||||
desktop->ref++;
|
||||
return desktop;
|
||||
}
|
||||
}
|
||||
|
||||
efreet_desktop_clear(desktop);
|
||||
if (efreet_desktop_read(desktop))
|
||||
{
|
||||
desktop->ref++;
|
||||
desktop->cache_flush = cache_flush;
|
||||
{
|
||||
desktop->ref++;
|
||||
desktop->cache_flush = cache_flush;
|
||||
return desktop;
|
||||
}
|
||||
}
|
||||
|
||||
desktop->cached = 0;
|
||||
desktop->cached = 0;
|
||||
ecore_hash_remove(efreet_desktop_cache, file);
|
||||
efreet_desktop_free(desktop);
|
||||
}
|
||||
|
@ -236,9 +236,9 @@ efreet_desktop_empty_new(const char *file)
|
|||
|
||||
desktop->orig_path = strdup(file);
|
||||
desktop->load_time = ecore_time_get();
|
||||
|
||||
|
||||
desktop->ref = 1;
|
||||
|
||||
|
||||
return desktop;
|
||||
}
|
||||
|
||||
|
@ -264,10 +264,10 @@ efreet_desktop_new(const char *file)
|
|||
efreet_desktop_free(desktop);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
desktop->ref = 1;
|
||||
desktop->cache_flush = cache_flush;
|
||||
|
||||
|
||||
return desktop;
|
||||
}
|
||||
|
||||
|
@ -418,11 +418,11 @@ efreet_desktop_save(Efreet_Desktop *desktop)
|
|||
else
|
||||
{
|
||||
if (desktop != ecore_hash_get(efreet_desktop_cache, desktop->orig_path))
|
||||
{
|
||||
desktop->cached = 1;
|
||||
{
|
||||
desktop->cached = 1;
|
||||
ecore_hash_set(efreet_desktop_cache,
|
||||
strdup(desktop->orig_path), desktop);
|
||||
}
|
||||
strdup(desktop->orig_path), desktop);
|
||||
}
|
||||
}
|
||||
}
|
||||
efreet_ini_free(ini);
|
||||
|
@ -439,10 +439,10 @@ int
|
|||
efreet_desktop_save_as(Efreet_Desktop *desktop, const char *file)
|
||||
{
|
||||
if (desktop == ecore_hash_get(efreet_desktop_cache, desktop->orig_path))
|
||||
{
|
||||
desktop->cached = 0;
|
||||
{
|
||||
desktop->cached = 0;
|
||||
ecore_hash_remove(efreet_desktop_cache, desktop->orig_path);
|
||||
}
|
||||
}
|
||||
FREE(desktop->orig_path);
|
||||
desktop->orig_path = strdup(file);
|
||||
return efreet_desktop_save(desktop);
|
||||
|
@ -461,10 +461,10 @@ efreet_desktop_free(Efreet_Desktop *desktop)
|
|||
|
||||
desktop->ref--;
|
||||
if (desktop->ref > 0) return;
|
||||
|
||||
|
||||
if (desktop->cached)
|
||||
ecore_hash_remove(efreet_desktop_cache, desktop->orig_path);
|
||||
|
||||
ecore_hash_remove(efreet_desktop_cache, desktop->orig_path);
|
||||
|
||||
IF_FREE(desktop->orig_path);
|
||||
|
||||
IF_FREE(desktop->name);
|
||||
|
@ -757,7 +757,7 @@ efreet_desktop_string_list_join(Ecore_List *list)
|
|||
void
|
||||
efreet_desktop_cache_flush(void)
|
||||
{
|
||||
cache_flush++;
|
||||
cache_flush++;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1134,7 +1134,7 @@ efreet_desktop_command_progress_get(Efreet_Desktop *desktop, Ecore_List *files,
|
|||
}
|
||||
|
||||
if (command->num_pending == 0) efreet_desktop_command_build(command);
|
||||
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -1288,7 +1288,7 @@ efreet_desktop_command_append_quoted(char *dest, int *size, int *len, char *src)
|
|||
{
|
||||
if (*p == '\'')
|
||||
dest = efreet_string_append_char(dest, size, len, '\\');
|
||||
|
||||
|
||||
dest = efreet_string_append_char(dest, size, len, *p);
|
||||
p++;
|
||||
}
|
||||
|
@ -1301,7 +1301,6 @@ efreet_desktop_command_append_quoted(char *dest, int *size, int *len, char *src)
|
|||
return dest;
|
||||
}
|
||||
|
||||
|
||||
static char *
|
||||
efreet_desktop_command_append_multiple(char *dest, int *size, int *len,
|
||||
Efreet_Desktop_Command *command,
|
||||
|
|
Loading…
Reference in New Issue