mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-11-14 07:43:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Print an error a more specific error if init fails

Browse Source
This commit is contained in:
Sebastian Ramacher 2018-11-02 07:23:12 +01:00
parent cc99b8d349
commit fac4f7fea3
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zathura/zathura.c
View File

@ -209,6 +209,7 @@ static bool
init_ui(zathura_t* zathura) init_ui(zathura_t* zathura)
{ {
if (girara_session_init(zathura->ui.session, "zathura") == false) { if (girara_session_init(zathura->ui.session, "zathura") == false) {
girara_error("Failed to initialize girara.");
return false; return false;
} }
@ -241,6 +242,7 @@ init_ui(zathura_t* zathura)
gtk_grid_set_row_homogeneous(GTK_GRID(zathura->ui.page_widget), TRUE); gtk_grid_set_row_homogeneous(GTK_GRID(zathura->ui.page_widget), TRUE);
gtk_grid_set_column_homogeneous(GTK_GRID(zathura->ui.page_widget), TRUE); gtk_grid_set_column_homogeneous(GTK_GRID(zathura->ui.page_widget), TRUE);
if (zathura->ui.page_widget == NULL) { if (zathura->ui.page_widget == NULL) {
girara_error("Failed to create page widget.");
return false; return false;
} }
@ -280,18 +282,21 @@ init_ui(zathura_t* zathura)
zathura->ui.statusbar.file = zathura->ui.statusbar.file =
girara_statusbar_item_add(zathura->ui.session, TRUE, TRUE, TRUE, NULL); girara_statusbar_item_add(zathura->ui.session, TRUE, TRUE, TRUE, NULL);
if (zathura->ui.statusbar.file == NULL) { if (zathura->ui.statusbar.file == NULL) {
girara_error("Failed to create status bar item.");
return false; return false;
} }
zathura->ui.statusbar.buffer = zathura->ui.statusbar.buffer =
girara_statusbar_item_add(zathura->ui.session, FALSE, FALSE, FALSE, NULL); girara_statusbar_item_add(zathura->ui.session, FALSE, FALSE, FALSE, NULL);
if (zathura->ui.statusbar.buffer == NULL) { if (zathura->ui.statusbar.buffer == NULL) {
girara_error("Failed to create status bar item.");
return false; return false;
} }
zathura->ui.statusbar.page_number = zathura->ui.statusbar.page_number =
girara_statusbar_item_add(zathura->ui.session, FALSE, FALSE, FALSE, NULL); girara_statusbar_item_add(zathura->ui.session, FALSE, FALSE, FALSE, NULL);
if (zathura->ui.statusbar.page_number == NULL) { if (zathura->ui.statusbar.page_number == NULL) {
girara_error("Failed to create status bar item.");
return false; return false;
} }
@ -434,12 +439,14 @@ zathura_init(zathura_t* zathura)
case ZATHURA_SANDBOX_NORMAL: case ZATHURA_SANDBOX_NORMAL:
girara_debug("Basic sandbox allowing normal operation."); girara_debug("Basic sandbox allowing normal operation.");
if (seccomp_enable_basic_filter() != 0) { if (seccomp_enable_basic_filter() != 0) {
girara_error("Failed to initialize basic seccomp filter.");
goto error_free; goto error_free;
} }
break; break;
case ZATHURA_SANDBOX_STRICT: case ZATHURA_SANDBOX_STRICT:
girara_debug("Strict sandbox preventing write and network access."); girara_debug("Strict sandbox preventing write and network access.");
if (seccomp_enable_strict_filter() != 0) { if (seccomp_enable_strict_filter() != 0) {
girara_error("Failed to initialize strict seccomp filter.");
goto error_free; goto error_free;
} }
/* unset the input method to avoid communication with external services */ /* unset the input method to avoid communication with external services */
@ -449,7 +456,8 @@ zathura_init(zathura_t* zathura)
#endif #endif
/* UI */ /* UI */
if (!init_ui(zathura)) { if (init_ui(zathura) == false) {
girara_error("Failed to initialize UI.");
goto error_free; goto error_free;
} }
@ -466,6 +474,7 @@ zathura_init(zathura_t* zathura)
/* CSS for index mode */ /* CSS for index mode */
if (init_css(zathura) == false) { if (init_css(zathura) == false) {
girara_error("Failed to initialize CSS.");
goto error_free; goto error_free;
} }