Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
This commit is contained in:
Sebastian Ramacher 2014-10-29 00:06:22 +01:00
parent 2205156738
commit 6292b5c5c5

12
utils.c
View file

@ -71,7 +71,8 @@ document_index_build(GtkTreeModel* model, GtkTreeIter* parent,
girara_tree_node_t* tree) girara_tree_node_t* tree)
{ {
girara_list_t* list = girara_node_get_children(tree); girara_list_t* list = girara_node_get_children(tree);
GIRARA_LIST_FOREACH(list, girara_tree_node_t*, iter, node)
GIRARA_LIST_FOREACH(list, girara_tree_node_t*, iter, node) {
zathura_index_element_t* index_element = (zathura_index_element_t*)girara_node_get_data(node); zathura_index_element_t* index_element = (zathura_index_element_t*)girara_node_get_data(node);
zathura_link_type_t type = zathura_link_get_type(index_element->link); zathura_link_type_t type = zathura_link_get_type(index_element->link);
@ -93,8 +94,7 @@ document_index_build(GtkTreeModel* model, GtkTreeIter* parent,
if (girara_node_get_num_children(node) > 0) { if (girara_node_get_num_children(node) > 0) {
document_index_build(model, &tree_iter, node); document_index_build(model, &tree_iter, node);
} }
} GIRARA_LIST_FOREACH_END(list, gchar*, iter, name);
GIRARA_LIST_FOREACH_END(list, gchar*, iter, name);
} }
zathura_rectangle_t zathura_rectangle_t
@ -199,12 +199,12 @@ zathura_get_version_string(zathura_t* zathura, bool markup)
g_string_append(string, zathura_version); g_string_append(string, zathura_version);
g_free(zathura_version); g_free(zathura_version);
char* format = (markup == true) ? "\n<i>(plugin)</i> %s (%d.%d.%d) <i>(%s)</i>" : "\n(plugin) %s (%d.%d.%d) (%s)"; const char* format = (markup == true) ? "\n<i>(plugin)</i> %s (%d.%d.%d) <i>(%s)</i>" : "\n(plugin) %s (%d.%d.%d) (%s)";
/* plugin information */ /* plugin information */
girara_list_t* plugins = zathura_plugin_manager_get_plugins(zathura->plugins.manager); girara_list_t* plugins = zathura_plugin_manager_get_plugins(zathura->plugins.manager);
if (plugins != NULL) { if (plugins != NULL) {
GIRARA_LIST_FOREACH(plugins, zathura_plugin_t*, iter, plugin) GIRARA_LIST_FOREACH(plugins, zathura_plugin_t*, iter, plugin) {
char* name = zathura_plugin_get_name(plugin); char* name = zathura_plugin_get_name(plugin);
zathura_plugin_version_t version = zathura_plugin_get_version(plugin); zathura_plugin_version_t version = zathura_plugin_get_version(plugin);
char* text = g_strdup_printf(format, char* text = g_strdup_printf(format,
@ -216,7 +216,7 @@ zathura_get_version_string(zathura_t* zathura, bool markup)
); );
g_string_append(string, text); g_string_append(string, text);
g_free(text); g_free(text);
GIRARA_LIST_FOREACH_END(plugins, zathura_plugin_t*, iter, plugin); } GIRARA_LIST_FOREACH_END(plugins, zathura_plugin_t*, iter, plugin);
} }
char* version = string->str; char* version = string->str;