Commits

commits@gajim.org

17632 discussions

gajim: add time of stanza in XML console
by Gajim 15 Sep '13

15 Sep '13

changeset b3ac6123599e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=b3ac6123599e description: add time of stanza in XML console diffstat: src/dialogs.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (25 lines): diff -r ced9e59b0e33 -r b3ac6123599e src/dialogs.py --- a/src/dialogs.py Wed Sep 04 18:01:57 2013 +0400 +++ b/src/dialogs.py Wed Sep 04 17:31:12 2013 +0200 @@ -37,6 +37,7 @@ import cairo import os import nbxmpp +import time import gtkgui_helpers import vcard @@ -3458,9 +3459,11 @@ type_ = kind # 'incoming' or 'outgoing' if kind == 'incoming': - buffer.insert_with_tags_by_name(end_iter, '\n', type_) + buffer.insert_with_tags_by_name(end_iter, '\n' % \ + time.strftime('%c'), type_) elif kind == 'outgoing': - buffer.insert_with_tags_by_name(end_iter, '\n', type_) + buffer.insert_with_tags_by_name(end_iter, '\n' % \ + time.strftime('%c'), type_) end_iter = buffer.get_end_iter() buffer.insert_with_tags_by_name(end_iter, stanza.replace('><', '>\n<') \ + '\n\n', type_)

1 0

gajim: Fix sensitive for file transfer button
by Gajim 15 Sep '13

15 Sep '13

changeset e21472bb6fc9 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=e21472bb6fc9 description: Fix sensitive for file transfer button diffstat: src/chat_control.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (22 lines): diff -r b3ac6123599e -r e21472bb6fc9 src/chat_control.py --- a/src/chat_control.py Wed Sep 04 17:31:12 2013 +0200 +++ b/src/chat_control.py Thu Sep 05 12:15:28 2013 +0400 @@ -1810,14 +1810,15 @@ # Send file if ((self.contact.supports(NS_FILE) or \ - self.contact.supports(NS_JINGLE_FILE_TRANSFER)) or \ - self.type_id == 'chat' or self.gc_contact.resource) and \ + self.contact.supports(NS_JINGLE_FILE_TRANSFER)) and \ + (self.type_id == 'chat' or self.gc_contact.resource)) and \ self.contact.show != 'offline': self._send_file_button.set_sensitive(True) self._send_file_button.set_tooltip_text(_('Send files')) else: self._send_file_button.set_sensitive(False) - if not (self.contact.supports(NS_FILE) or self.contact.supports(NS_JINGLE_FILE_TRANSFER)): + if not (self.contact.supports(NS_FILE) or self.contact.supports( + NS_JINGLE_FILE_TRANSFER)): self._send_file_button.set_tooltip_text(_( "This contact does not support file transfer.")) else:

1 0

gajim: [Darlan] Transient dialogs. See #7185
by Gajim 15 Sep '13

15 Sep '13

changeset 544fd812bd4a in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=544fd812bd4a description: [Darlan] Transient dialogs. See #7185 diffstat: src/config.py | 3 ++- src/gui_interface.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diffs (25 lines): diff -r e21472bb6fc9 -r 544fd812bd4a src/config.py --- a/src/config.py Thu Sep 05 12:15:28 2013 +0400 +++ b/src/config.py Sat Sep 07 21:50:18 2013 +0400 @@ -2167,7 +2167,8 @@ message = _('Enter a new name for account %s') % self.current_account old_text = self.current_account dialogs.InputDialog(title, message, old_text, is_modal=False, - ok_handler=(on_renamed, self.current_account)) + ok_handler=(on_renamed, self.current_account), + transient_for=self.window) def option_changed(self, option, value): return gajim.config.get_per('accounts', self.current_account, option) \ diff -r e21472bb6fc9 -r 544fd812bd4a src/gui_interface.py --- a/src/gui_interface.py Thu Sep 05 12:15:28 2013 +0400 +++ b/src/gui_interface.py Sat Sep 07 21:50:18 2013 +0400 @@ -1175,7 +1175,7 @@ dlg = dialogs.InputDialog(_('Username Conflict'), _('Please type a new username for your local account'), input_str=obj.alt_name, is_modal=True, ok_handler=on_ok, - cancel_handler=on_cancel) + cancel_handler=on_cancel, transient_for=self.roster.window) def handle_event_resource_conflict(self, obj): # ('RESOURCE_CONFLICT', account, ())

