isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 19:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

config: Rename ret to config

Browse Source 
We don't return this configuration, so don't name it ret.
This commit is contained in:
Jasper St. Pierre 2014-10-22 15:49:47 -07:00
parent 05f8d79323
commit 9710c013c5
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/backends/meta-monitor-config.c
View File

@ -1201,7 +1201,7 @@ ensure_at_least_one_output (MetaMonitorConfig *self,
MetaOutput *outputs, MetaOutput *outputs,
unsigned n_outputs) unsigned n_outputs)
{ {
MetaConfiguration *ret; MetaConfiguration *config;
MetaOutput *primary; MetaOutput *primary;
unsigned i; unsigned i;
@ -1212,9 +1212,9 @@ ensure_at_least_one_output (MetaMonitorConfig *self,
/* Oh no, we don't! Activate the primary one and disable everything else */ /* Oh no, we don't! Activate the primary one and disable everything else */
ret = config_new (); config = config_new ();
make_config_key (ret, outputs, n_outputs, -1); make_config_key (config, outputs, n_outputs, -1);
ret->outputs = g_new0 (MetaOutputConfig, n_outputs); config->outputs = g_new0 (MetaOutputConfig, n_outputs);
primary = find_primary_output (outputs, n_outputs); primary = find_primary_output (outputs, n_outputs);
@ -1224,23 +1224,23 @@ ensure_at_least_one_output (MetaMonitorConfig *self,
if (output == primary) if (output == primary)
{ {
ret->outputs[i].enabled = TRUE; config->outputs[i].enabled = TRUE;
ret->outputs[i].rect.x = 0; config->outputs[i].rect.x = 0;
ret->outputs[i].rect.y = 0; config->outputs[i].rect.y = 0;
ret->outputs[i].rect.width = output->preferred_mode->width; config->outputs[i].rect.width = output->preferred_mode->width;
ret->outputs[i].rect.height = output->preferred_mode->height; config->outputs[i].rect.height = output->preferred_mode->height;
ret->outputs[i].refresh_rate = output->preferred_mode->refresh_rate; config->outputs[i].refresh_rate = output->preferred_mode->refresh_rate;
ret->outputs[i].transform = META_MONITOR_TRANSFORM_NORMAL; config->outputs[i].transform = META_MONITOR_TRANSFORM_NORMAL;
ret->outputs[i].is_primary = TRUE; config->outputs[i].is_primary = TRUE;
} }
else else
{ {
ret->outputs[i].enabled = FALSE; config->outputs[i].enabled = FALSE;
} }
} }
apply_configuration (self, ret, manager); apply_configuration (self, config, manager);
config_unref (ret); config_unref (config);
return FALSE; return FALSE;
} }