mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2025-01-04 02:56:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of pwmt.org:zathura into develop

Browse source
This commit is contained in:
Sebastian Ramacher 2012-02-07 20:29:33 +01:00
commit 4e6d73a912
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shortcuts.c
View file

@ -19,8 +19,6 @@ bool
sc_abort(girara_session_t* session, girara_argument_t* UNUSED(argument), sc_abort(girara_session_t* session, girara_argument_t* UNUSED(argument),
girara_event_t* UNUSED(event), unsigned int UNUSED(t)) girara_event_t* UNUSED(event), unsigned int UNUSED(t))
{ {
girara_info("in sc_abort");
g_return_val_if_fail(session != NULL, false); g_return_val_if_fail(session != NULL, false);
g_return_val_if_fail(session->global.data != NULL, false); g_return_val_if_fail(session->global.data != NULL, false);
zathura_t* zathura = session->global.data; zathura_t* zathura = session->global.data;

6
zathura.c
View file

@ -334,8 +334,10 @@ prepare_document_open_from_stdin(zathura_t* zathura)
gint handle = g_file_open_tmp("zathura.stdin.XXXXXX", &file, &error); gint handle = g_file_open_tmp("zathura.stdin.XXXXXX", &file, &error);
if (handle == -1) if (handle == -1)
{ {
girara_error("Can not create temporary file: %s", error->message); if (error != NULL) {
g_error_free(error); girara_error("Can not create temporary file: %s", error->message);
g_error_free(error);
}
return NULL; return NULL;
} }