config: Fix compilation errors

This commit is contained in:
Emmanuele Bassi 2014-11-05 12:30:05 +00:00
parent f8a4d450a5
commit 8b98cb818c

View File

@ -1088,12 +1088,12 @@ init_config_from_preferred_mode (MetaOutputConfig *config,
config->enabled = TRUE; config->enabled = TRUE;
config->rect.x = 0; config->rect.x = 0;
config->rect.y = 0; config->rect.y = 0;
config->rect.width = output.preferred_mode->width; config->rect.width = output->preferred_mode->width;
config->rect.height = output.preferred_mode->height; config->rect.height = output->preferred_mode->height;
config->refresh_rate = output.preferred_mode->refresh_rate; config->refresh_rate = output->preferred_mode->refresh_rate;
config->transform = META_MONITOR_TRANSFORM_NORMAL; config->transform = META_MONITOR_TRANSFORM_NORMAL;
config->is_primary = FALSE; config->is_primary = FALSE;
confog->is_presentation = FALSE; config->is_presentation = FALSE;
} }
static MetaConfiguration * static MetaConfiguration *
@ -1186,14 +1186,14 @@ make_default_config (MetaMonitorConfig *self,
x = primary->preferred_mode->width; x = primary->preferred_mode->width;
for (i = 0; i < n_outputs; i++) for (i = 0; i < n_outputs; i++)
{ {
gboolean is_primary = (outputs[i] == primary); gboolean is_primary = (&outputs[i] == primary);
init_config_from_preferred_mode (&ret->outputs[i], &outputs[i]); init_config_from_preferred_mode (&ret->outputs[i], &outputs[i]);
ret->outputs[i].is_primary = is_primary; ret->outputs[i].is_primary = is_primary;
if (is_primary) if (is_primary)
{ {
ret->outputs[i].rect = 0; ret->outputs[i].rect.x = 0;
} }
else else
{ {
@ -1234,7 +1234,7 @@ ensure_at_least_one_output (MetaMonitorConfig *self,
for (i = 0; i < n_outputs; i++) for (i = 0; i < n_outputs; i++)
{ {
gboolean is_primary = (outputs[i] == primary); gboolean is_primary = (&outputs[i] == primary);
if (is_primary) if (is_primary)
{ {