Commit 442945f0 authored by Philipp Hörist's avatar Philipp Hörist

Merge branch 'master' into 'master'

0.9.9

Closes #176

See merge request !13
parents 57bf6938 eecb4143
......@@ -23,6 +23,11 @@ from common import helpers
from common import gajim
import logging
if gajim.HAVE_PYCURL:
import pycurl
from cStringIO import StringIO
log = logging.getLogger('gajim.plugin_system.url_image_preview.http_functions')
def get_http_head(account, url):
......@@ -70,8 +75,6 @@ def _get_http_head_proxy(url, proxy):
if not gajim.HAVE_PYCURL:
log.error('PYCURL not installed')
return ('', 0)
import pycurl
from cStringIO import StringIO
headers = ''
try:
......
[info]
name: Url image preview
short_name: url_image_preview
version: 0.9.8
version: 0.9.9
description: Displays a preview of links to images
authors = Denis Fomin <fominde@gmail.com>
Yann Leboulanger <asterix@lagaule.org>
Anders Sandblad <runeson@gmail.com>
Thilo Molitor <thilo@eightysoft.de>
Philipp Hoerist <philipp@hoerist.com>
homepage = http://trac-plugins.gajim.org/wiki/UrlImagePreviewPlugin
homepage = https://dev.gajim.org/gajim/gajim-plugins/wikis/UrlImagePreviewPlugin
min_gajim_version: 0.16.4
max_gajim_version: 0.16.9
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment