Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim
Commits:
-
c8878555
by Philipp Hörist at 2018-03-17T21:48:51+01:00
-
50f7abcb
by Philipp Hörist at 2018-03-17T21:49:01+01:00
2 changed files:
Changes:
| ... | ... | @@ -431,6 +431,8 @@ def get_uf_sub(sub): |
| 431 | 431 |
uf_sub = _('From')
|
| 432 | 432 |
elif sub == 'both':
|
| 433 | 433 |
uf_sub = _('Both')
|
| 434 |
+ elif sub is None:
|
|
| 435 |
+ uf_sub = _('Unknown')
|
|
| 434 | 436 |
else:
|
| 435 | 437 |
uf_sub = sub
|
| 436 | 438 |
|
| ... | ... | @@ -1154,20 +1154,22 @@ class Interface: |
| 1154 | 1154 |
action=Gtk.FileChooserAction.OPEN,
|
| 1155 | 1155 |
buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
|
| 1156 | 1156 |
Gtk.STOCK_OPEN, Gtk.ResponseType.OK),
|
| 1157 |
+ select_multiple=True,
|
|
| 1157 | 1158 |
default_response=Gtk.ResponseType.OK,
|
| 1158 | 1159 |
transient_for=chat_control.parent_win.window)
|
| 1159 | 1160 |
|
| 1160 | 1161 |
@staticmethod
|
| 1161 | 1162 |
def on_file_dialog_ok(widget, chat_control):
|
| 1162 |
- path = widget.get_filename()
|
|
| 1163 |
+ paths = widget.get_filenames()
|
|
| 1163 | 1164 |
widget.destroy()
|
| 1164 | 1165 |
con = app.connections[chat_control.account]
|
| 1165 | 1166 |
groupchat = chat_control.type_id == message_control.TYPE_GC
|
| 1166 |
- con.check_file_before_transfer(path,
|
|
| 1167 |
- chat_control.encryption,
|
|
| 1168 |
- chat_control.contact,
|
|
| 1169 |
- chat_control.session,
|
|
| 1170 |
- groupchat)
|
|
| 1167 |
+ for path in paths:
|
|
| 1168 |
+ con.check_file_before_transfer(path,
|
|
| 1169 |
+ chat_control.encryption,
|
|
| 1170 |
+ chat_control.contact,
|
|
| 1171 |
+ chat_control.session,
|
|
| 1172 |
+ groupchat)
|
|
| 1171 | 1173 |
|
| 1172 | 1174 |
def encrypt_file(self, file, callback):
|
| 1173 | 1175 |
app.nec.push_incoming_event(HTTPUploadProgressEvent(
|