DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Also use emblems for desktop icons

Browse Source
This commit is contained in:
Pierre Pronchery 2012-11-01 04:10:32 +01:00
parent 4d3f84b93e
commit 1f4f674e86
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/desktopicon.c
View File

@ -26,6 +26,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include <System.h> #include <System.h>
#include "vfs.h"
#include "../include/Browser/desktop.h" #include "../include/Browser/desktop.h"
#include "desktopicon.h" #include "desktopicon.h"
#include "../config.h" #include "../config.h"
@ -113,6 +114,8 @@ DesktopIcon * desktopicon_new(Desktop * desktop, char const * name,
{ {
DesktopIcon * desktopicon; DesktopIcon * desktopicon;
struct stat st; struct stat st;
struct stat lst;
struct stat * s = &lst;
Mime * mime; Mime * mime;
char const * mimetype = NULL; char const * mimetype = NULL;
gboolean isdir = FALSE; gboolean isdir = FALSE;
@ -127,24 +130,26 @@ DesktopIcon * desktopicon_new(Desktop * desktop, char const * name,
fprintf(stderr, "DEBUG: %s(%p, \"%s\", \"%s\")\n", __func__, fprintf(stderr, "DEBUG: %s(%p, \"%s\", \"%s\")\n", __func__,
(void *)desktop, name, path); (void *)desktop, name, path);
#endif #endif
if(path != NULL && stat(path, &st) == 0) if(path != NULL && lstat(path, &lst) == 0)
{ {
if(S_ISLNK(lst.st_mode) && stat(path, &st) == 0)
s = &st;
mime = desktop_get_mime(desktop); mime = desktop_get_mime(desktop);
if(S_ISDIR(st.st_mode)) if(S_ISDIR(s->st_mode))
{ {
isdir = TRUE; isdir = TRUE;
image = desktop_get_folder(desktop); image = desktop_get_folder(desktop);
} }
else if(st.st_mode & S_IXUSR) else if(s->st_mode & S_IXUSR)
{ {
/* FIXME use access() for this */ /* FIXME use access() for this */
isexec = TRUE; isexec = TRUE;
mime_icons(mime, "application/x-executable", image = vfs_mime_icon(mime, "application/x-executable",
DESKTOPICON_ICON_SIZE, &image, -1); s, DESKTOPICON_ICON_SIZE);
} }
else if((mimetype = mime_type(mime, path)) != NULL) else if((mimetype = mime_type(mime, path)) != NULL)
mime_icons(mime, mimetype, DESKTOPICON_ICON_SIZE, image = vfs_mime_icon(mime, mimetype, &lst,
&image, -1); DESKTOPICON_ICON_SIZE);
} }
if(name == NULL) if(name == NULL)
{ {