chk new version commit: fixing a bug introduced by tab when he changed the names of the var in config and adding a timeout
This commit is contained in:
parent
58e7da6d54
commit
4a90f80cfa
|
@ -33,10 +33,7 @@ GTKGUI_GLADE='gtkgui.glade'
|
||||||
class Check_for_new_version_dialog:
|
class Check_for_new_version_dialog:
|
||||||
def __init__(self, plugin):
|
def __init__(self, plugin):
|
||||||
self.plugin = plugin
|
self.plugin = plugin
|
||||||
try:
|
|
||||||
self.check_for_new_version()
|
self.check_for_new_version()
|
||||||
except:
|
|
||||||
pass
|
|
||||||
|
|
||||||
def parse_glade(self):
|
def parse_glade(self):
|
||||||
xml = gtk.glade.XML(GTKGUI_GLADE, 'new_version_available_dialog', APP)
|
xml = gtk.glade.XML(GTKGUI_GLADE, 'new_version_available_dialog', APP)
|
||||||
|
@ -56,13 +53,20 @@ class Check_for_new_version_dialog:
|
||||||
def check_for_new_version(self):
|
def check_for_new_version(self):
|
||||||
'''parse online Changelog to find out last version
|
'''parse online Changelog to find out last version
|
||||||
and the changes for that latest version'''
|
and the changes for that latest version'''
|
||||||
check_for_new_version_available = True # Why that ?
|
import urllib2
|
||||||
if check_for_new_version_available:
|
import socket
|
||||||
import urllib
|
dto = socket.getdefaulttimeout()
|
||||||
|
socket.setdefaulttimeout(5)
|
||||||
|
|
||||||
url = 'http://trac.gajim.org/file/trunk/Changelog?rev=latest&format=txt'
|
url = 'http://trac.gajim.org/file/trunk/Changelog?rev=latest&format=txt'
|
||||||
changelog = urllib.urlopen(url)
|
try:
|
||||||
# format is Gajim version (date)
|
changelog = urllib2.urlopen(url)
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
|
socket.setdefaulttimeout(dto)
|
||||||
|
|
||||||
|
# format is 'Gajim version (date)'
|
||||||
first_line = changelog.readline()
|
first_line = changelog.readline()
|
||||||
finish_version = first_line.find(' ', 6) # start search after 'Gajim'
|
finish_version = first_line.find(' ', 6) # start search after 'Gajim'
|
||||||
latest_version = first_line[6:finish_version]
|
latest_version = first_line[6:finish_version]
|
||||||
|
|
|
@ -696,7 +696,7 @@ class Interface:
|
||||||
if self.systray_capabilities:
|
if self.systray_capabilities:
|
||||||
self.show_systray()
|
self.show_systray()
|
||||||
|
|
||||||
if not gajim.config.get('check_for_new_version'):
|
if gajim.config.get('check_for_new_version'):
|
||||||
check_for_new_version.Check_for_new_version_dialog(self)
|
check_for_new_version.Check_for_new_version_dialog(self)
|
||||||
|
|
||||||
self.init_regexp()
|
self.init_regexp()
|
||||||
|
|
Loading…
Reference in New Issue