changeset f8c67c7b3156 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=f8c67c7b3156
description: Also cancel the jingle session when initiator for IBB transfer cancellation
diffstat:
src/common/file_props.py | 1 +
src/common/protocol/bytestream.py | 8 ++++++++
2 files changed, 9 insertions(+), 0 deletions(-)
diffs (29 lines):
diff -r e181dae4f5a5 -r f8c67c7b3156 src/common/file_props.py
--- a/src/common/file_props.py Sat Jan 19 21:24:30 2013 -0400
+++ b/src/common/file_props.py Sat Jan 19 21:40:19 2013 -0400
@@ -135,6 +135,7 @@
self.hash_ = None
self.fd = None
self.startexmpp = None
+ # Type of the session, if it is 'jingle' or 'si'
self.session_type = None
self.request_id = None
self.proxyhosts = None
diff -r e181dae4f5a5 -r f8c67c7b3156 src/common/protocol/bytestream.py
--- a/src/common/protocol/bytestream.py Sat Jan 19 21:24:30 2013 -0400
+++ b/src/common/protocol/bytestream.py Sat Jan 19 21:40:19 2013 -0400
@@ -811,6 +811,14 @@
file_props.direction[1:], 'set',
payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close',
{'sid':file_props.sid})]))
+ if file_props.session_type == 'jingle':
+ peerjid = \
+ file_props.receiver if file_props.type_ == 's' else file_props.sender
+ session = self.get_jingle_session(peerjid, file_props.sid, 'file')
+ # According to the xep, the initiator also cancels the jingle session
+ # if there are no more files to send using IBB
+ if session.weinitiate:
+ session.cancel_session()
def OpenStream(self, sid, to, fp, blocksize=4096):
changeset fa4b4ee70cac in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=fa4b4ee70cac
description: Use the icon sizing solution from ticket #6839 for all dialogs.
History manager’s icon was 16px in Unity launcher. Fixes #7290
diffstat:
src/gajim.py | 10 ++++++++--
src/history_manager.py | 11 ++++++++---
2 files changed, 16 insertions(+), 5 deletions(-)
diffs (41 lines):
diff -r 01fca413567d -r fa4b4ee70cac src/gajim.py
--- a/src/gajim.py Mon Jan 14 20:13:45 2013 +0100
+++ b/src/gajim.py Mon Jan 14 20:18:55 2013 +0100
@@ -384,8 +384,14 @@
if (show_remote_gajim_roster()):
print("Gajim is already running, bringing the roster to front...")
sys.exit(0)
- pix = gtkgui_helpers.get_icon_pixmap('gajim', 48)
- gtk.window_set_default_icon(pix) # set the icon to all newly opened wind
+ pixs = []
+ for size in (16, 32, 48, 64, 128):
+ pix = gtkgui_helpers.get_icon_pixmap('gajim', size)
+ if pix:
+ pixs.append(pix)
+ if pixs:
+ # set the icon to all windows
+ gtk.window_set_default_icon_list(*pixs)
pritext = _('Gajim is already running')
sectext = _('Another instance of Gajim seems to be running\nRun anyway?')
dialog = dialogs.YesNoDialog(pritext, sectext)
diff -r 01fca413567d -r fa4b4ee70cac src/history_manager.py
--- a/src/history_manager.py Mon Jan 14 20:13:45 2013 +0100
+++ b/src/history_manager.py Mon Jan 14 20:18:55 2013 +0100
@@ -108,9 +108,14 @@
class HistoryManager:
def __init__(self):
- pix = gtkgui_helpers.get_icon_pixmap('gajim')
- # set the icon to all newly opened windows
- gtk.window_set_default_icon(pix)
+ pixs = []
+ for size in (16, 32, 48, 64, 128):
+ pix = gtkgui_helpers.get_icon_pixmap('gajim', size)
+ if pix:
+ pixs.append(pix)
+ if pixs:
+ # set the icon to all windows
+ gtk.window_set_default_icon_list(*pixs)
if not os.path.exists(LOG_DB_PATH):
dialogs.ErrorDialog(_('Cannot find history logs database'),
changeset 01fca413567d in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=01fca413567d
description: [Daniel Aleksandersen] Use encrypted Google search. Fixes #7289
diffstat:
src/common/config.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 65365e38d240 -r 01fca413567d src/common/config.py
--- a/src/common/config.py Fri Jan 11 22:57:22 2013 +0400
+++ b/src/common/config.py Mon Jan 14 20:13:45 2013 +0100
@@ -186,7 +186,7 @@
'last_roster_visible': [opt_bool, True],
'key_up_lines': [opt_int, 25, _('How many lines to store for Ctrl+KeyUP.')],
'version': [ opt_str, defs.version ], # which version created the config
- 'search_engine': [opt_str, 'http://www.google.com/search?&q=%s&sourceid=gajim'],
+ 'search_engine': [opt_str, 'https://www.google.com/search?&q=%s&sourceid=gajim'],
'dictionary_url': [opt_str, 'WIKTIONARY', _("Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary.")],
'always_english_wikipedia': [opt_bool, False],
'always_english_wiktionary': [opt_bool, True],