1 0

gajim: ChangePasswordDialog set transient_for. See #7185
by Gajim 15 Sep '13

15 Sep '13

changeset c3b5f390fa4a in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=c3b5f390fa4a description: ChangePasswordDialog set transient_for. See #7185 diffstat: src/config.py | 3 ++- src/dialogs.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diffs (33 lines): diff -r 544fd812bd4a -r c3b5f390fa4a src/config.py --- a/src/config.py Sat Sep 07 21:50:18 2013 +0400 +++ b/src/config.py Sat Sep 07 22:06:48 2013 +0400 @@ -2303,7 +2303,8 @@ new_password) try: - dialogs.ChangePasswordDialog(self.current_account, on_changed) + dialogs.ChangePasswordDialog(self.current_account, on_changed, + self.window) except GajimGeneralException: # if we showed ErrorDialog, there will not be dialog instance return diff -r 544fd812bd4a -r c3b5f390fa4a src/dialogs.py --- a/src/dialogs.py Sat Sep 07 21:50:18 2013 +0400 +++ b/src/dialogs.py Sat Sep 07 22:06:48 2013 +0400 @@ -2875,7 +2875,7 @@ gajim.interface.new_chat_from_jid(self.account, jid) class ChangePasswordDialog: - def __init__(self, account, on_response): + def __init__(self, account, on_response, transient_for=None): # 'account' can be None if we are about to create our first one if not account or gajim.connections[account].connected < 2: ErrorDialog(_('You are not connected to the server'), @@ -2885,6 +2885,7 @@ self.on_response = on_response self.xml = gtkgui_helpers.get_gtk_builder('change_password_dialog.ui') self.dialog = self.xml.get_object('change_password_dialog') + self.dialog.set_transient_for(transient_for) self.password1_entry = self.xml.get_object('password1_entry') self.password2_entry = self.xml.get_object('password2_entry') self.dialog.connect('response', self.on_dialog_response)

1 0

gajim: Fix invite menu for group. Fixes #7422
by Gajim 15 Sep '13

15 Sep '13

changeset d60a86ddef5c in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=d60a86ddef5c description: Fix invite menu for group. Fixes #7422 diffstat: src/gui_menu_builder.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 9f09e59ba1f4 -r d60a86ddef5c src/gui_menu_builder.py --- a/src/gui_menu_builder.py Thu Aug 29 13:14:22 2013 +0200 +++ b/src/gui_menu_builder.py Thu Aug 29 23:28:58 2013 +0400 @@ -80,6 +80,8 @@ if not account in connected_accounts: connected_accounts.append(account) transport = gajim.get_transport_name_from_jid(contact.jid) + if transport == 'jabber': + transport = None if contacts_transport == -1: contacts_transport = transport elif contacts_transport != transport:

1 0

gajim: better behaviour of column width in ACE. Fixes #7446
by Gajim 15 Sep '13

15 Sep '13

changeset f0bc333e577e 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=f0bc333e577e description: better behaviour of column width in ACE. Fixes #7446 diffstat: src/advanced_configuration_window.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (18 lines): diff -r 46a815d57b77 -r f0bc333e577e src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Fri Sep 13 07:30:09 2013 +0200 +++ b/src/advanced_configuration_window.py Sun Sep 15 11:15:29 2013 +0200 @@ -119,10 +119,13 @@ col.props.resizable = True col.set_property('expand',True) + col.set_property('sizing',gtk.TREE_VIEW_COLUMN_FIXED) renderer_text = gtk.CellRendererText() - treeview.insert_column_with_attributes(-1, _('Type'), + col = treeview.insert_column_with_attributes(-1, _('Type'), renderer_text, text = 2) + col.set_property('expand',True) + col.set_property('sizing',gtk.TREE_VIEW_COLUMN_FIXED) treeview.set_model(self.modelfilter)

1 0

gajim: render the whole line when we use XEP-309 Last Message Co...
by Gajim 15 Sep '13

15 Sep '13

