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

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2016-10-09 02:37:37 +02:00
parent 7225ecef98
commit 1e5ceee14a
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/desktopicon.c
View File

@ -106,6 +106,12 @@ struct _DesktopIcon
}; };
/* constants */
static const char _desktop_type_application[] = "Application";
static const char _desktop_type_directory[] = "Directory";
static const char _desktop_type_url[] = "URL";
/* prototypes */ /* prototypes */
static DesktopIcon * _desktopicon_new_do(Desktop * desktop, GdkPixbuf * image, static DesktopIcon * _desktopicon_new_do(Desktop * desktop, GdkPixbuf * image,
char const * name); char const * name);
@ -236,9 +242,9 @@ DesktopIcon * desktopicon_new_application(Desktop * desktop, char const * path,
|| ((p = config_get(config, section, "Hidden")) != NULL || ((p = config_get(config, section, "Hidden")) != NULL
&& strcmp(p, "true") == 0) && strcmp(p, "true") == 0)
|| (p = config_get(config, section, "Type")) == NULL || (p = config_get(config, section, "Type")) == NULL
|| (strcmp(p, "Application") != 0 || (strcmp(p, _desktop_type_application) != 0
&& strcmp(p, "Directory") != 0 && strcmp(p, _desktop_type_directory) != 0
&& strcmp(p, "URL") != 0) && strcmp(p, _desktop_type_url) != 0)
|| (name = config_get(config, section, "Name")) == NULL || (name = config_get(config, section, "Name")) == NULL
|| ((p = config_get(config, section, "NoDisplay")) || ((p = config_get(config, section, "NoDisplay"))
!= NULL && strcmp(p, "true") == 0) != NULL && strcmp(p, "true") == 0)
@ -904,11 +910,11 @@ static void _on_icon_run(gpointer data)
_run_binary(desktopicon); _run_binary(desktopicon);
else if((p = config_get(desktopicon->config, section, "Type")) == NULL) else if((p = config_get(desktopicon->config, section, "Type")) == NULL)
return; return;
else if(strcmp(p, "Application") == 0) else if(strcmp(p, _desktop_type_application) == 0)
_run_application(desktopicon); _run_application(desktopicon);
else if(strcmp(p, "Directory") == 0) else if(strcmp(p, _desktop_type_directory) == 0)
_run_directory(desktopicon); _run_directory(desktopicon);
else if(strcmp(p, "URL") == 0) else if(strcmp(p, _desktop_type_url) == 0)
_run_url(desktopicon); _run_url(desktopicon);
} }
@ -1029,7 +1035,8 @@ static void _run_url(DesktopIcon * desktopicon)
const unsigned int flags = G_SPAWN_SEARCH_PATH; const unsigned int flags = G_SPAWN_SEARCH_PATH;
GError * error = NULL; GError * error = NULL;
if((url = config_get(desktopicon->config, section, "URL")) == NULL) if((url = config_get(desktopicon->config, section, _desktop_type_url))
== NULL)
return; return;
if((argv[2] = strdup(url)) == NULL) if((argv[2] = strdup(url)) == NULL)
desktop_error(desktopicon->desktop, NULL, strerror(errno), 1); desktop_error(desktopicon->desktop, NULL, strerror(errno), 1);