Let less code be conditional
This commit is contained in:
parent
90df0c3824
commit
e4b2e93d70
|
@ -896,16 +896,17 @@ static int _icons_homescreen(Desktop * desktop)
|
||||||
{
|
{
|
||||||
DesktopIcon * desktopicon;
|
DesktopIcon * desktopicon;
|
||||||
GdkPixbuf * icon;
|
GdkPixbuf * icon;
|
||||||
#ifdef EMBEDDED
|
|
||||||
char const * paths[] =
|
char const * paths[] =
|
||||||
{
|
{
|
||||||
|
#ifdef EMBEDDED
|
||||||
|
/* FIXME let this be configurable */
|
||||||
DATADIR "/applications/deforaos-phone-contacts.desktop",
|
DATADIR "/applications/deforaos-phone-contacts.desktop",
|
||||||
DATADIR "/applications/deforaos-phone-dialer.desktop",
|
DATADIR "/applications/deforaos-phone-dialer.desktop",
|
||||||
DATADIR "/applications/deforaos-phone-messages.desktop",
|
DATADIR "/applications/deforaos-phone-messages.desktop",
|
||||||
|
#endif
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
char const ** p;
|
char const ** p;
|
||||||
#endif
|
|
||||||
|
|
||||||
if((desktopicon = desktopicon_new(desktop, _("Applications"), NULL))
|
if((desktopicon = desktopicon_new(desktop, _("Applications"), NULL))
|
||||||
== NULL)
|
== NULL)
|
||||||
|
@ -917,13 +918,11 @@ static int _icons_homescreen(Desktop * desktop)
|
||||||
if(icon != NULL)
|
if(icon != NULL)
|
||||||
desktopicon_set_icon(desktopicon, icon);
|
desktopicon_set_icon(desktopicon, icon);
|
||||||
_desktop_icon_add(desktop, desktopicon);
|
_desktop_icon_add(desktop, desktopicon);
|
||||||
#ifdef EMBEDDED
|
|
||||||
for(p = paths; *p != NULL; p++)
|
for(p = paths; *p != NULL; p++)
|
||||||
if(access(*p, R_OK) == 0
|
if(access(*p, R_OK) == 0
|
||||||
&& (desktopicon = desktopicon_new_application(
|
&& (desktopicon = desktopicon_new_application(
|
||||||
desktop, *p, DATADIR)) != NULL)
|
desktop, *p, DATADIR)) != NULL)
|
||||||
_desktop_icon_add(desktop, desktopicon);
|
_desktop_icon_add(desktop, desktopicon);
|
||||||
#endif
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user