changeset acac9619a3b0 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=acac9619a3b0 description: render the whole line when we use XEP-309 Last Message Correction. Fixes #7400, #7453 diffstat: icons/hicolor/32x32/categories/gajim-agent-twitter.png | Bin src/conversation_textview.py | 99 ++++++++++------ src/htmltextview.py | 13 +- 3 files changed, 69 insertions(+), 43 deletions(-) diffs (248 lines): diff -r f2a4b56b6ecf -r acac9619a3b0 icons/hicolor/32x32/categories/gajim-agent-twitter.png Binary file icons/hicolor/32x32/categories/gajim-agent-twitter.png has changed diff -r f2a4b56b6ecf -r acac9619a3b0 src/conversation_textview.py --- a/src/conversation_textview.py Sun Sep 08 18:11:53 2013 +0200 +++ b/src/conversation_textview.py Sun Sep 08 18:18:23 2013 +0200 @@ -477,8 +477,8 @@ buffer_.delete(i1, i2) tag = 'outgoingtxt' if message.startswith('/me'): - tag = 'outgoing' - i2 = self.print_real_text(message, text_tags=[tag], name=name, + tag = 'outgoing' + i2 = self.print_conversation_line(message, '', 'outgoing', name, None, xhtml=xhtml, iter_=i1) tt_txt = _('Message was corrected. Last message was:\n %s') % \ old_txt @@ -496,7 +496,7 @@ i2 = buffer_.get_iter_at_mark(m2) txt = buffer_.get_text(i1, i2) buffer_.delete(i1, i2) - i2 = self.print_real_text(message, text_tags=['incomingtxt'], name=name, + i2 = self.print_conversation_line(message, '', 'incoming', name, None, xhtml=xhtml, iter_=i1) tt_txt = _('Message was corrected. Last message was:\n %s') % \ old_txt @@ -1243,12 +1243,14 @@ def print_conversation_line(self, text, jid, kind, name, tim, other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], subject=None, old_kind=None, xhtml=None, simple=False, graphics=True, - displaymarking=None): + displaymarking=None, iter_=None): """ Print 'chat' type messages """ buffer_ = self.tv.get_buffer() buffer_.begin_user_action() + if iter_: + temp_mark = buffer_.create_mark(None, iter_, left_gravity=True) if self.marks_queue.full(): # remove oldest line m1 = self.marks_queue.get() @@ -1257,7 +1259,11 @@ i2 = buffer_.get_iter_at_mark(m2) buffer_.delete(i1, i2) buffer_.delete_mark(m1) - end_iter = buffer_.get_end_iter() + if iter_: + end_iter = buffer_.get_iter_at_mark(temp_mark) + buffer_.delete_mark(temp_mark) + else: + end_iter = buffer_.get_end_iter() end_offset = end_iter.get_offset() at_the_end = self.at_the_end() move_selection = False @@ -1265,21 +1271,22 @@ get_offset() == end_offset: move_selection = True - # Create one mark and add it to queue once if it's the first line - # else twice (one for end bound, one for start bound) - mark = None - if buffer_.get_char_count() > 0: - if not simple: - buffer_.insert_with_tags_by_name(end_iter, '\n', 'eol') - if move_selection: - sel_start, sel_end = buffer_.get_selection_bounds() - sel_end.backward_char() - buffer_.select_range(sel_start, sel_end) - mark = buffer_.create_mark(None, end_iter, left_gravity=True) + if not iter_: + # Create one mark and add it to queue once if it's the first line + # else twice (one for end bound, one for start bound) + mark = None + if buffer_.get_char_count() > 0: + if not simple and not iter_: + buffer_.insert_with_tags_by_name(end_iter, '\n', 'eol') + if move_selection: + sel_start, sel_end = buffer_.get_selection_bounds() + sel_end.backward_char() + buffer_.select_range(sel_start, sel_end) + mark = buffer_.create_mark(None, end_iter, left_gravity=True) + self.marks_queue.put(mark) + if not mark: + mark = buffer_.create_mark(None, end_iter, left_gravity=True) self.marks_queue.put(mark) - if not mark: - mark = buffer_.create_mark(None, end_iter, left_gravity=True) - self.marks_queue.put(mark) if kind == 'incoming_queue': kind = 'incoming' if old_kind == 'incoming_queue': @@ -1318,7 +1325,7 @@ 'time_sometimes') # If there's a displaymarking, print it here. if displaymarking: - self.print_displaymarking(displaymarking) + self.print_displaymarking(displaymarking, iter_=end_iter) # kind = info, we print things as if it was a status: same color, ... if kind in ('error', 'info'): kind = 'status' @@ -1328,36 +1335,43 @@ if other_text_tag: # note that color of /me may be overwritten in gc_control text_tags.append(other_text_tag) - if text.startswith('/me'): - mark1 = buffer_.create_mark(None, buffer_.get_end_iter(), - left_gravity=True) + if text.startswith('/me') and not iter_: + mark1 = mark else: # not status nor /me if gajim.config.get('chat_merge_consecutive_nickname'): if kind != old_kind or self.just_cleared: self.print_name(name, kind, other_tags_for_name, - direction_mark=direction_mark) + direction_mark=direction_mark, iter_=end_iter) else: self.print_real_text(gajim.config.get( - 'chat_merge_consecutive_nickname_indent')) + 'chat_merge_consecutive_nickname_indent'), + iter_=end_iter) else: self.print_name(name, kind, other_tags_for_name, - direction_mark=direction_mark) + direction_mark=direction_mark, iter_=end_iter) if kind == 'incoming': text_tags.append('incomingtxt') - mark1 = buffer_.create_mark(None, buffer_.get_end_iter(), - left_gravity=True) + if not iter_: + mark1 = mark elif kind == 'outgoing': text_tags.append('outgoingtxt') - mark1 = buffer_.create_mark(None, buffer_.get_end_iter(), - left_gravity=True) - self.print_subject(subject) - self.print_real_text(text, text_tags, name, xhtml, graphics=graphics) - if mark1: + if not iter_: + mark1 = mark + self.print_subject(subject, iter_=end_iter) + self.print_real_text(text, text_tags, name, xhtml, graphics=graphics, + iter_=end_iter) + if not iter_ and mark1: mark2 = buffer_.create_mark(None, buffer_.get_end_iter(), left_gravity=True) if kind == 'incoming': + if name in self.last_received_message_marks: + m = self.last_received_message_marks[name][1] + buffer_.delete_mark(m) self.last_received_message_marks[name] = [mark1, mark2] elif kind == 'outgoing': + m = self.last_sent_message_marks[1] + if m: + buffer_.delete_mark(m) self.last_sent_message_marks = [mark1, mark2] # scroll to the end of the textview if at_the_end or kind == 'outgoing': @@ -1370,6 +1384,7 @@ self.just_cleared = False buffer_.end_user_action() + return end_iter def get_time_to_show(self, tim, direction_mark=''): """ @@ -1407,23 +1422,30 @@ elif text.startswith('/me ') or text.startswith('/me\n'): return kind - def print_displaymarking(self, displaymarking): + def print_displaymarking(self, displaymarking, iter_=None): bgcolor = displaymarking.getAttr('bgcolor') or '#FFF' fgcolor = displaymarking.getAttr('fgcolor') or '#000' text = displaymarking.getData() if text: buffer_ = self.tv.get_buffer() - end_iter = buffer_.get_end_iter() + if iter_: + end_iter = iter_ + else: + end_iter = buffer_.get_end_iter() tag = self.displaymarking_tags.setdefault(bgcolor + '/' + fgcolor, buffer_.create_tag(None, background=bgcolor, foreground=fgcolor)) buffer_.insert_with_tags(end_iter, '[' + text + ']', tag) end_iter = buffer_.get_end_iter() buffer_.insert_with_tags(end_iter, ' ') - def print_name(self, name, kind, other_tags_for_name, direction_mark=''): + def print_name(self, name, kind, other_tags_for_name, direction_mark='', + iter_=None): if name: buffer_ = self.tv.get_buffer() - end_iter = buffer_.get_end_iter() + if iter_: + end_iter = iter_ + else: + end_iter = buffer_.get_end_iter() name_tags = other_tags_for_name[:] # create a new list name_tags.append(kind) before_str = gajim.config.get('before_nickname') @@ -1453,7 +1475,8 @@ try: if name and (text.startswith('/me ') or text.startswith('/me\n')): xhtml = xhtml.replace('/me', '* %s' % (name,), 1) - self.tv.display_html(xhtml.encode('utf-8'), self.tv, self) + self.tv.display_html(xhtml.encode('utf-8'), self.tv, self, + iter_=iter_) return except Exception, e: gajim.log.debug('Error processing xhtml' + str(e)) diff -r f2a4b56b6ecf -r acac9619a3b0 src/htmltextview.py --- a/src/htmltextview.py Sun Sep 08 18:11:53 2013 +0200 +++ b/src/htmltextview.py Sun Sep 08 18:18:23 2013 +0200 @@ -656,7 +656,7 @@ def handle_specials(self, text): if self.conv_textview: self.iter = self.conv_textview.detect_and_print_special_text(text, - self._get_style_tags()) + self._get_style_tags(), iter_=self.iter) else: self._insert_text(text) @@ -815,8 +815,8 @@ self.id_ = self.connect('button-release-event', self.on_left_mouse_button_release) buffer_ = self.get_buffer() - buffer_.create_tag('eol', scale = pango.SCALE_XX_SMALL) - + buffer_.create_tag('eol') + self.tooltip = tooltips.BaseTooltip() self.config = gajim.config self.interface = gajim.interface @@ -1018,9 +1018,12 @@ # self.hyperlink_handler can be overwritten, so call it when needed self.hyperlink_handler(texttag, widget, event, iter_, kind) - def display_html(self, html, textview, conv_textview): + def display_html(self, html, textview, conv_textview, iter_=None): buffer_ = self.get_buffer() - eob = buffer_.get_end_iter() + if iter_: + eob = iter_ + else: + eob = buffer_.get_end_iter() ## this works too if libxml2 is not available # parser = xml.sax.make_parser(['drv_libxml2']) # parser.setFeature(xml.sax.handler.feature_validation, True)

