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

Remove dead code

Browse Source
This commit is contained in:
Pierre Pronchery 2021-01-24 04:56:34 +01:00
parent 841c85f880
commit df9f35d4ff
1 changed files with 6 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/desktop/desktopicon.c
View File

@ -215,10 +215,7 @@ DesktopIcon * desktopicon_new(Desktop * desktop, char const * name,
/* desktopicon_new_application */ /* desktopicon_new_application */
static int _new_application_access(char const * path, int mode); static GdkPixbuf * _new_application_icon(Desktop * desktop, String const * icon,
static int _new_application_access_path(char const * path,
char const * filename, int mode);
static GdkPixbuf * _new_application_icon(Desktop * desktop, char const * icon,
char const * datadir); char const * datadir);
DesktopIcon * desktopicon_new_application(Desktop * desktop, char const * path, DesktopIcon * desktopicon_new_application(Desktop * desktop, char const * path,
@ -227,12 +224,12 @@ DesktopIcon * desktopicon_new_application(Desktop * desktop, char const * path,
DesktopIcon * desktopicon; DesktopIcon * desktopicon;
MimeHandler * mime; MimeHandler * mime;
MimeHandlerType type; MimeHandlerType type;
char const * name; String const * name;
#if GTK_CHECK_VERSION(2, 12, 0) #if GTK_CHECK_VERSION(2, 12, 0)
char const * comment; String const * comment;
#endif #endif
char const * icon; String const * icon;
char const * p; String const * p;
GdkPixbuf * image = NULL; GdkPixbuf * image = NULL;
#ifdef DEBUG #ifdef DEBUG
@ -286,56 +283,7 @@ DesktopIcon * desktopicon_new_application(Desktop * desktop, char const * path,
return desktopicon; return desktopicon;
} }
static int _new_application_access(char const * path, int mode) static GdkPixbuf * _new_application_icon(Desktop * desktop, String const * icon,
{
int ret = -1;
char const * p;
char * q;
size_t i;
size_t j;
if(path[0] == '/')
return access(path, mode);
if((p = getenv("PATH")) == NULL)
return 0;
if((q = strdup(p)) == NULL)
return 0;
errno = ENOENT;
for(i = 0, j = 0;; i++)
if(q[i] == '\0')
{
ret = _new_application_access_path(&q[j], path, mode);
break;
}
else if(q[i] == ':')
{
q[i] = '\0';
if((ret = _new_application_access_path(&q[j], path,
mode)) == 0)
break;
j = i + 1;
}
free(q);
return ret;
}
static int _new_application_access_path(char const * path,
char const * filename, int mode)
{
int ret;
char * p;
size_t len;
len = strlen(path) + 1 + strlen(filename) + 1;
if((p = malloc(len)) == NULL)
return -1;
snprintf(p, len, "%s/%s", path, filename);
ret = access(p, mode);
free(p);
return ret;
}
static GdkPixbuf * _new_application_icon(Desktop * desktop, char const * icon,
char const * datadir) char const * datadir)
{ {
const char pixmaps[] = "/pixmaps/"; const char pixmaps[] = "/pixmaps/";