From 979c460e7f71d153ae79da67b8b21c3412f0fe02 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 19 Feb 2011 13:51:00 +0000
Subject: Merge branch 'br/misc'

* br/misc:
  Use transparent background for the cgit logo
  ssdiff: anchors for ssdiff
  implement repo.logo and repo.logo-link
---
(limited to 'cgit.c')

diff --git a/cgit.c b/cgit.c
index 71f3fc8..916feb4 100644
--- a/cgit.c
+++ b/cgit.c
@@ -73,9 +73,13 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
 		repo->module_link= xstrdup(value);
 	else if (!strcmp(name, "section"))
 		repo->section = xstrdup(value);
-	else if (!strcmp(name, "readme") && value != NULL) {
+	else if (!strcmp(name, "readme") && value != NULL)
 		repo->readme = xstrdup(value);
-	} else if (ctx.cfg.enable_filter_overrides) {
+	else if (!strcmp(name, "logo") && value != NULL)
+		repo->logo = xstrdup(value);
+	else if (!strcmp(name, "logo-link") && value != NULL)
+		repo->logo_link = xstrdup(value);
+	else if (ctx.cfg.enable_filter_overrides) {
 		if (!strcmp(name, "about-filter"))
 			repo->about_filter = new_filter(value, 0);
 		else if (!strcmp(name, "commit-filter"))
--
cgit v0.9.0.2