gajim: remove duplicate function
changeset a7a2a364bc82 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=a7a2a364bc82
description: remove duplicate function
diffstat:
src/common/gajim.py | 5 -
src/gajim.py| 1 +
2 files changed, 1 insertions(+), 5 deletions(-)
diffs (26 lines):
diff -r c59cb524a259 -r a7a2a364bc82 src/common/gajim.py
--- a/src/common/gajim.py Sun Jan 03 14:18:37 2010 +0100
+++ b/src/common/gajim.py Mon Jan 04 11:58:42 2010 +0100
@@ -223,11 +223,6 @@
pos = jid.find('@') + 1 # after @
return jid[pos:]
-def get_resource_from_jid(jid):
- tokens = jid.split('/', 1)
- if len(tokens) 1:
- return tokens[1]
-
def get_name_and_server_from_jid(jid):
name = get_nick_from_jid(jid)
server = get_server_from_jid(jid)
diff -r c59cb524a259 -r a7a2a364bc82 src/gajim.py
--- a/src/gajim.py Sun Jan 03 14:18:37 2010 +0100
+++ b/src/gajim.py Mon Jan 04 11:58:42 2010 +0100
@@ -382,6 +382,7 @@
# Session Management support
try:
import gnome.ui
+ raise ImportError
except ImportError:
pass
else:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Really ignore messages from invalid jids. Fixes #5539
changeset 779a1c0674ca in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=779a1c0674ca
description: Really ignore messages from invalid jids. Fixes #5539
diffstat:
src/common/connection_handlers.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diffs (11 lines):
diff -r f29561219fe0 -r 779a1c0674ca src/common/connection_handlers.py
--- a/src/common/connection_handlers.py Sat Jan 02 22:22:25 2010 +0100
+++ b/src/common/connection_handlers.py Sat Jan 02 22:45:02 2010 +0100
@@ -1891,6 +1891,7 @@
except helpers.InvalidFormat:
self.dispatch('ERROR', (_('Invalid Jabber ID'),
_('A message from a non-valid JID arrived, it
has been ignored.')))
+ return
addressTag = msg.getTag('addresses', namespace =
common.xmpp.NS_ADDRESS)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: prevent traceback when writing in a closed gc control. Fi...
changeset f2f53f360918 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f2f53f360918 description: prevent traceback when writing in a closed gc control. Fixes #5455 diffstat: src/htmltextview.py | 6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 832fa903871f -r f2f53f360918 src/htmltextview.py --- a/src/htmltextview.py Tue Dec 29 00:01:55 2009 +0100 +++ b/src/htmltextview.py Mon Nov 30 14:32:59 2009 +0100 @@ -893,8 +893,10 @@ def on_text_buffer_mark_set(self, location, mark, unused_data): bounds = self.get_buffer().get_selection_bounds() if bounds: - clipboard = self.get_clipboard(gtk.gdk.SELECTION_PRIMARY) - clipboard.set_text(self.get_selected_text()) + # textview can be hidden while we add a new line in it. + if self.has_screen(): + clipboard = self.get_clipboard(gtk.gdk.SELECTION_PRIMARY) + clipboard.set_text(self.get_selected_text()) def get_selected_text(self): bounds = self.get_buffer().get_selection_bounds() ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: catch address family not supported errors when sending ...
changeset 47356037850a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=47356037850a description: catch address family not supported errors when sending files. Fixes #5327 diffstat: src/common/socks5.py | 10 -- 1 files changed, 8 insertions(+), 2 deletions(-) diffs (20 lines): diff -r 779a1c0674ca -r 47356037850a src/common/socks5.py --- a/src/common/socks5.py Sat Jan 02 22:45:02 2010 +0100 +++ b/src/common/socks5.py Sat Jan 02 22:47:36 2010 +0100 @@ -813,8 +813,14 @@ def bind(self): for ai in self.ais: - #try the different possibilities (ipv6, ipv4, etc.) - self._serv = socket.socket(*ai[:3]) + # try the different possibilities (ipv6, ipv4, etc.) + try: + self._serv = socket.socket(*ai[:3]) + except socket.error, e: + if e.errno == EAFNOSUPPORT: + self.ai = None + continue + raise self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) self._serv.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Ability to copy LaTeX expressions. Fixes #5451
changeset 832fa903871f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=832fa903871f description: Ability to copy LaTeX expressions. Fixes #5451 diffstat: src/conversation_textview.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6ec5edf22c16 -r 832fa903871f src/conversation_textview.py --- a/src/conversation_textview.py Wed Nov 18 21:32:10 2009 +0100 +++ b/src/conversation_textview.py Tue Dec 29 00:01:55 2009 +0100 @@ -1126,7 +1126,7 @@ end_iter = buffer_.get_end_iter() if imagepath is not None: anchor = buffer_.create_child_anchor(end_iter) - img = gtk.Image() + img = TextViewImage(anchor, special_text) img.set_from_file(imagepath) img.show() # add ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Correct JingleContent.send_candidate and JingleTransport....
changeset 10be657ae524 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=10be657ae524
description: Correct JingleContent.send_candidate and
JingleTransport.make_transport. Fixes #5525
diffstat:
src/common/jingle_content.py | 2 +-
src/common/jingle_transport.py | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diffs (31 lines):
diff -r a7a2a364bc82 -r 10be657ae524 src/common/jingle_content.py
--- a/src/common/jingle_content.py Mon Jan 04 11:58:42 2010 +0100
+++ b/src/common/jingle_content.py Mon Jan 04 18:27:18 2010 +0100
@@ -118,7 +118,7 @@
Send a transport candidate for a previously defined transport.
content = self.__content()
- content.addChild(self.transport.make_transport([candidate]))
+
content.addChild(node=self.transport.make_transport([candidate]))
self.session.send_transport_info(content)
def __fill_jingle_stanza(self, stanza, content, error, action):
diff -r a7a2a364bc82 -r 10be657ae524 src/common/jingle_transport.py
--- a/src/common/jingle_transport.pyMon Jan 04 11:58:42 2010 +0100
+++ b/src/common/jingle_transport.pyMon Jan 04 18:27:18 2010 +0100
@@ -60,6 +60,8 @@
if not candidates:
candidates = self._iter_candidates()
+ else:
+ candidates = (self.make_candidate(candidate) for
candidate in candidates)
transport = xmpp.Node('transport', payload=candidates)
return transport
@@ -145,4 +147,4 @@
transports[xmpp.NS_JINGLE_ICE_UDP] = JingleTransportICEUDP
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: buffer - _buffer (buffer is a module)
changeset d0f7fb4858e0 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=d0f7fb4858e0
description: buffer - _buffer (buffer is a module)
diffstat:
src/message_textview.py | 79
1 files changed, 39 insertions(+), 40 deletions(-)
diffs (212 lines):
diff -r f21f24d672fe -r d0f7fb4858e0 src/message_textview.py
--- a/src/message_textview.py Sun Jan 03 19:21:39 2010 +0100
+++ b/src/message_textview.py Mon Jan 04 18:28:49 2010 +0100
@@ -57,31 +57,31 @@
self.set_pixels_below_lines(2)
self.lang = None # Lang used for spell checking
- buffer = self.get_buffer()
+ _buffer = self.get_buffer()
self.begin_tags = {}
self.end_tags = {}
self.color_tags = []
self.fonts_tags = []
self.other_tags = {}
- self.other_tags['bold'] = buffer.create_tag('bold')
+ self.other_tags['bold'] = _buffer.create_tag('bold')
self.other_tags['bold'].set_property('weight',
pango.WEIGHT_BOLD)
self.begin_tags['bold'] = 'strong'
self.end_tags['bold'] = '/strong'
- self.other_tags['italic'] = buffer.create_tag('italic')
+ self.other_tags['italic'] = _buffer.create_tag('italic')
self.other_tags['italic'].set_property('style',
pango.STYLE_ITALIC)
self.begin_tags['italic'] = 'em'
self.end_tags['italic'] = '/em'
- self.other_tags['underline'] = buffer.create_tag('underline')
+ self.other_tags['underline'] = _buffer.create_tag('underline')
self.other_tags['underline'].set_property('underline',
pango.UNDERLINE_SINGLE)
self.begin_tags['underline'] = 'span style=text-decoration:
underline;'
self.end_tags['underline'] = '/span'
- self.other_tags['strike'] = buffer.create_tag('strike')
+ self.other_tags['strike'] = _buffer.create_tag('strike')
self.other_tags['strike'].set_property('strikethrough', True)
self.begin_tags['strike'] = 'span style=text-decoration:
line-through;'
self.end_tags['strike'] = '/span'
def make_clickable_urls(self, text):
- buffer = self.get_buffer()
+ _buffer = self.get_buffer()
start = 0
end = 0
@@ -96,7 +96,7 @@
text_before_special_text = text[index:start]
else:
text_before_special_text = ''
- end_iter = buffer.get_end_iter()
+ end_iter = _buffer.get_end_iter()
# we insert normal text
new_text += text_before_special_text + \
'a href='+ url +'' + url + '/a'
@@ -109,50 +109,49 @@
return new_text # the position after *last* special text
def get_active_tags(self):
- buffer = self.get_buffer()
start, finish = self.get_active_iters()
active_tags = []
for tag in start.get_tags():
active_tags.append(tag.get_property('name'))
- return active_tags
+ return active_tags
def get_active_iters(self):
- buffer = self.get_buffer()
- return_val = buffer.get_selection_bounds()
+ _buffer = self.get_buffer()
+ return_val = _buffer.get_selection_bounds()
if return_val: # if sth was selected
start, finish = return_val[0], return_val[1]
else:
- start, finish = buffer.get_bounds()
+ start, finish = _buffer.get_bounds()
return (start, finish)
def set_tag(self, widget, tag):
- buffer = self.get_buffer()
+ _buffer = self.get_buffer()
start, finish = self.get_active_iters()
if start.has_tag(self.other_tags[tag]):
- buffer.remove_tag_by_name(tag, start, finish)
+ _buffer.remove_tag_by_name(tag, start, finish)
else:
if tag == 'underline':
- buffer.remove_tag_by_name('strike', start,
finish)
+ _buffer.remove_tag_by_name('strike', start,
finish)
elif tag == 'strike':
- buffer.remove_tag_by_name('underline', start,
finish)
- buffer.apply_tag_by_name(tag, start, finish)
+ _buffer.remove_tag_by_name('underline', start,
finish)
+ _buffer.apply_tag_by_name(tag, start, finish)
def clear_tags(self, widget):
gajim: Fix nick completion in MUC when it's not at the beginin o...
changeset adf6651713c8 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=adf6651713c8
description: Fix nick completion in MUC when it's not at the beginin of what is
said. Fixes #5353
diffstat:
src/groupchat_control.py | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diffs (19 lines):
diff -r d0f7fb4858e0 -r adf6651713c8 src/groupchat_control.py
--- a/src/groupchat_control.py Mon Jan 04 18:28:49 2010 +0100
+++ b/src/groupchat_control.py Mon Jan 04 18:45:21 2010 +0100
@@ -1833,12 +1833,14 @@
gc_refer_to_nick_char =
gajim.config.get('gc_refer_to_nick_char')
with_refer_to_nick_char = False
+ after_nick_len = 1 # the space that is printed after we
type [Tab]
# first part of this if : works fine even if
refer_to_nick_char
if gc_refer_to_nick_char and
begin.endswith(gc_refer_to_nick_char):
with_refer_to_nick_char = True
+ after_nick_len = len(gc_refer_to_nick_char + '
')
if len(self.nick_hits) and self.last_key_tabs and \
- text[:-len(gc_refer_to_nick_char + '
')].endswith(self.nick_hits[0]):
+ text[:-after_nick_len].endswith(self.nick_hits[0]):
# we should cycle
# Previous nick in list may had a space inside,
so we check text and
# not splitted_text and store it into 'begin'
var
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: merge local changes
changeset 95227c51bb83 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=95227c51bb83
description: merge local changes
diffstat:
src/common/gajim.py| 5 -
src/common/jingle_content.py | 2 +-
src/common/jingle_transport.py | 4 +++-
src/gajim.py | 1 +
4 files changed, 5 insertions(+), 7 deletions(-)
diffs (57 lines):
diff -r adf6651713c8 -r 95227c51bb83 src/common/gajim.py
--- a/src/common/gajim.py Mon Jan 04 18:45:21 2010 +0100
+++ b/src/common/gajim.py Mon Jan 04 18:46:20 2010 +0100
@@ -223,11 +223,6 @@
pos = jid.find('@') + 1 # after @
return jid[pos:]
-def get_resource_from_jid(jid):
- tokens = jid.split('/', 1)
- if len(tokens) 1:
- return tokens[1]
-
def get_name_and_server_from_jid(jid):
name = get_nick_from_jid(jid)
server = get_server_from_jid(jid)
diff -r adf6651713c8 -r 95227c51bb83 src/common/jingle_content.py
--- a/src/common/jingle_content.py Mon Jan 04 18:45:21 2010 +0100
+++ b/src/common/jingle_content.py Mon Jan 04 18:46:20 2010 +0100
@@ -118,7 +118,7 @@
Send a transport candidate for a previously defined transport.
content = self.__content()
- content.addChild(self.transport.make_transport([candidate]))
+
content.addChild(node=self.transport.make_transport([candidate]))
self.session.send_transport_info(content)
def __fill_jingle_stanza(self, stanza, content, error, action):
diff -r adf6651713c8 -r 95227c51bb83 src/common/jingle_transport.py
--- a/src/common/jingle_transport.pyMon Jan 04 18:45:21 2010 +0100
+++ b/src/common/jingle_transport.pyMon Jan 04 18:46:20 2010 +0100
@@ -60,6 +60,8 @@
if not candidates:
candidates = self._iter_candidates()
+ else:
+ candidates = (self.make_candidate(candidate) for
candidate in candidates)
transport = xmpp.Node('transport', payload=candidates)
return transport
@@ -145,4 +147,4 @@
transports[xmpp.NS_JINGLE_ICE_UDP] = JingleTransportICEUDP
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3:
diff -r adf6651713c8 -r 95227c51bb83 src/gajim.py
--- a/src/gajim.py Mon Jan 04 18:45:21 2010 +0100
+++ b/src/gajim.py Mon Jan 04 18:46:20 2010 +0100
@@ -382,6 +382,7 @@
# Session Management support
try:
import gnome.ui
+ raise ImportError
except ImportError:
pass
else:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
