Commit 88e31c0c authored by Moritz Lipp's avatar Moritz Lipp
Browse files

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

Conflicts:
	callbacks.c
parents 05311ca0 b719e870
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "render.h" #include "render.h"
#include "document.h" #include "document.h"
#include "utils.h" #include "utils.h"
#include "shortcuts.h"
gboolean gboolean
cb_destroy(GtkWidget* UNUSED(widget), gpointer UNUSED(data)) cb_destroy(GtkWidget* UNUSED(widget), gpointer UNUSED(data))
...@@ -92,7 +93,7 @@ cb_pages_per_row_value_changed(girara_session_t* UNUSED(session), girara_setting ...@@ -92,7 +93,7 @@ cb_pages_per_row_value_changed(girara_session_t* UNUSED(session), girara_setting
void void
cb_index_row_activated(GtkTreeView* tree_view, GtkTreePath* path, cb_index_row_activated(GtkTreeView* tree_view, GtkTreePath* path,
GtkTreeViewColumn* column, zathura_t* zathura) GtkTreeViewColumn* UNUSED(column), zathura_t* zathura)
{ {
if (tree_view == NULL || zathura == NULL || zathura->ui.session == NULL) { if (tree_view == NULL || zathura == NULL || zathura->ui.session == NULL) {
return; return;
......
...@@ -68,7 +68,7 @@ file_valid_extension(zathura_t* zathura, const char* path) ...@@ -68,7 +68,7 @@ file_valid_extension(zathura_t* zathura, const char* path)
} }
GIRARA_LIST_FOREACH_END(zathura->plugins.type_plugin_mapping, zathura_type_plugin_mapping_t*, iter, mapping) GIRARA_LIST_FOREACH_END(zathura->plugins.type_plugin_mapping, zathura_type_plugin_mapping_t*, iter, mapping)
g_free(content_type); g_free((void*)content_type);
return result; return result;
} }
......
...@@ -63,11 +63,13 @@ zathura_init(int argc, char* argv[]) ...@@ -63,11 +63,13 @@ zathura_init(int argc, char* argv[])
/* plugins */ /* plugins */
zathura->plugins.plugins = girara_list_new(); zathura->plugins.plugins = girara_list_new();
girara_list_set_free_function(zathura->plugins.plugins, zathura_document_plugin_free); girara_list_set_free_function(zathura->plugins.plugins,
(girara_free_function_t)zathura_document_plugin_free);
zathura->plugins.path = girara_list_new(); zathura->plugins.path = girara_list_new();
girara_list_set_free_function(zathura->plugins.path, g_free); girara_list_set_free_function(zathura->plugins.path, g_free);
zathura->plugins.type_plugin_mapping = girara_list_new(); zathura->plugins.type_plugin_mapping = girara_list_new();
girara_list_set_free_function(zathura->plugins.type_plugin_mapping, zathura_type_plugin_mapping_free); girara_list_set_free_function(zathura->plugins.type_plugin_mapping,
(girara_free_function_t)zathura_type_plugin_mapping_free);
if (config_dir) { if (config_dir) {
zathura->config.config_dir = g_strdup(config_dir); zathura->config.config_dir = g_strdup(config_dir);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment