|
 |
816867f |
--- a/plugins/color/csd-color-manager.c
|
|
|
816867f |
+++ b/plugins/color/csd-color-manager.c
|
|
|
816867f |
@@ -1014,7 +1014,7 @@ gcm_session_use_output_profile_for_scree
|
|
|
816867f |
connected = outputs[i];
|
|
|
816867f |
if (gnome_rr_output_get_is_primary (outputs[i]))
|
|
|
816867f |
has_primary = TRUE;
|
|
|
816867f |
- if (gnome_rr_output_is_laptop (outputs[i]))
|
|
|
816867f |
+ if (gnome_rr_output_is_builtin_display (outputs[i]))
|
|
|
816867f |
has_laptop = TRUE;
|
|
|
816867f |
}
|
|
|
816867f |
|
|
|
816867f |
@@ -1024,7 +1024,7 @@ gcm_session_use_output_profile_for_scree
|
|
|
816867f |
|
|
|
816867f |
/* choosing the internal panel is probably sane */
|
|
|
816867f |
if (has_laptop)
|
|
|
816867f |
- return gnome_rr_output_is_laptop (output);
|
|
|
816867f |
+ return gnome_rr_output_is_builtin_display (output);
|
|
|
816867f |
|
|
|
816867f |
/* we have to choose one, so go for the first connected device */
|
|
|
816867f |
if (connected != NULL)
|
|
|
816867f |
@@ -1123,7 +1123,7 @@ gcm_session_device_assign_profile_connec
|
|
|
816867f |
* calibration brightness then set this new brightness */
|
|
|
816867f |
brightness_profile = cd_profile_get_metadata_item (profile,
|
|
|
816867f |
CD_PROFILE_METADATA_SCREEN_BRIGHTNESS);
|
|
|
816867f |
- if (gnome_rr_output_is_laptop (output) &&
|
|
|
816867f |
+ if (gnome_rr_output_is_builtin_display (output) &&
|
|
|
816867f |
brightness_profile != NULL) {
|
|
|
816867f |
/* the percentage is stored in the profile metadata as
|
|
|
816867f |
* a string, not ideal, but it's all we have... */
|
|
|
816867f |
@@ -1384,7 +1384,7 @@ gcm_session_add_x11_output (CsdColorMana
|
|
|
816867f |
}
|
|
|
816867f |
|
|
|
816867f |
/* prefer DMI data for the internal output */
|
|
|
816867f |
- ret = gnome_rr_output_is_laptop (output);
|
|
|
816867f |
+ ret = gnome_rr_output_is_builtin_display (output);
|
|
|
816867f |
if (ret) {
|
|
|
816867f |
model = gcm_dmi_get_name (priv->dmi);
|
|
|
816867f |
vendor = gcm_dmi_get_vendor (priv->dmi);
|
|
|
816867f |
@@ -1443,7 +1443,7 @@ gcm_session_add_x11_output (CsdColorMana
|
|
|
816867f |
#if CD_CHECK_VERSION(0,1,27)
|
|
|
816867f |
/* set this so we can call the device a 'Laptop Screen' in the
|
|
|
816867f |
* control center main panel */
|
|
|
816867f |
- if (gnome_rr_output_is_laptop (output)) {
|
|
|
816867f |
+ if (gnome_rr_output_is_builtin_display (output)) {
|
|
|
816867f |
g_hash_table_insert (device_props,
|
|
|
816867f |
(gpointer) CD_DEVICE_PROPERTY_EMBEDDED,
|
|
|
816867f |
NULL);
|
|
|
816867f |
--- a/plugins/power/csd-power-manager.c
|
|
|
816867f |
+++ b/plugins/power/csd-power-manager.c
|
|
|
816867f |
@@ -2234,7 +2234,7 @@ non_laptop_outputs_are_all_off (GnomeRRS
|
|
|
816867f |
|
|
|
816867f |
outputs = gnome_rr_screen_list_outputs (screen);
|
|
|
816867f |
for (i = 0; outputs[i] != NULL; i++) {
|
|
|
816867f |
- if (gnome_rr_output_is_laptop (outputs[i]))
|
|
|
816867f |
+ if (gnome_rr_output_is_builtin_display (outputs[i]))
|
|
|
816867f |
continue;
|
|
|
816867f |
|
|
|
816867f |
if (is_on (outputs[i]))
|
|
|
816867f |
@@ -2432,7 +2432,7 @@ get_primary_output (CsdPowerManager *man
|
|
|
816867f |
|
|
|
816867f |
for (i = 0; outputs[i] != NULL; i++) {
|
|
|
816867f |
if (gnome_rr_output_is_connected (outputs[i]) &&
|
|
|
816867f |
- gnome_rr_output_is_laptop (outputs[i]) &&
|
|
|
816867f |
+ gnome_rr_output_is_builtin_display (outputs[i]) &&
|
|
|
816867f |
gnome_rr_output_get_backlight_min (outputs[i]) >= 0 &&
|
|
|
816867f |
gnome_rr_output_get_backlight_max (outputs[i]) > 0) {
|
|
|
816867f |
output = outputs[i];
|
|
|
816867f |
--- a/plugins/xrandr/csd-xrandr-manager.c
|
|
|
816867f |
+++ b/plugins/xrandr/csd-xrandr-manager.c
|
|
|
816867f |
@@ -372,7 +372,7 @@ is_laptop (GnomeRRScreen *screen, GnomeR
|
|
|
816867f |
|
|
|
816867f |
rr_output = gnome_rr_screen_get_output_by_name (screen, gnome_rr_output_info_get_name (output));
|
|
|
816867f |
|
|
|
816867f |
- return gnome_rr_output_is_laptop (rr_output);
|
|
|
816867f |
+ return gnome_rr_output_is_builtin_display (rr_output);
|
|
|
816867f |
}
|
|
|
816867f |
|
|
|
816867f |
static GnomeRROutputInfo *
|