changeset 2ba669552014 in /home/hg/repos/gajim
author: Yann Leboulanger <asterix(a)lagaule.org>
branches: gajim_0.16
details:http://hg.gajim.org/gajim?cmd=changeset;node=2ba669552014
description: force sending muc invitation to the jid/resource if we're chatting with a specific resource. Fixes #7582
diffstat:
src/gui_menu_builder.py | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diffs (39 lines):
diff -r 1bfc67ffde16 -r 2ba669552014 src/gui_menu_builder.py
--- a/src/gui_menu_builder.py Fri Jan 10 15:55:00 2014 +0100
+++ b/src/gui_menu_builder.py Mon Jan 13 20:25:07 2014 +0100
@@ -64,9 +64,11 @@
return sub_menu
def build_invite_submenu(invite_menuitem, list_, ignore_rooms=[],
-show_bookmarked=False):
+show_bookmarked=False, force_resource=False):
"""
list_ in a list of (contact, account)
+ force_resource means we want to send invitation even if there is only one
+ resource
"""
roster = gajim.interface.roster
# used if we invite only one contact with several resources
@@ -103,7 +105,7 @@
elif len(list_) == 1 and contact.supports(NS_MUC):
invite_menuitem.set_sensitive(True)
# use resource if it's self contact
- if contact.jid == gajim.get_jid_from_account(account):
+ if contact.jid == gajim.get_jid_from_account(account) or force_resource:
resource = contact.resource
else:
resource = None
@@ -454,8 +456,12 @@
build_invite_submenu(invite_menuitem, [(gc_contact, account)],
show_bookmarked=bookmarked)
else:
+ force_resource = False
+ if control and control.resource:
+ force_resource = True
build_invite_submenu(invite_menuitem, [(contact, account)],
- show_bookmarked=contact.supports(NS_CONFERENCE))
+ show_bookmarked=contact.supports(NS_CONFERENCE),
+ force_resource=force_resource)
if gajim.account_is_disconnected(account):
invite_menuitem.set_sensitive(False)
changeset 1bfc67ffde16 in /home/hg/repos/gajim
author: Fedor Brunner <fedor.brunner(a)azet.sk>
branches: gajim_0.16
details:http://hg.gajim.org/gajim?cmd=changeset;node=1bfc67ffde16
description: Replace the DH parameters from document "Assigned Number for SKIP Protocols"
with new DH parameters because the previous values failed the OpenSSL
dhcheck. Fixes #7623
diffstat:
data/other/dh4096.pem | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diffs (33 lines):
diff -r a013891a5aaa -r 1bfc67ffde16 data/other/dh4096.pem
--- a/data/other/dh4096.pem Tue Jan 07 19:51:56 2014 +0100
+++ b/data/other/dh4096.pem Fri Jan 10 15:55:00 2014 +0100
@@ -1,18 +1,13 @@
-----BEGIN DH PARAMETERS-----
-MIICCAKCAgEA+hRyUsFN4VpJ1O8JLcCo/VWr19k3BCgJ4uk+d+KhehjdRqNDNyOQ
-l/MOyQNQfWXPeGKmOmIig6Ev/nm6Nf9Z2B1h3R4hExf+zTiHnvVPeRBhjdQi81rt
-Xeoh6TNrSBIKIHfUJWBh3va0TxxjQIs6IZOLeVNRLMqzeylWqMf49HsIXqbcokUS
-Vt1BkvLdW48j8PPv5DsKRN3tloTxqDJGo9tKvj1Fuk74A+Xda1kNhB7KFlqMyN98
-VETEJ6c7KpfOo30mnK30wqw3S8OtaIR/maYX72tGOno2ehFDkq3pnPtEbD2CScxc
-alJC+EL7RPk5c/tgeTvCngvc1KZn92Y//EI7G9tPZtylj2b56sHtMftIoYJ9+ODM
-sccD5Piz/rejE3Ome8EOOceUSCYAhXn8b3qvxVI1ddd1pED6FHRhFvLrZxFvBEM9
-ERRMp5QqOaHJkM+Dxv8Cj6MqrCbfC4u+ZErxodzuusgDgvZiLF22uxMZbobFWyte
-OvOzKGtwcTqO/1wV5gKkzu1ZVswVUQd5Gg8lJicwqRWyyNRczDDoG9jVDxmogKTH
-AaqLulO7R8Ifa1SwF2DteSGVtgWEN8gDpN3RBmmPTDngyF2DHb5qmpnznwtFKdTL
-KWbuHn491xNO25CQWMtem80uKw+pTnisBRF/454n1Jnhub144YRBoN8CAQI=
+MIICCAKCAgEA9RBdjft9pcfy2WZWWgz7uKzHg0O8ltdU045O5aZIkbmfe6ec6spu
+GlJwCpA8FpRK99R2JYZkPDuJkJOR3Yonm3leJB8ZO1sgak36tf1KXosn86STtwh8
+ppA27Idx4dZwFn8wPCnfcVqCq/4DXR7mB3miHOMZx8kmjhRO86doTZHWsTYej1ei
+pbk9lekYJzI7ohEITnLoiUKfquzfg71JGcGKF6dvXlcc4iXuPluqz1fsua4eY/tm
+kPlvqoYXsmtQIszk2YIsgk8kDBv9BBbcFITXDFEMxPc5Qof4MTTHWOHvyyXqiNJt
+d1cWkrpGKx+H2MDoLW8Ssf3v/oCj3tP+LbOa+rqme39ARK8SZpimjkBw0qMQcIux
+LTXFPrLTszzza3Nfthtc1H1MuoVsdJSDjTe94FajPewsI3Cc2fVgSh6puS6S3gsf
+dblNMNYRjQSMRr3LGahSnWOG6ux+1Nau3hCwCOIZpZs3DZurRZ+EFYWxG+83DMlu
+Vxg7cXrzofyBShb/lVCERVyKCuGIAJSkKfC/D5tcCHHEB34ep8ZMc+2UEslK8dSW
+4cQcqG3/KOwpsV0zXfaX0xhS8/95gnAgCZRiDiUWVskJ6JxWvqg40N2dBK7tT/Gq
+sayPDdAY/B/lBfcJzuD6uxCf1wBCMtg01bVe7tipxSlhGgBpKBoJa4sCAQI=
-----END DH PARAMETERS-----
-
-These are the 4096 bit DH parameters from "Assigned Number for SKIP Protocols"
-(http://www.skip-vpn.org/spec/numbers.html).
-See there for how they were generated.
-Note that g is not a generator, but this is not a problem since p is a safe prime.
changeset a013891a5aaa in /home/hg/repos/gajim
author: Yann Leboulanger <asterix(a)lagaule.org>
branches: gajim_0.16
details:http://hg.gajim.org/gajim?cmd=changeset;node=a013891a5aaa
description: change variable name
diffstat:
src/common/helpers.py | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diffs (65 lines):
diff -r fc9266b12ac0 -r a013891a5aaa src/common/helpers.py
--- a/src/common/helpers.py Sun Jan 05 23:03:43 2014 +0100
+++ b/src/common/helpers.py Tue Jan 07 19:51:56 2014 +0100
@@ -747,49 +747,49 @@
path_to_soundfile = gajim.config.get_per('soundevents', event, 'path')
play_sound_file(path_to_soundfile)
-def check_soundfile_path(file, dirs=(gajim.gajimpaths.data_root,
+def check_soundfile_path(file_, dirs=(gajim.gajimpaths.data_root,
gajim.DATA_DIR)):
"""
Check if the sound file exists
- :param file: the file to check, absolute or relative to 'dirs' path
+ :param file_: the file to check, absolute or relative to 'dirs' path
:param dirs: list of knows paths to fallback if the file doesn't exists
(eg: ~/.gajim/sounds/, DATADIR/sounds...).
:return the path to file or None if it doesn't exists.
"""
- if not file:
+ if not file_:
return None
- elif os.path.exists(file):
- return file
+ elif os.path.exists(file_):
+ return file_
for d in dirs:
- d = os.path.join(d, 'sounds', file)
+ d = os.path.join(d, 'sounds', file_)
if os.path.exists(d):
return d
return None
-def strip_soundfile_path(file, dirs=(gajim.gajimpaths.data_root,
+def strip_soundfile_path(file_, dirs=(gajim.gajimpaths.data_root,
gajim.DATA_DIR), abs=True):
"""
Remove knowns paths from a sound file
Filechooser returns absolute path. If path is a known fallback path, we remove it.
So config have no hardcoded path to DATA_DIR and text in textfield is shorther.
- param: file: the filename to strip.
+ param: file_: the filename to strip.
param: dirs: list of knowns paths from which the filename should be stripped.
param: abs: force absolute path on dirs
"""
- if not file:
+ if not file_:
return None
- name = os.path.basename(file)
+ name = os.path.basename(file_)
for d in dirs:
d = os.path.join(d, 'sounds', name)
if abs:
d = os.path.abspath(d)
- if file == d:
+ if file_ == d:
return name
- return file
+ return file_
def play_sound_file(path_to_soundfile):
if path_to_soundfile == 'beep':
changeset 916077f9f201 in /home/hg/repos/gajim
author: Denis Fomin <fominde(a)gmail.com>
branches: gajim_0.16
details:http://hg.gajim.org/gajim?cmd=changeset;node=916077f9f201
description: "A connection is not available" transient for chat control. Fixes#7098
diffstat:
src/chat_control.py | 3 ++-
1 файлов изменено, 2 вставок(+), 1 удалений(-)
различия (13 строк):
diff -r ab96f0a9ef2a -r 916077f9f201 src/chat_control.py
--- a/src/chat_control.py Thu Jan 02 12:33:54 2014 +0400
+++ b/src/chat_control.py Fri Jan 03 14:17:40 2014 +0400
@@ -798,7 +798,8 @@
if gajim.connections[self.account].connected < 2 and send_message:
# we are not connected
dialogs.ErrorDialog(_('A connection is not available'),
- _('Your message can not be sent until you are connected.'))
+ _('Your message can not be sent until you are connected.'),
+ transient_for=self.parent_win.window)
send_message = False
if send_message: