mirror of
https://git.pwmt.org/pwmt/zathura.git
synced 2025-01-30 19:54:57 +01:00
Merge branch 'develop' of pwmt.org:zathura into develop
This commit is contained in:
commit
6730160df0
6 changed files with 23 additions and 8 deletions
2
Makefile
2
Makefile
|
@ -101,7 +101,7 @@ uninstall:
|
|||
$(ECHO) removing desktop file
|
||||
$(QUIET)rm -f ${DESTDIR}${DESKTOPPREFIX}/${PROJECT}.desktop
|
||||
$(ECHO) removing pkgconfig file
|
||||
$(QUIET)rm -f ${DESTDIR}${PREFIX}/lib/pkgconfig
|
||||
$(QUIET)rm -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${PROJECT}.pc
|
||||
|
||||
-include $(wildcard .depend/*.dep)
|
||||
|
||||
|
|
8
README
8
README
|
@ -7,9 +7,15 @@ Requirements
|
|||
------------
|
||||
gtk2 (>= 2.18.6)
|
||||
girara
|
||||
sqlite3
|
||||
|
||||
Please note that you need to have a working pkg-config installation
|
||||
and that the Makefile is only compatible with GNU make.
|
||||
and that the Makefile is only compatible with GNU make. If you don't have a
|
||||
working pkg-config installation please set the GTK_INC, GTK_LIB, GIRARA_INC,
|
||||
GIRARA_LIB, SQLITE_INC and SQLITE_LIB variables accordingly.
|
||||
|
||||
And also note that rst2man from python-docutils is needed to build
|
||||
zathurarc.5. If it is not installed, zathurarc.5 won't be built.
|
||||
|
||||
Installation
|
||||
------------
|
||||
|
|
|
@ -81,8 +81,11 @@ zathura_bookmark_free(zathura_bookmark_t* bookmark)
|
|||
|
||||
bool
|
||||
zathura_bookmarks_load(zathura_t* zathura, const gchar* file) {
|
||||
g_return_val_if_fail(zathura && zathura->database, false);
|
||||
g_return_val_if_fail(zathura, false);
|
||||
g_return_val_if_fail(file, false);
|
||||
if (zathura->database == NULL) {
|
||||
return false;
|
||||
}
|
||||
|
||||
girara_list_t* bookmarks = zathura_db_load_bookmarks(zathura->database, file);
|
||||
if (!bookmarks) {
|
||||
|
|
|
@ -381,7 +381,9 @@ sc_toggle_index(girara_session_t* session, girara_argument_t* UNUSED(argument),
|
|||
g_return_val_if_fail(session != NULL, false);
|
||||
g_return_val_if_fail(session->global.data != NULL, false);
|
||||
zathura_t* zathura = session->global.data;
|
||||
g_return_val_if_fail(zathura->document != NULL, false);
|
||||
if (zathura->document == NULL) {
|
||||
return false;
|
||||
}
|
||||
|
||||
girara_tree_node_t* document_index = NULL;
|
||||
GtkWidget* treeview = NULL;
|
||||
|
|
|
@ -87,6 +87,10 @@ zathura_init(int argc, char* argv[])
|
|||
g_free(path);
|
||||
}
|
||||
|
||||
/* create zathura (config/data) directory */
|
||||
g_mkdir_with_parents(zathura->config.config_dir, 0771);
|
||||
g_mkdir_with_parents(zathura->config.data_dir, 0771);
|
||||
|
||||
if (plugin_path) {
|
||||
gchar** paths = g_strsplit(plugin_path, ":", 0);
|
||||
for (unsigned int i = 0; paths[i] != '\0'; ++i) {
|
||||
|
@ -200,7 +204,7 @@ zathura_init(int argc, char* argv[])
|
|||
char* database_path = g_build_filename(zathura->config.data_dir, "bookmarks.sqlite", NULL);
|
||||
zathura->database = zathura_db_init(database_path);
|
||||
if (zathura->database == NULL) {
|
||||
girara_error("Unable to inizialize database. Bookmarks won't be available.");
|
||||
girara_error("Unable to initialize database. Bookmarks won't be available.");
|
||||
}
|
||||
g_free(database_path);
|
||||
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
Version=1.0
|
||||
Type=Application
|
||||
Name=Zathura
|
||||
Comment=A minimalistic PDF viewer
|
||||
Comment[de]=Ein minimalistischer PDF-Betrachter
|
||||
Comment=A minimalistic document viewer
|
||||
Comment[de]=Ein minimalistischer Dokumenten-Betrachter
|
||||
Exec=zathura %f
|
||||
Terminal=false
|
||||
Categories=Office;Viewer;
|
||||
MimeType=application/pdf;
|
||||
MimeType=application/pdf;application/postscript;image/vnd.djvu;
|
||||
|
|
Loading…
Reference in a new issue