From e255c7223ffc9f00f3c85bb573381cf20fcd40a6 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Thu, 6 Dec 2012 10:51:22 +0100
Subject: Use django-gravatar2, the other one is unmaintained and buggy

---
 hyperkitty.spec                             | 2 +-
 hyperkitty/templates/messages/message.html  | 2 +-
 hyperkitty/templates/month_view.html        | 2 +-
 hyperkitty/templates/recent_activities.html | 2 +-
 hyperkitty/templates/search.html            | 2 +-
 hyperkitty/templates/threads/right_col.html | 2 +-
 requirements.txt                            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hyperkitty.spec b/hyperkitty.spec
index 53b151e..5124232 100644
--- a/hyperkitty.spec
+++ b/hyperkitty.spec
@@ -19,7 +19,7 @@ BuildRequires:  django-rest-framework >= 0.3.3
 BuildRequires:  django-social-auth >= 0.7.0
 
 Requires:       Django >= 1.4
-Requires:       django-gravatar >= 0.1.0
+Requires:       django-gravatar2
 Requires:       django-social-auth >= 0.7.0
 Requires:       django-rest-framework >= 0.3.3
 Requires:       mailman >= 3.0.0b2
diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index d235813..9fec43d 100644
--- a/hyperkitty/templates/messages/message.html
+++ b/hyperkitty/templates/messages/message.html
@@ -16,7 +16,7 @@
 		<span class="time" title="Sender's time: {{email|sender_date|date:"l, j F H:i:s"}}">{{email|viewer_date|date:"H:i:s"}}</span>
 	</div>
     <div class="gravatar{% if use_mockups %} pull-left{% endif %}">
-        {% gravatar_img_for_email email.sender_email 40 %}
+        {% gravatar email.sender_email 40 %}
     </div>
 	<div class="email_author inline-block">
 		<span class="name"><a href="{% url message_index mlist_fqdn=list_address, hashid=email.message_id_hash %}">{{email.sender_name|escapeemail}}</a></span>
diff --git a/hyperkitty/templates/month_view.html b/hyperkitty/templates/month_view.html
index e53bab6..511866c 100644
--- a/hyperkitty/templates/month_view.html
+++ b/hyperkitty/templates/month_view.html
@@ -49,7 +49,7 @@
 			{% endif %}
 			<div class="inline-block gravatar">
 				{% if thread.starting_email.sender_email %}
-				{% gravatar_img_for_email thread.starting_email.sender_email 40 %}
+				{% gravatar thread.starting_email.sender_email 40 %}
 				<br />
 				{% endif %}
 				{{ thread.starting_email.sender_name|escapeemail }}
diff --git a/hyperkitty/templates/recent_activities.html b/hyperkitty/templates/recent_activities.html
index 242d38a..dd9d4bc 100644
--- a/hyperkitty/templates/recent_activities.html
+++ b/hyperkitty/templates/recent_activities.html
@@ -167,7 +167,7 @@
 			</div>
 			<div class="inline-block gravatar">
 				{% if author.email %}
-				{% gravatar_img_for_email author.email 40 %}
+				{% gravatar author.email 40 %}
 				<br />
 				{% endif %}
 			</div>
diff --git a/hyperkitty/templates/search.html b/hyperkitty/templates/search.html
index 303b9a5..18d2710 100644
--- a/hyperkitty/templates/search.html
+++ b/hyperkitty/templates/search.html
@@ -30,7 +30,7 @@
 		{% endif %}
 		<div class="inline-block gravatar">
 			{% if email.sender_email %}
-			{% gravatar_img_for_email email.sender_email 40 %}
+			{% gravatar email.sender_email 40 %}
 			<br />
 			{% endif %}
 			{{email.sender_name}}
diff --git a/hyperkitty/templates/threads/right_col.html b/hyperkitty/templates/threads/right_col.html
index 11ff90a..dcf00e7 100644
--- a/hyperkitty/templates/threads/right_col.html
+++ b/hyperkitty/templates/threads/right_col.html
@@ -52,7 +52,7 @@
 		<ul>
 			{% for name, email in participants.items|sort %}
 			<li>
-				{% gravatar_img_for_email email 20 %}
+				{% gravatar email 20 %}
 				{{ name|escapeemail }}
 			</li>
 			{% endfor %}
diff --git a/requirements.txt b/requirements.txt
index b6f9c4a..ed3f1e0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 Django>=1.4
-django-gravatar>=0.1.0
+django-gravatar2
 django-social-auth>=0.7.0
 djangorestframework>=0.3.3
 mailman>=3.0.0b2
-- 
cgit