adopt to girara changes

This commit is contained in:
Sebastian Ramacher 2011-10-17 11:16:14 +02:00
parent bcfa016097
commit 10fbf29125
4 changed files with 8 additions and 8 deletions

View file

@ -16,7 +16,7 @@ zathura_bookmark_add(zathura_t* zathura, const gchar* id, unsigned int page)
girara_list_iterator_free(iter); girara_list_iterator_free(iter);
return NULL; return NULL;
} }
GIRARA_LIST_FOREACH_END(zathura->bookmarks.bookmarks, zathura_bookmark_t*, iter, bookmark) GIRARA_LIST_FOREACH_END(zathura->bookmarks.bookmarks, zathura_bookmark_t*, iter, bookmark);
zathura_bookmark_t* bookmark = g_malloc0(sizeof(zathura_bookmark_t)); zathura_bookmark_t* bookmark = g_malloc0(sizeof(zathura_bookmark_t));
bookmark->id = g_strdup(id); bookmark->id = g_strdup(id);
@ -63,7 +63,7 @@ zathura_bookmark_get(zathura_t* zathura, const gchar* id)
girara_list_iterator_free(iter); girara_list_iterator_free(iter);
return bookmark; return bookmark;
} }
GIRARA_LIST_FOREACH_END(zathura->bookmarks.bookmarks, zathura_bookmark_t*, iter, bookmark) GIRARA_LIST_FOREACH_END(zathura->bookmarks.bookmarks, zathura_bookmark_t*, iter, bookmark);
return NULL; return NULL;
} }

View file

@ -165,7 +165,7 @@ cc_bookmarks(girara_session_t* session, const char* input)
girara_completion_group_add_element(group, bookmark->id, paged); girara_completion_group_add_element(group, bookmark->id, paged);
g_free(paged); g_free(paged);
} }
GIRARA_LIST_FOREACH_END(zathura->bookmarks.bookmarks, zathura_bookmark_t*, iter, bookmark) GIRARA_LIST_FOREACH_END(zathura->bookmarks.bookmarks, zathura_bookmark_t*, iter, bookmark);
girara_completion_add_group(completion, group); girara_completion_add_group(completion, group);

View file

@ -146,7 +146,7 @@ zathura_document_plugin_register(zathura_t* zathura, zathura_document_plugin_t*
girara_error("plugin: already registered for filetype %s\n", type); girara_error("plugin: already registered for filetype %s\n", type);
} }
atleastone = true; atleastone = true;
GIRARA_LIST_FOREACH_END(new_plugin->content_types, gchar*, iter, type) GIRARA_LIST_FOREACH_END(new_plugin->content_types, gchar*, iter, type);
if (atleastone) { if (atleastone) {
girara_list_append(zathura->plugins.plugins, new_plugin); girara_list_append(zathura->plugins.plugins, new_plugin);
@ -203,7 +203,7 @@ zathura_document_open(zathura_t* zathura, const char* path, const char* password
plugin = mapping->plugin; plugin = mapping->plugin;
break; break;
} }
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((void*)content_type); g_free((void*)content_type);
if (plugin == NULL) { if (plugin == NULL) {
@ -566,7 +566,7 @@ zathura_type_plugin_mapping_new(zathura_t* zathura, const gchar* type, zathura_d
girara_list_iterator_free(iter); girara_list_iterator_free(iter);
return false; return false;
} }
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);
zathura_type_plugin_mapping_t* mapping = g_malloc(sizeof(zathura_type_plugin_mapping_t)); zathura_type_plugin_mapping_t* mapping = g_malloc(sizeof(zathura_type_plugin_mapping_t));
mapping->type = g_strdup(type); mapping->type = g_strdup(type);

View file

@ -66,7 +66,7 @@ file_valid_extension(zathura_t* zathura, const char* path)
result = true; result = true;
break; break;
} }
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((void*)content_type); g_free((void*)content_type);
return result; return result;
@ -173,7 +173,7 @@ document_index_build(GtkTreeModel* model, GtkTreeIter* parent,
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);
} }
char* char*