diff options
| author | Monsta <[email protected]> | 2015-09-02 17:42:04 +0300 |
|---|---|---|
| committer | Monsta <[email protected]> | 2015-09-02 17:42:04 +0300 |
| commit | 1702c381f65cf90cd76ca80cf515754dd20c3add (patch) | |
| tree | b8d1594b83801b16177c9a64af21329af91c4a94 /libmate-desktop/mate-rr-config.c | |
| parent | b0aeb32b14f8768e65de4da4db713fafcacba718 (diff) | |
| download | mate-desktop-1702c381f65cf90cd76ca80cf515754dd20c3add.tar.bz2 mate-desktop-1702c381f65cf90cd76ca80cf515754dd20c3add.tar.xz | |
mate-rr: unify laptop identification by output name
adapted from
https://git.gnome.org/browse/gnome-desktop/commit?id=113c7c8252531665d9e9090c6f48cd3f6b16e120
and
https://git.gnome.org/browse/gnome-desktop/commit?id=d9f5e5f58e86798c48995e1abc36e7c43174d132
Diffstat (limited to 'libmate-desktop/mate-rr-config.c')
| -rw-r--r-- | libmate-desktop/mate-rr-config.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/libmate-desktop/mate-rr-config.c b/libmate-desktop/mate-rr-config.c index 5702b11..dfff1b6 100644 --- a/libmate-desktop/mate-rr-config.c +++ b/libmate-desktop/mate-rr-config.c @@ -1171,19 +1171,6 @@ mate_rr_config_sanitize (MateRRConfig *config) } } -static gboolean -output_info_is_laptop (MateRROutputInfo *info) -{ - if (info->priv->name - && (strstr (info->priv->name, "lvds") || /* Most drivers use an "LVDS" prefix... */ - strstr (info->priv->name, "LVDS") || - strstr (info->priv->name, "Lvds") || - strstr (info->priv->name, "LCD"))) /* ... but fglrx uses "LCD" in some versions. Shoot me now, kthxbye. */ - return TRUE; - - return FALSE; -} - gboolean mate_rr_config_ensure_primary (MateRRConfig *configuration) { @@ -1223,9 +1210,7 @@ mate_rr_config_ensure_primary (MateRRConfig *configuration) top_left = info; } if (laptop == NULL - && output_info_is_laptop (info)) { - /* shame we can't find the connector type - as with gnome_rr_output_is_laptop */ + && _mate_rr_output_name_is_laptop (info->priv->name)) { laptop = info; } } |