1 0

gajim: some cleanup in icons folder. Fixes #7455
by Gajim 15 Sep '13

15 Sep '13

changeset ee5927e53dc8 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=ee5927e53dc8 description: some cleanup in icons folder. Fixes #7455 diffstat: icons/hicolor/128x128/apps/gajim-about.png | Bin icons/hicolor/128x128/apps/gajim.png | Bin icons/hicolor/16x16/actions/gajim-earth.png | Bin icons/hicolor/16x16/actions/gajim-message_corrected.png | Bin icons/hicolor/16x16/actions/gajim-muc_separator.png | Bin icons/hicolor/16x16/actions/gajim-receipt_missing.png | Bin icons/hicolor/16x16/actions/gajim-receipt_received.png | Bin icons/hicolor/16x16/actions/gajim-security_high.png | Bin icons/hicolor/16x16/actions/gajim-security_low.png | Bin icons/hicolor/16x16/status/gajim-earth.png | Bin icons/hicolor/16x16/status/gajim-muc_separator.png | Bin icons/hicolor/16x16/status/gajim-plugins.png | Bin icons/hicolor/16x16/status/gajim-security_high.png | Bin icons/hicolor/16x16/status/gajim-security_low.png | Bin icons/hicolor/32x32/categories/gajim-agent-error.png | Bin icons/hicolor/48x48/actions/gajim-chat_msg_recv.png | Bin icons/hicolor/48x48/actions/gajim-connection_lost.png | Bin icons/hicolor/48x48/actions/gajim-ft_done.png | Bin icons/hicolor/48x48/actions/gajim-ft_error.png | Bin icons/hicolor/48x48/actions/gajim-ft_request.png | Bin icons/hicolor/48x48/actions/gajim-ft_stopped.png | Bin icons/hicolor/48x48/actions/gajim-gc_invitation.png | Bin icons/hicolor/48x48/actions/gajim-new_email_recv.png | Bin icons/hicolor/48x48/actions/gajim-priv_msg_recv.png | Bin icons/hicolor/48x48/actions/gajim-single_msg_recv.png | Bin icons/hicolor/48x48/actions/gajim-subscription_request.png | Bin icons/hicolor/48x48/actions/gajim-unsubscribed.png | Bin icons/hicolor/48x48/actions/gajim-warning.png | Bin icons/hicolor/48x48/status/gajim-chat_msg_recv.png | Bin icons/hicolor/48x48/status/gajim-connection_lost.png | Bin icons/hicolor/48x48/status/gajim-ft_done.png | Bin icons/hicolor/48x48/status/gajim-ft_error.png | Bin icons/hicolor/48x48/status/gajim-ft_request.png | Bin icons/hicolor/48x48/status/gajim-ft_stopped.png | Bin icons/hicolor/48x48/status/gajim-gc_invitation.png | Bin icons/hicolor/48x48/status/gajim-new_email_recv.png | Bin icons/hicolor/48x48/status/gajim-priv_msg_recv.png | Bin icons/hicolor/48x48/status/gajim-single_msg_recv.png | Bin icons/hicolor/48x48/status/gajim-subscription_request.png | Bin icons/hicolor/48x48/status/gajim-unsubscribed.png | Bin src/conversation_textview.py | 18 ++---------- src/dialogs.py | 2 +- src/gui_interface.py | 2 +- src/htmltextview.py | 2 +- src/roster_window.py | 5 +++ 45 files changed, 11 insertions(+), 18 deletions(-) diffs (159 lines): diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/128x128/apps/gajim-about.png Binary file icons/hicolor/128x128/apps/gajim-about.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/128x128/apps/gajim.png Binary file icons/hicolor/128x128/apps/gajim.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/16x16/actions/gajim-earth.png Binary file icons/hicolor/16x16/actions/gajim-earth.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/16x16/actions/gajim-message_corrected.png Binary file icons/hicolor/16x16/actions/gajim-message_corrected.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/16x16/actions/gajim-muc_separator.png Binary file icons/hicolor/16x16/actions/gajim-muc_separator.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/16x16/actions/gajim-receipt_missing.png Binary file icons/hicolor/16x16/actions/gajim-receipt_missing.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/16x16/actions/gajim-receipt_received.png Binary file icons/hicolor/16x16/actions/gajim-receipt_received.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/16x16/actions/gajim-security_high.png Binary file icons/hicolor/16x16/actions/gajim-security_high.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/16x16/actions/gajim-security_low.png Binary file icons/hicolor/16x16/actions/gajim-security_low.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/16x16/status/gajim-earth.png Binary file icons/hicolor/16x16/status/gajim-earth.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/16x16/status/gajim-muc_separator.png Binary file icons/hicolor/16x16/status/gajim-muc_separator.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/16x16/status/gajim-plugins.png Binary file icons/hicolor/16x16/status/gajim-plugins.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/16x16/status/gajim-security_high.png Binary file icons/hicolor/16x16/status/gajim-security_high.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/16x16/status/gajim-security_low.png Binary file icons/hicolor/16x16/status/gajim-security_low.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/32x32/categories/gajim-agent-error.png Binary file icons/hicolor/32x32/categories/gajim-agent-error.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/actions/gajim-chat_msg_recv.png Binary file icons/hicolor/48x48/actions/gajim-chat_msg_recv.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/actions/gajim-connection_lost.png Binary file icons/hicolor/48x48/actions/gajim-connection_lost.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/actions/gajim-ft_done.png Binary file icons/hicolor/48x48/actions/gajim-ft_done.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/actions/gajim-ft_error.png Binary file icons/hicolor/48x48/actions/gajim-ft_error.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/actions/gajim-ft_request.png Binary file icons/hicolor/48x48/actions/gajim-ft_request.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/actions/gajim-ft_stopped.png Binary file icons/hicolor/48x48/actions/gajim-ft_stopped.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/actions/gajim-gc_invitation.png Binary file icons/hicolor/48x48/actions/gajim-gc_invitation.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/actions/gajim-new_email_recv.png Binary file icons/hicolor/48x48/actions/gajim-new_email_recv.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/actions/gajim-priv_msg_recv.png Binary file icons/hicolor/48x48/actions/gajim-priv_msg_recv.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/actions/gajim-single_msg_recv.png Binary file icons/hicolor/48x48/actions/gajim-single_msg_recv.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/actions/gajim-subscription_request.png Binary file icons/hicolor/48x48/actions/gajim-subscription_request.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/actions/gajim-unsubscribed.png Binary file icons/hicolor/48x48/actions/gajim-unsubscribed.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/actions/gajim-warning.png Binary file icons/hicolor/48x48/actions/gajim-warning.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/status/gajim-chat_msg_recv.png Binary file icons/hicolor/48x48/status/gajim-chat_msg_recv.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/status/gajim-connection_lost.png Binary file icons/hicolor/48x48/status/gajim-connection_lost.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/status/gajim-ft_done.png Binary file icons/hicolor/48x48/status/gajim-ft_done.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/status/gajim-ft_error.png Binary file icons/hicolor/48x48/status/gajim-ft_error.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/status/gajim-ft_request.png Binary file icons/hicolor/48x48/status/gajim-ft_request.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/status/gajim-ft_stopped.png Binary file icons/hicolor/48x48/status/gajim-ft_stopped.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/status/gajim-gc_invitation.png Binary file icons/hicolor/48x48/status/gajim-gc_invitation.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/status/gajim-new_email_recv.png Binary file icons/hicolor/48x48/status/gajim-new_email_recv.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/status/gajim-priv_msg_recv.png Binary file icons/hicolor/48x48/status/gajim-priv_msg_recv.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/status/gajim-single_msg_recv.png Binary file icons/hicolor/48x48/status/gajim-single_msg_recv.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/status/gajim-subscription_request.png Binary file icons/hicolor/48x48/status/gajim-subscription_request.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 icons/hicolor/48x48/status/gajim-unsubscribed.png Binary file icons/hicolor/48x48/status/gajim-unsubscribed.png has changed diff -r acac9619a3b0 -r ee5927e53dc8 src/conversation_textview.py --- a/src/conversation_textview.py Sun Sep 08 18:18:23 2013 +0200 +++ b/src/conversation_textview.py Sun Sep 08 18:58:27 2013 +0200 @@ -171,21 +171,9 @@ FOCUS_OUT_LINE_PIXBUF = gtkgui_helpers.get_icon_pixmap( 'gajim-muc_separator') - XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-no', - quiet=True) - if not XEP0184_WARNING_PIXBUF: - MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gajim-receipt_missing') - XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-yes', - quiet=True) - if not XEP0184_RECEIVED_PIXBUF: - MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gajim-receipt_received') - MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gtk-spell-check', quiet=True) - if not MESSAGE_CORRECTED_PIXBUF: - MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gajim-message_corrected') + XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-no') + XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-yes') + MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-spell-check') # smooth scroll constants MAX_SCROLL_TIME = 0.4 # seconds diff -r acac9619a3b0 -r ee5927e53dc8 src/dialogs.py --- a/src/dialogs.py Sun Sep 08 18:18:23 2013 +0200 +++ b/src/dialogs.py Sun Sep 08 18:58:27 2013 +0200 @@ -1311,7 +1311,7 @@ dlg.props.wrap_license = True - pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-about', 128) + pixbuf = gtkgui_helpers.get_icon_pixmap('gajim', 128) dlg.set_logo(pixbuf) #here you write your name in the form Name FamilyName <someone@somewhere> diff -r acac9619a3b0 -r ee5927e53dc8 src/gui_interface.py --- a/src/gui_interface.py Sun Sep 08 18:18:23 2013 +0200 +++ b/src/gui_interface.py Sun Sep 08 18:58:27 2013 +0200 @@ -662,7 +662,7 @@ 'key.') dialogs.WarningDialog(_('Your passphrase is incorrect'), sectext) else: - path = gtkgui_helpers.get_icon_path('gajim-warning', 48) + path = gtkgui_helpers.get_icon_path('gtk-dialog-warning', 48) account = obj.conn.name notify.popup('warning', account, account, 'warning', path, _('OpenPGP Passphrase Incorrect'), diff -r acac9619a3b0 -r ee5927e53dc8 src/htmltextview.py --- a/src/htmltextview.py Sun Sep 08 18:18:23 2013 +0200 +++ b/src/htmltextview.py Sun Sep 08 18:58:27 2013 +0200 @@ -521,7 +521,7 @@ if alt: alt += '\n' alt += _('Loading') - pixbuf = get_icon_pixmap('gajim-receipt_missing') + pixbuf = get_icon_pixmap('gtk-no') if mem: # Caveat: GdkPixbuf is known not to be safe to load # images from network... this program is now potentially diff -r acac9619a3b0 -r ee5927e53dc8 src/roster_window.py --- a/src/roster_window.py Sun Sep 08 18:18:23 2013 +0200 +++ b/src/roster_window.py Sun Sep 08 18:58:27 2013 +0200 @@ -6476,6 +6476,11 @@ # Add a Separator (self._iter_is_separator() checks on string SEPARATOR) liststore.append(['SEPARATOR', None, '', True]) + path = gtkgui_helpers.get_icon_path('gajim-plugins') + img = gtk.Image() + img.set_from_file(path) + self.xml.get_object('plugins_menuitem').set_image(img) + path = gtkgui_helpers.get_icon_path('gajim-kbd_input') img = gtk.Image() img.set_from_file(path)

