#include "libravatar.h"
#include "libravatar_prefs.h"
#include "libravatar_missing.h"
+#include "libravatar_federation.h"
#include "prefs_common.h"
#include "procheader.h"
#include "procmsg.h"
debug_print("libravatar added '%s'\n", a);
procmsg_msginfo_add_avatar(acd->msginfo, AVATAR_LIBRAVATAR, a);
+ g_free(a);
}
return FALSE; /* keep getting */
static gchar *federated_base_url_from_address(const gchar *address)
{
- /*
- TODO: no federation supported right now
- Details on http://wiki.libravatar.org/running_your_own/
- */
+#if (defined USE_GNUTLS && GLIB_CHECK_VERSION(2,22,0))
+ gchar *base_url = NULL;
+
+ if (!libravatarprefs.allow_federated) {
+ debug_print("federated domains disabled by configuration\n");
+ goto default_url;
+ }
+
+ base_url = federated_url_for_address(address);
+ if (base_url != NULL) {
+ return base_url;
+ }
+
+default_url:
+#endif
return g_strdup(libravatarprefs.base_url);
}
}
curl_easy_setopt(curl, CURLOPT_URL, url);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_image_data_cb);
+ curl_easy_setopt(curl, CURLOPT_TIMEOUT, prefs_common_get_prefs()->io_timeout_secs);
+ curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
filename = cache_name_for_md5(md5);
file = fopen(filename, "wb");
long filesize;
if (libravatarprefs.allow_redirects) {
- long maxredirs = (libravatarprefs.default_mode == DEF_MODE_MM)? 2L: 1L;
+ long maxredirs = (libravatarprefs.default_mode == DEF_MODE_URL)? 3L
+ : ((libravatarprefs.default_mode == DEF_MODE_MM)? 2L: 1L);
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
curl_easy_setopt(curl, CURLOPT_MAXREDIRS, maxredirs);
else
image = image_widget_from_filename(filename);
- if (!libravatarprefs.cache_icons) {
+ if (!libravatarprefs.cache_icons || filesize == 0) {
if (g_unlink(filename) < 0)
g_warning("failed to delete cache file %s\n", filename);
}
if (filesize == 0)
missing_add_md5(libravatarmisses, md5);
} else {
- g_warning("could not open '%s' for writting\n", filename);
+ g_warning("could not open '%s' for writing\n", filename);
}
curl_easy_cleanup(curl);
g_free(filename);
if (ar->image) /* previous plugin set one */
gtk_widget_destroy(ar->image);
ar->image = image;
+ ar->type = AVATAR_LIBRAVATAR;
return FALSE;
}
/* not cached copy: try network */
if (ar->image) /* previous plugin set one */
gtk_widget_destroy(ar->image);
ar->image = image;
+ ar->type = AVATAR_LIBRAVATAR;
}
}
g_free(base);
*/
const gchar *plugin_desc(void)
{
- return _("Get and display libravatar images for mail messages.\n\n"
- "Info about libravatar at http://www.libravatar.org/\n\n"
+ return _("Display libravatar profiles' images for mail messages. More\n"
+ "info about libravatar at http://www.libravatar.org/. If you have\n"
+ "a gravatar.com profile but not a libravatar one, those will also\n"
+ "be retrieved (when redirections are allowed in plugin config).\n"
+ "Plugin config page is available from main window at:\n"
+ "/Configuration/Preferences/Plugins/Libravatar.\n\n"
+ "This plugin uses libcurl to retrieve images, so if you're behind a\n"
+ "proxy please refer to curl(1) manpage for details on 'http_proxy'\n"
+ "configuration. More details about this and others on README file.\n\n"
"Feedback to <ricardo@mones.org> is welcome.\n");
}