fix: fixed favicons from merge conflict

This commit is contained in:
frosty
2026-03-23 10:46:17 -04:00
parent 5a4af40b74
commit 8b7b8de06c
2 changed files with 9 additions and 6 deletions

View File

@@ -28,7 +28,7 @@ typedef struct {
} InfoBoxHandler; } InfoBoxHandler;
enum { enum {
RESULT_FIELD_COUNT = 5, RESULT_FIELD_COUNT = 6,
LINK_FIELD_COUNT = 3, LINK_FIELD_COUNT = 3,
PAGER_WINDOW_SIZE = 5, PAGER_WINDOW_SIZE = 5,
}; };
@@ -741,6 +741,7 @@ int results_handler(UrlParams *params) {
continue; continue;
} }
char *pretty_url = pretty_display_url(display_url); char *pretty_url = pretty_display_url(display_url);
char *base_url = get_base_url(display_url);
results_matrix[unique_count][0] = strdup(display_url); results_matrix[unique_count][0] = strdup(display_url);
results_matrix[unique_count][1] = strdup(pretty_url); results_matrix[unique_count][1] = strdup(pretty_url);
@@ -750,12 +751,14 @@ int results_handler(UrlParams *params) {
results_matrix[unique_count][3] = results_matrix[unique_count][3] =
all_results[i][j].snippet ? strdup(all_results[i][j].snippet) all_results[i][j].snippet ? strdup(all_results[i][j].snippet)
: strdup(""); : strdup("");
results_matrix[unique_count][4] = NULL; results_matrix[unique_count][4] = strdup(base_url ? base_url : "");
results_matrix[unique_count][5] = NULL;
source_masks[unique_count] = (1u << i); source_masks[unique_count] = (1u << i);
results_inner_counts[unique_count] = RESULT_FIELD_COUNT; results_inner_counts[unique_count] = RESULT_FIELD_COUNT;
free(pretty_url); free(pretty_url);
free(base_url);
free(all_results[i][j].url); free(all_results[i][j].url);
free(all_results[i][j].title); free(all_results[i][j].title);
free(all_results[i][j].snippet); free(all_results[i][j].snippet);
@@ -766,10 +769,10 @@ int results_handler(UrlParams *params) {
} }
for (int i = 0; i < unique_count; i++) { for (int i = 0; i < unique_count; i++) {
results_matrix[i][4] = results_matrix[i][5] =
build_result_sources(source_masks[i], jobs, enabled_engine_count); build_result_sources(source_masks[i], jobs, enabled_engine_count);
if (!results_matrix[i][4]) if (!results_matrix[i][5])
results_matrix[i][4] = strdup(""); results_matrix[i][5] = strdup("");
} }
context_set_array_of_arrays(&ctx, "results", results_matrix, unique_count, context_set_array_of_arrays(&ctx, "results", results_matrix, unique_count,

View File

@@ -74,7 +74,7 @@
{{result[1]}} {{result[1]}}
</span> </span>
<span class="result-sources"> <span class="result-sources">
{{result[4]}} {{result[5]}}
</span> </span>
</div> </div>
<a href="{{result[0]}}"> <a href="{{result[0]}}">