bugfix: fix systray appindicator icon loading

fix T811
This commit is contained in:
Mike Blumenkrantz 2014-05-08 15:59:32 -04:00
parent 275e20b2bc
commit 61c1282015
1 changed files with 19 additions and 5 deletions

View File

@ -66,13 +66,27 @@ systray_notifier_item_free(Notifier_Item *item)
static void static void
image_load(const char *name, const char *path, Evas_Object *image) image_load(const char *name, const char *path, Evas_Object *image)
{ {
if (path && strlen(path)) const char *exts[] =
{
".png",
".jpg",
NULL
};
if (path && path[0])
{ {
char buf[1024]; char buf[PATH_MAX];
sprintf(buf, "%s/%s", path, name);
snprintf(buf, sizeof(buf), "%s/%s", path, name);
if (!e_icon_file_set(image, buf)) if (!e_icon_file_set(image, buf))
e_util_icon_theme_set(image, "dialog-error"); {
return; const char **ext;
for (ext = exts; *ext; ext++)
{
snprintf(buf, sizeof(buf), "%s/%s%s", path, name, *ext);
if (e_icon_file_set(image, buf)) return;
}
}
} }
if (!e_util_icon_theme_set(image, name)) if (!e_util_icon_theme_set(image, name))
e_util_icon_theme_set(image, "dialog-error"); e_util_icon_theme_set(image, "dialog-error");