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

Rename mimehandler_is_hidden() to mimehandler_is_deleted()

Browse Source 
This is one step further than the specification, and should help
understand the true meaning of this key.

While there, improve mimehandler_can_display() as well.
This commit is contained in:
Pierre Pronchery 2017-12-28 05:07:18 +01:00
parent a78661f953
commit c33ee98dd3
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Desktop/mimehandler.h
View File

@ -72,7 +72,7 @@ MimeHandlerType mimehandler_get_type(MimeHandler * handler);
String const ** mimehandler_get_types(MimeHandler * handler);
String const * mimehandler_get_url(MimeHandler * handler);
int mimehandler_is_hidden(MimeHandler * handler);
int mimehandler_is_deleted(MimeHandler * handler);
/* useful */
int mimehandler_open(MimeHandler * handler, String const * filename);

32
src/mimehandler.c
View File

@ -144,9 +144,15 @@ int mimehandler_can_display(MimeHandler * handler)
{
String const * p;
if((p = config_get(handler->config, SECTION, "NoDisplay")) == NULL)
return 1;
return (string_compare(p, "true") == 0) ? 1 : 0;
if(mimehandler_is_deleted(handler))
return 0;
/* XXX allow setting a value for the desktop environment */
if(config_get(handler->config, SECTION, "OnlyShowIn") != NULL)
return 0;
if((p = config_get(handler->config, SECTION, "NoDisplay")) != NULL
&& string_compare(p, "true") == 0)
return 0;
return 1;
}
@ -463,14 +469,24 @@ String const * mimehandler_get_url(MimeHandler * handler)
}
/* mimehandler_is_hidden */
int mimehandler_is_hidden(MimeHandler * handler)
/* mimehandler_is_deleted */
int mimehandler_is_deleted(MimeHandler * handler)
{
String const * p;
if((p = config_get(handler->config, SECTION, "Hidden")) == NULL)
return 0;
return (string_compare(p, "true") == 0) ? 1 : 0;
if((p = config_get(handler->config, SECTION, "Hidden")) != NULL
&& string_compare(p, "true") == 0)
return 1;
switch(mimehandler_get_type(handler))
{
case MIMEHANDLER_TYPE_APPLICATION:
if(mimehandler_can_execute(handler) == 0)
return 1;
break;
default:
break;
}
return 0;
}