[gnome-settings-daemon/wip/wayland-display: 83/87] color: adapt to GnomeRR API changes



commit caaac4968a1bd40e4cd90313de6375b8e0ad4c84
Author: Giovanni Campagna <gcampagn redhat com>
Date:   Thu Aug 8 14:01:08 2013 +0200

    color: adapt to GnomeRR API changes
    
    GnomeRR no longer exposes disconnected outputs, so we don't need
    to filter them ourselves.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=705507

 plugins/color/gsd-color-state.c |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/plugins/color/gsd-color-state.c b/plugins/color/gsd-color-state.c
index 20a1755..b94a58a 100644
--- a/plugins/color/gsd-color-state.c
+++ b/plugins/color/gsd-color-state.c
@@ -564,8 +564,6 @@ gcm_session_get_state_output_by_id (GsdColorState *state,
                 goto out;
         }
         for (i = 0; outputs[i] != NULL && output == NULL; i++) {
-                if (!gnome_rr_output_is_connected (outputs[i]))
-                        continue;
                 output_id = gcm_session_get_output_id (state, outputs[i]);
                 if (g_strcmp0 (output_id, device_id) == 0)
                         output = outputs[i];
@@ -602,8 +600,6 @@ gcm_session_use_output_profile_for_screen (GsdColorState *state,
                 return FALSE;
         }
         for (i = 0; outputs[i] != NULL; i++) {
-                if (!gnome_rr_output_is_connected (outputs[i]))
-                        continue;
                 if (connected == NULL)
                         connected = outputs[i];
                 if (gnome_rr_output_get_is_primary (outputs[i]))
@@ -1217,9 +1213,6 @@ gnome_rr_screen_output_changed_cb (GnomeRRScreen *screen,
                 return;
         }
         for (i = 0; outputs[i] != NULL; i++) {
-                if (!gnome_rr_output_is_connected (outputs[i]))
-                        continue;
-
                 /* get CdDevice for this output */
                 cd_client_find_device_by_property (state->priv->client,
                                                    CD_DEVICE_METADATA_XRANDR_NAME,
@@ -1327,8 +1320,7 @@ gcm_session_client_connect_cb (GObject *source_object,
                 goto out;
         }
         for (i = 0; outputs[i] != NULL; i++) {
-                if (gnome_rr_output_is_connected (outputs[i]))
-                        gcm_session_add_state_output (state, outputs[i]);
+                gcm_session_add_state_output (state, outputs[i]);
         }
 
         /* only connect when colord is awake */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]