brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitor-manager: Fix output variable naming

Browse Source 
Fix the last case of using the variable name "meta_output" for a
MetaOutput.

https://bugzilla.gnome.org/show_bug.cgi?id=777732
This commit is contained in:
Jonas Ådahl 2017-03-24 17:18:20 +08:00
parent ab04286c6b
commit 88f2441330
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/backends/meta-monitor-manager.c
View File

@ -2616,7 +2616,7 @@ meta_monitor_manager_rebuild_derived (MetaMonitorManager *manager,
} }
void void
meta_output_parse_edid (MetaOutput *meta_output, meta_output_parse_edid (MetaOutput *output,
GBytes *edid) GBytes *edid)
{ {
MonitorInfo *parsed_edid; MonitorInfo *parsed_edid;
@ -2629,36 +2629,36 @@ meta_output_parse_edid (MetaOutput *meta_output,
if (parsed_edid) if (parsed_edid)
{ {
meta_output->vendor = g_strndup (parsed_edid->manufacturer_code, 4); output->vendor = g_strndup (parsed_edid->manufacturer_code, 4);
if (!g_utf8_validate (meta_output->vendor, -1, NULL)) if (!g_utf8_validate (output->vendor, -1, NULL))
g_clear_pointer (&meta_output->vendor, g_free); g_clear_pointer (&output->vendor, g_free);
meta_output->product = g_strndup (parsed_edid->dsc_product_name, 14); output->product = g_strndup (parsed_edid->dsc_product_name, 14);
if (!g_utf8_validate (meta_output->product, -1, NULL) || if (!g_utf8_validate (output->product, -1, NULL) ||
meta_output->product[0] == '\0') output->product[0] == '\0')
{ {
g_clear_pointer (&meta_output->product, g_free); g_clear_pointer (&output->product, g_free);
meta_output->product = g_strdup_printf ("0x%04x", (unsigned) parsed_edid->product_code); output->product = g_strdup_printf ("0x%04x", (unsigned) parsed_edid->product_code);
} }
meta_output->serial = g_strndup (parsed_edid->dsc_serial_number, 14); output->serial = g_strndup (parsed_edid->dsc_serial_number, 14);
if (!g_utf8_validate (meta_output->serial, -1, NULL) || if (!g_utf8_validate (output->serial, -1, NULL) ||
meta_output->serial[0] == '\0') output->serial[0] == '\0')
{ {
g_clear_pointer (&meta_output->serial, g_free); g_clear_pointer (&output->serial, g_free);
meta_output->serial = g_strdup_printf ("0x%08x", parsed_edid->serial_number); output->serial = g_strdup_printf ("0x%08x", parsed_edid->serial_number);
} }
g_free (parsed_edid); g_free (parsed_edid);
} }
out: out:
if (!meta_output->vendor) if (!output->vendor)
meta_output->vendor = g_strdup ("unknown"); output->vendor = g_strdup ("unknown");
if (!meta_output->product) if (!output->product)
meta_output->product = g_strdup ("unknown"); output->product = g_strdup ("unknown");
if (!meta_output->serial) if (!output->serial)
meta_output->serial = g_strdup ("unknown"); output->serial = g_strdup ("unknown");
} }
gboolean gboolean