Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim-plugins.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hörist <forenjunkie@chello.at>2017-03-30 14:37:22 +0300
committerPhilipp Hörist <forenjunkie@chello.at>2017-03-30 14:37:22 +0300
commit37f7f48549eec6eee77cb8815ba833ca45dca681 (patch)
tree7e20e185a6fdfc25b06f3356a9d233b70b314996
parenta412b3f90607a003e4a3dcbaf5fa375c99ea7dac (diff)
[omemo] Replace 'Upload' with 'Download'
This happend due to copy/paste from httpupload
-rw-r--r--omemo/download_progress_dialog.ui (renamed from omemo/upload_progress_dialog.ui)0
-rw-r--r--omemo/file_decryption.py12
2 files changed, 6 insertions, 6 deletions
diff --git a/omemo/upload_progress_dialog.ui b/omemo/download_progress_dialog.ui
index d7021b7..d7021b7 100644
--- a/omemo/upload_progress_dialog.ui
+++ b/omemo/download_progress_dialog.ui
diff --git a/omemo/file_decryption.py b/omemo/file_decryption.py
index d0c8236..5a08319 100644
--- a/omemo/file_decryption.py
+++ b/omemo/file_decryption.py
@@ -184,7 +184,7 @@ class Download:
while True:
try:
if self.event.isSet():
- raise UploadAbortedException
+ raise DownloadAbortedException
temp = get_request.read(10000)
GLib.idle_add(
self.progressbar.update_progress, len(temp), size)
@@ -196,8 +196,8 @@ class Download:
stream.write(temp)
else:
return stream
- except UploadAbortedException as error:
- log.info('Upload Aborted')
+ except DownloadAbortedException as error:
+ log.info('Download Aborted')
errormsg = error
except URLError as error:
log.exception('URLError')
@@ -238,7 +238,7 @@ class ProgressWindow:
self.plugin = plugin
self.event = event
self.xml = gtkgui_helpers.get_gtk_builder(
- self.plugin.local_file_path('upload_progress_dialog.ui'))
+ self.plugin.local_file_path('download_progress_dialog.ui'))
self.dialog = self.xml.get_object('progress_dialog')
self.dialog.set_transient_for(window)
self.label = self.xml.get_object('label')
@@ -267,6 +267,6 @@ class ProgressWindow:
self.event.set()
-class UploadAbortedException(Exception):
+class DownloadAbortedException(Exception):
def __str__(self):
- return _('Upload Aborted')
+ return _('Download Aborted')