mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2025-01-31 04:04:56 +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:
Moritz Lipp 2011-10-05 13:49:45 +02:00
commit 6730160df0
6 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -101,7 +101,7 @@ uninstall:
$(ECHO) removing desktop file $(ECHO) removing desktop file
$(QUIET)rm -f ${DESTDIR}${DESKTOPPREFIX}/${PROJECT}.desktop $(QUIET)rm -f ${DESTDIR}${DESKTOPPREFIX}/${PROJECT}.desktop
$(ECHO) removing pkgconfig file $(ECHO) removing pkgconfig file
$(QUIET)rm -f ${DESTDIR}${PREFIX}/lib/pkgconfig $(QUIET)rm -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${PROJECT}.pc
-include $(wildcard .depend/*.dep) -include $(wildcard .depend/*.dep)

8
README
View file

@ -7,9 +7,15 @@ Requirements
------------ ------------
gtk2 (>= 2.18.6) gtk2 (>= 2.18.6)
girara girara
sqlite3
Please note that you need to have a working pkg-config installation 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 Installation
------------ ------------

5
bookmarks.c
View file

@ -81,8 +81,11 @@ zathura_bookmark_free(zathura_bookmark_t* bookmark)
bool bool
zathura_bookmarks_load(zathura_t* zathura, const gchar* file) { 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); g_return_val_if_fail(file, false);
if (zathura->database == NULL) {
return false;
}
girara_list_t* bookmarks = zathura_db_load_bookmarks(zathura->database, file); girara_list_t* bookmarks = zathura_db_load_bookmarks(zathura->database, file);
if (!bookmarks) { if (!bookmarks) {

4
shortcuts.c
View file

@ -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 != 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;
g_return_val_if_fail(zathura->document != NULL, false); if (zathura->document == NULL) {
return false;
}
girara_tree_node_t* document_index = NULL; girara_tree_node_t* document_index = NULL;
GtkWidget* treeview = NULL; GtkWidget* treeview = NULL;

6
zathura.c
View file

@ -87,6 +87,10 @@ zathura_init(int argc, char* argv[])
g_free(path); 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) { if (plugin_path) {
gchar** paths = g_strsplit(plugin_path, ":", 0); gchar** paths = g_strsplit(plugin_path, ":", 0);
for (unsigned int i = 0; paths[i] != '\0'; ++i) { 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); char* database_path = g_build_filename(zathura->config.data_dir, "bookmarks.sqlite", NULL);
zathura->database = zathura_db_init(database_path); zathura->database = zathura_db_init(database_path);
if (zathura->database == NULL) { 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); g_free(database_path);

6
zathura.desktop
View file

@ -2,9 +2,9 @@
Version=1.0 Version=1.0
Type=Application Type=Application
Name=Zathura Name=Zathura
Comment=A minimalistic PDF viewer Comment=A minimalistic document viewer
Comment[de]=Ein minimalistischer PDF-Betrachter Comment[de]=Ein minimalistischer Dokumenten-Betrachter
Exec=zathura %f Exec=zathura %f
Terminal=false Terminal=false
Categories=Office;Viewer; Categories=Office;Viewer;
MimeType=application/pdf; MimeType=application/pdf;application/postscript;image/vnd.djvu;