jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use output name first instead of monitor name. Fall back to monitor 

name if output has no name.

Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 82863
This commit is contained in:
Christopher Michael 2013-01-16 08:07:00 +00:00 committed by Christopher Michael
parent 272907949e
commit f518182cf8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/conf_randr/e_smart_monitor.c
View File

@ -355,10 +355,14 @@ e_smart_monitor_setup(Evas_Object *obj)
E_Randr_Monitor_Info *monitor = NULL;
const char *name = NULL;
if ((monitor = sd->output->monitor))
name = ecore_x_randr_edid_display_name_get(monitor->edid,
monitor->edid_length);
if (!name) name = sd->output->name;
name = sd->output->name;
if (!name)
{
if ((monitor = sd->output->monitor))
name = ecore_x_randr_edid_display_name_get(monitor->edid,
monitor->edid_length);
}
edje_object_part_text_set(sd->o_frame, "e.text.name", name);
}