Merge branch 'indev'

1 files changed, 17 insertions, 5 deletions

diff --git a/src/Utility/Utility.h b/src/Utility/Utility.h
index 1e1de09..a194f21 100644
--- a/src/Utility/Utility.h
+++ b/src/Utility/Utility.h
@@ -13,6 +13,13 @@
 
 #define LINK_FIELD_COUNT 3
 
+typedef struct {
+  char ***rows;
+  int *field_counts;
+  int count;
+  int capacity;
+} StringMatrix;
+
 int hex_to_int(char c);
 char *get_theme(const char *default_theme);
 void init_themes(const char *static_path);
@@ -23,12 +30,17 @@ char *get_locale(const char *default_locale);
 int is_engine_id_enabled(const char *engine_id);
 int get_user_engines(char ***out_ids, int *out_count);
 int user_engines_contains(const char *engine_id, char **ids, int count);
+char *get_default_search_engine(void);
+
+void free_string_matrix(char ***matrix, int *inner_counts, int row_count);
 
-int add_link_to_collection(const char *href, const char *label,
-                           const char *class_name, char ****collection,
-                           int **inner_counts, int current_count);
+void string_matrix_init(StringMatrix *matrix);
+int string_matrix_append(StringMatrix *matrix, const char *const *values,
+                         int field_count);
+void string_matrix_free(StringMatrix *matrix);
 
-int build_pagination(int page, char *(*href_builder)(int page, void *data),
-                     void *data, char ****out_matrix, int **out_inner_counts);
+int string_matrix_build_pagination(int page,
+                                   char *(*href_builder)(int page, void *data),
+                                   void *data, StringMatrix *out_matrix);
 
 #endif