Skip to content

Commit 50e1a72

Browse files
authored
Merge pull request #325 from MaxVerevkin/remove-lazy-xdgoutput
remove unnecessary code that lazily binds xdg-output-manager
2 parents 638ca60 + 961e21a commit 50e1a72

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

src/output.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ impl OutputState {
155155
(outputs, xdg)
156156
});
157157

158-
// Only bind xdg output manager if it's needed
159158
let mut output_state = OutputState { xdg, outputs: vec![], callbacks: vec![] };
160159
for wl_output in outputs {
161160
output_state.setup(wl_output, qh);
@@ -680,14 +679,9 @@ where
680679
qh: &QueueHandle<D>,
681680
name: u32,
682681
interface: &str,
683-
version: u32,
682+
_version: u32,
684683
) {
685684
if interface == "wl_output" {
686-
// Lazily bind xdg output manager if it's needed
687-
if version < 4 && matches!(data.output_state().xdg, GlobalProxy::NotReady) {
688-
data.output_state().xdg = data.registry().bind_one(qh, 1..=3, GlobalData).into();
689-
}
690-
691685
let output = data
692686
.registry()
693687
.bind_specific(qh, name, 1..=4, OutputData::new(name))

0 commit comments

Comments
 (0)