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

monitor-manager: Rename output_id to output_index

Browse Source 
The term "output_id" is already used as an opaque ID.
This commit is contained in:
Jasper St. Pierre 2014-07-01 13:00:36 -04:00
parent b9d867cb86
commit 110c79d10e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -667,7 +667,7 @@ meta_monitor_manager_handle_apply_configuration (MetaDBusDisplayConfig *skeleto
int new_mode, x, y; int new_mode, x, y;
int new_screen_width, new_screen_height; int new_screen_width, new_screen_height;
guint transform; guint transform;
guint output_id; guint output_index;
GPtrArray *crtc_infos, *output_infos; GPtrArray *crtc_infos, *output_infos;
if (serial != manager->serial) if (serial != manager->serial)
@ -767,18 +767,18 @@ meta_monitor_manager_handle_apply_configuration (MetaDBusDisplayConfig *skeleto
crtc_info->transform = transform; crtc_info->transform = transform;
first_output = NULL; first_output = NULL;
while (g_variant_iter_loop (nested_outputs, "u", &output_id)) while (g_variant_iter_loop (nested_outputs, "u", &output_index))
{ {
MetaOutput *output; MetaOutput *output;
if (output_id >= manager->n_outputs) if (output_index >= manager->n_outputs)
{ {
g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
G_DBUS_ERROR_INVALID_ARGS, G_DBUS_ERROR_INVALID_ARGS,
"Invalid output id"); "Invalid output id");
return TRUE; return TRUE;
} }
output = &manager->outputs[output_id]; output = &manager->outputs[output_index];
if (!output_can_config (output, crtc, mode)) if (!output_can_config (output, crtc, mode))
{ {
@ -823,12 +823,12 @@ meta_monitor_manager_handle_apply_configuration (MetaDBusDisplayConfig *skeleto
} }
g_variant_iter_init (&output_iter, outputs); g_variant_iter_init (&output_iter, outputs);
while (g_variant_iter_loop (&output_iter, "(u@a{sv})", &output_id, &properties)) while (g_variant_iter_loop (&output_iter, "(u@a{sv})", &output_index, &properties))
{ {
MetaOutputInfo *output_info; MetaOutputInfo *output_info;
gboolean primary, presentation; gboolean primary, presentation;
if (output_id >= manager->n_outputs) if (output_index >= manager->n_outputs)
{ {
g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
G_DBUS_ERROR_INVALID_ARGS, G_DBUS_ERROR_INVALID_ARGS,
@ -837,7 +837,7 @@ meta_monitor_manager_handle_apply_configuration (MetaDBusDisplayConfig *skeleto
} }
output_info = g_slice_new0 (MetaOutputInfo); output_info = g_slice_new0 (MetaOutputInfo);
output_info->output = &manager->outputs[output_id]; output_info->output = &manager->outputs[output_index];
if (g_variant_lookup (properties, "primary", "b", &primary)) if (g_variant_lookup (properties, "primary", "b", &primary))
output_info->is_primary = primary; output_info->is_primary = primary;
@ -908,7 +908,7 @@ static gboolean
meta_monitor_manager_handle_change_backlight (MetaDBusDisplayConfig *skeleton, meta_monitor_manager_handle_change_backlight (MetaDBusDisplayConfig *skeleton,
GDBusMethodInvocation *invocation, GDBusMethodInvocation *invocation,
guint serial, guint serial,
guint output_id, guint output_index,
gint value) gint value)
{ {
MetaMonitorManager *manager = META_MONITOR_MANAGER (skeleton); MetaMonitorManager *manager = META_MONITOR_MANAGER (skeleton);
@ -922,14 +922,14 @@ meta_monitor_manager_handle_change_backlight (MetaDBusDisplayConfig *skeleton,
return TRUE; return TRUE;
} }
if (output_id >= manager->n_outputs) if (output_index >= manager->n_outputs)
{ {
g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
G_DBUS_ERROR_INVALID_ARGS, G_DBUS_ERROR_INVALID_ARGS,
"Invalid output id"); "Invalid output id");
return TRUE; return TRUE;
} }
output = &manager->outputs[output_id]; output = &manager->outputs[output_index];
if (value < 0 || value > 100) if (value < 0 || value > 100)
{ {