From f518182cf818b8769d7abb6f0049eedbb5c190ab Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Wed, 16 Jan 2013 08:07:00 +0000 Subject: [PATCH] Use output name first instead of monitor name. Fall back to monitor name if output has no name. Signed-off-by: Christopher Michael SVN revision: 82863 --- src/modules/conf_randr/e_smart_monitor.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/modules/conf_randr/e_smart_monitor.c b/src/modules/conf_randr/e_smart_monitor.c index 1c02d632f..0645e9c3c 100644 --- a/src/modules/conf_randr/e_smart_monitor.c +++ b/src/modules/conf_randr/e_smart_monitor.c @@ -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); }