1 0

gajim: show correct menuitem when no metacontact exist.
by Gajim 15 Sep '13

15 Sep '13

changeset 6048f6d82da2 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=6048f6d82da2 description: show correct menuitem when no metacontact exist. diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ee5927e53dc8 -r 6048f6d82da2 src/roster_window.py --- a/src/roster_window.py Sun Sep 08 18:58:27 2013 +0200 +++ b/src/roster_window.py Mon Sep 09 17:22:53 2013 +0200 @@ -4828,7 +4828,7 @@ c_dest.jid) source_family = gajim.contacts.get_metacontacts_family( account_source, c_source.jid) - if dest_family == source_family: + if dest_family == source_family and dest_family: item = gtk.MenuItem(_('Make %s first contact') % ( c_source.get_shown_name())) else:

1 0

gajim: fix E2E / GPG information dialog and another information ...
by Gajim 15 Sep '13

15 Sep '13

changeset 2d2309e64faf 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=2d2309e64faf description: fix E2E / GPG information dialog and another information dialog transient_for property. Fixes #7185 diffstat: src/chat_control.py | 4 ++-- src/dialogs.py | 5 +++-- src/message_window.py | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diffs (57 lines): diff -r 6048f6d82da2 -r 2d2309e64faf src/chat_control.py --- a/src/chat_control.py Mon Sep 09 17:22:53 2013 +0200 +++ b/src/chat_control.py Mon Sep 09 17:36:21 2013 +0200 @@ -2310,9 +2310,9 @@ def _on_authentication_button_clicked(self, widget): if self.gpg_is_active: - dialogs.GPGInfoWindow(self) + dialogs.GPGInfoWindow(self, self.parent_win.window) elif self.session and self.session.enable_encryption: - dialogs.ESessionInfoWindow(self.session) + dialogs.ESessionInfoWindow(self.session, self.parent_win.window) def send_message(self, message, keyID='', chatstate=None, xhtml=None, process_commands=True, attention=False): diff -r 6048f6d82da2 -r 2d2309e64faf src/dialogs.py --- a/src/dialogs.py Mon Sep 09 17:22:53 2013 +0200 +++ b/src/dialogs.py Mon Sep 09 17:36:21 2013 +0200 @@ -5100,7 +5100,7 @@ """ Class for displaying information about a XEP-0116 encrypted session """ - def __init__(self, session): + def __init__(self, session, transient_for=None): self.session = session self.xml = gtkgui_helpers.get_gtk_builder('esession_info_window.ui') @@ -5111,7 +5111,7 @@ self.button_label = self.xml.get_object('button_label') self.window = self.xml.get_object('esession_info_window') self.update_info() - + self.window.set_transient_for(transient_for) self.window.show_all() @@ -5222,6 +5222,7 @@ path = gtkgui_helpers.get_icon_path(image, 32) security_image.set_from_file(path) + self.window.set_transient_for(transient_for) xml.connect_signals(self) self.window.show_all() diff -r 6048f6d82da2 -r 2d2309e64faf src/message_window.py --- a/src/message_window.py Mon Sep 09 17:22:53 2013 +0200 +++ b/src/message_window.py Mon Sep 09 17:36:21 2013 +0200 @@ -219,7 +219,8 @@ dialogs.YesNoDialog( _('You are going to close several tabs'), _('Do you really want to close them all?'), - checktext=_('_Do not ask me again'), on_response_yes=on_yes1) + checktext=_('_Do not ask me again'), on_response_yes=on_yes1, + transient_for=self.window) return True def on_yes(ctrl):

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits