From f7a44ef9fc8c20f9c26350c710efae5cf68a6ff2 Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 8 Nov 2014 01:24:39 +0100 Subject: MateRROutputInfo: rename boolean accessors Rename get_connected() to is_connected() and get_active() to is_active(), following the normal convention. Based on gnome-desktop commit: 46d48ab6ec256498d0dd0a5c97c0388381971cbf From: Giovanni Campagna --- libmate-desktop/mate-rr-config.h | 4 ++-- libmate-desktop/mate-rr-labeler.c | 2 +- libmate-desktop/mate-rr-output-info.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libmate-desktop/mate-rr-config.h b/libmate-desktop/mate-rr-config.h index cd343ab..85c8c9f 100644 --- a/libmate-desktop/mate-rr-config.h +++ b/libmate-desktop/mate-rr-config.h @@ -61,7 +61,7 @@ GType mate_rr_output_info_get_type (void); char *mate_rr_output_info_get_name (MateRROutputInfo *self); -gboolean mate_rr_output_info_get_active (MateRROutputInfo *self); +gboolean mate_rr_output_info_is_active (MateRROutputInfo *self); void mate_rr_output_info_set_active (MateRROutputInfo *self, gboolean active); @@ -74,7 +74,7 @@ void mate_rr_output_info_set_refresh_rate (MateRROutputInfo *self, int rate); MateRRRotation mate_rr_output_info_get_rotation (MateRROutputInfo *self); void mate_rr_output_info_set_rotation (MateRROutputInfo *self, MateRRRotation rotation); -gboolean mate_rr_output_info_get_connected (MateRROutputInfo *self); +gboolean mate_rr_output_info_is_connected (MateRROutputInfo *self); void mate_rr_output_info_get_vendor (MateRROutputInfo *self, gchar* vendor); guint mate_rr_output_info_get_product (MateRROutputInfo *self); guint mate_rr_output_info_get_serial (MateRROutputInfo *self); diff --git a/libmate-desktop/mate-rr-labeler.c b/libmate-desktop/mate-rr-labeler.c index e4aaa3e..f7e666e 100644 --- a/libmate-desktop/mate-rr-labeler.c +++ b/libmate-desktop/mate-rr-labeler.c @@ -456,7 +456,7 @@ create_label_windows (MateRRLabeler *labeler) outputs = mate_rr_config_get_outputs (labeler->priv->config); for (i = 0; i < labeler->priv->num_outputs; i++) { - if (!created_window_for_clone && mate_rr_output_info_get_active (outputs[i])) { + if (!created_window_for_clone && mate_rr_output_info_is_active (outputs[i])) { labeler->priv->windows[i] = create_label_window (labeler, outputs[i], labeler->priv->palette + i); if (mate_rr_config_get_clone (labeler->priv->config)) diff --git a/libmate-desktop/mate-rr-output-info.c b/libmate-desktop/mate-rr-output-info.c index 0020541..896b010 100644 --- a/libmate-desktop/mate-rr-output-info.c +++ b/libmate-desktop/mate-rr-output-info.c @@ -76,11 +76,11 @@ char *mate_rr_output_info_get_name (MateRROutputInfo *self) } /** - * mate_rr_output_info_get_active: + * mate_rr_output_info_is_active: * * Returns: whether there is a CRTC assigned to this output (i.e. a signal is being sent to it) */ -gboolean mate_rr_output_info_get_active (MateRROutputInfo *self) +gboolean mate_rr_output_info_is_active (MateRROutputInfo *self) { g_return_val_if_fail (MATE_IS_RR_OUTPUT_INFO (self), FALSE); @@ -156,11 +156,11 @@ void mate_rr_output_info_set_rotation (MateRROutputInfo *self, MateRRRotation ro } /** - * mate_rr_output_info_get_connected: + * mate_rr_output_info_is_connected: * * Returns: whether the output is physically connected to a monitor */ -gboolean mate_rr_output_info_get_connected (MateRROutputInfo *self) +gboolean mate_rr_output_info_is_connected (MateRROutputInfo *self) { g_return_val_if_fail (MATE_IS_RR_OUTPUT_INFO (self), FALSE); -- cgit v1.2.1