Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e
Dir : e17/apps/e/src/bin Modified Files: e_border.c Log Message: Try to avoid returning a NULL icon. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.548 retrieving revision 1.549 diff -u -3 -r1.548 -r1.549 --- e_border.c 30 Sep 2006 10:16:23 -0000 1.548 +++ e_border.c 5 Oct 2006 13:34:43 -0000 1.549 @@ -2571,7 +2571,8 @@ } } } - return o; + if (o) + return o; } if (e_config->use_app_icon) { @@ -2582,7 +2583,6 @@ bd->client.netwm.icons[0].width, bd->client.netwm.icons[0].height); e_icon_alpha_set(o, 1); - return o; } } if (!o) @@ -2601,7 +2601,6 @@ o = e_app_icon_add(evas, a); bd->app = a; e_object_ref(E_OBJECT(bd->app)); - return o; } else if (bd->client.netwm.icons) { @@ -2610,14 +2609,12 @@ bd->client.netwm.icons[0].width, bd->client.netwm.icons[0].height); e_icon_alpha_set(o, 1); - return o; } } if (!o) { o = edje_object_add(evas); e_util_edje_icon_set(o, "enlightenment/unknown"); - return o; } return o; } ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs