Skip to content

Commit d4e88b1

Browse files
Federico DI PierroFedeDP
authored andcommitted
chore(src): improved some strings.
Signed-off-by: Federico DI Pierro <federico@federico.dipierro>
1 parent 7d447d0 commit d4e88b1

5 files changed

Lines changed: 7 additions & 6 deletions

File tree

TODO.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
### Generic
3636
- [ ] Drop is_smooth options for gamma
3737
- [ ] avoid returning boolean where it does not make sense
38+
- [ ] Rename Wl to Wlr (wlroots) in interfaces
3839

3940
## Ideas
4041
- [ ] follow ddcci kernel driver and in case, drop ddcutil and add the kernel driver as clightd opt-dep

src/modules/dpms.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ static int method_getdpms(sd_bus_message *m, void *userdata, sd_bus_error *ret_e
116116
if (dpms_state < 0) {
117117
switch (dpms_state) {
118118
case COMPOSITOR_NO_PROTOCOL:
119-
sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "Compositor does not support wayland protocol.");
119+
sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "Compositor does not support required wayland protocols.");
120120
break;
121121
case WRONG_PLUGIN:
122122
sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "No plugin available for your configuration.");
@@ -171,7 +171,7 @@ static int method_setdpms(sd_bus_message *m, void *userdata, sd_bus_error *ret_e
171171
if (err) {
172172
switch (err) {
173173
case COMPOSITOR_NO_PROTOCOL:
174-
sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "Compositor does not support neither 'wlr-output-power-management-unstable-v1' nor 'org_kde_kwin_dpms' protocols.");
174+
sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "Compositor does not support required wayland protocols.");
175175
break;
176176
case WRONG_PLUGIN:
177177
sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "No plugin available for your configuration.");

src/modules/dpms_plugins/kwin_wl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static int wl_init(const char *display, const char *env) {
8585
wl_display_roundtrip(dpy);
8686

8787
if (dpms_control_manager == NULL) {
88-
fprintf(stderr, "compositor doesn't support org_kde_kwin_dpms\n");
88+
fprintf(stderr, "compositor doesn't support '%s'\n", org_kde_kwin_dpms_manager_interface.name);
8989
ret = COMPOSITOR_NO_PROTOCOL;
9090
goto err;
9191
}

src/modules/gamma.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ static int method_setgamma(sd_bus_message *m, void *userdata, sd_bus_error *ret_
332332
sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "Temperature value should be between 1000 and 10000.");
333333
break;
334334
case COMPOSITOR_NO_PROTOCOL:
335-
sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "Compositor does not support wayland protocol.");
335+
sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "Compositor does not support required wayland protocols.");
336336
break;
337337
case WRONG_PLUGIN:
338338
sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "No plugin available for your configuration.");
@@ -375,7 +375,7 @@ static int method_getgamma(sd_bus_message *m, void *userdata, sd_bus_error *ret_
375375
if (error || temp == -1) {
376376
switch (error) {
377377
case COMPOSITOR_NO_PROTOCOL:
378-
sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "Compositor does not support 'wlr-gamma-control-unstable-v1' protocol.");
378+
sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "Compositor does not support required wayland protocols.");
379379
break;
380380
case WRONG_PLUGIN:
381381
sd_bus_error_set_const(ret_error, SD_BUS_ERROR_FAILED, "No plugin available for your configuration.");

src/modules/gamma_plugins/wl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ static int validate(const char **id, const char *env, void **priv_data) {
149149
wl_display_roundtrip(display);
150150

151151
if (priv->gamma_control_manager == NULL) {
152-
fprintf(stderr, "compositor doesn't support wlr-gamma-control-unstable-v1\n");
152+
fprintf(stderr, "compositor doesn't support '%s'\n", zwlr_gamma_control_manager_v1_interface.name);
153153
ret = COMPOSITOR_NO_PROTOCOL;
154154
goto err;
155155
}

0 commit comments

Comments
 (0)