From 1e073b622f873df808c658e0f9508407b708c195 Mon Sep 17 00:00:00 2001
From: lovetox <forenjunkie@chelo.at>
Date: Fri, 30 Sep 2016 19:38:00 +0200
Subject: [PATCH] Add timeout to progressbar in VCard window

The progressbar was looping forever when someone sent us an invalid time result
---
 src/vcard.py | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/vcard.py b/src/vcard.py
index 1db27d43b..236f0bbc2 100644
--- a/src/vcard.py
+++ b/src/vcard.py
@@ -124,7 +124,9 @@ class VcardWindow:
         self.vcard_arrived = False
         self.os_info_arrived = False
         self.entity_time_arrived = False
-        self.update_progressbar_timeout_id = GLib.timeout_add(100,
+        self.time = 0
+        self.update_intervall = 100  # Milliseconds
+        self.update_progressbar_timeout_id = GLib.timeout_add(self.update_intervall,
             self.update_progressbar)
 
         gajim.ged.register_event_handler('version-result-received', ged.GUI1,
@@ -148,7 +150,14 @@ class VcardWindow:
 
     def update_progressbar(self):
         self.progressbar.pulse()
-        return True # loop forever
+        self.time += self.update_intervall
+        # Timeout in Milliseconds
+        if (self.vcard_arrived and self.os_info_arrived and
+                self.entity_time_arrived) or self.time == 10000:
+            self.progressbar.hide()
+            self.update_progressbar_timeout_id = None
+            return False
+        return True
 
     def on_vcard_information_window_destroy(self, widget):
         if self.update_progressbar_timeout_id is not None:
@@ -244,7 +253,6 @@ class VcardWindow:
                 elif i != 'jid': # Do not override jid_label
                     self.set_value(i + '_label', vcard[i])
         self.vcard_arrived = True
-        self.test_remove_progressbar()
 
     def clear_values(self):
         for l in ('FN', 'NICKNAME', 'N_FAMILY', 'N_GIVEN', 'N_MIDDLE',
@@ -274,13 +282,6 @@ class VcardWindow:
         self.clear_values()
         self.set_values(obj.vcard_dict)
 
-    def test_remove_progressbar(self):
-        if self.update_progressbar_timeout_id is not None and \
-        self.vcard_arrived and self.os_info_arrived and self.entity_time_arrived:
-            GLib.source_remove(self.update_progressbar_timeout_id)
-            self.progressbar.hide()
-            self.update_progressbar_timeout_id = None
-
     def set_last_status_time(self, obj):
         if obj.conn.name != self.account:
             return
@@ -317,7 +318,6 @@ class VcardWindow:
         self.xml.get_object('client_name_version_label').set_text(client)
         self.xml.get_object('os_label').set_text(os)
         self.os_info_arrived = True
-        self.test_remove_progressbar()
 
     def set_entity_time(self, obj):
         if obj.conn.name != self.account:
@@ -341,7 +341,6 @@ class VcardWindow:
             time_s = Q_('?Time:Unknown')
         self.xml.get_object('time_label').set_text(time_s)
         self.entity_time_arrived = True
-        self.test_remove_progressbar()
 
     def fill_status_label(self):
         if self.xml.get_object('information_notebook').get_n_pages() < 5: