Commits September 2017

commits@gajim.org

1 participants
49 discussions

[Git][gajim/gajim][master] Only log for GC Message for one account
by Philipp Hörist 07 Sep '17

07 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 995ade8a by Philipp Hörist at 2017-09-07T16:42:51+02:00 Only log for GC Message for one account - - - - - 1 changed file: - gajim/common/connection_handlers.py Changes: ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -1155,6 +1155,8 @@ class ConnectionHandlersBase: return True def _nec_gc_message_received(self, obj): + if obj.conn.name != self.name: + return if app.config.should_log(obj.conn.name, obj.jid) and not \ obj.timestamp < obj.conn.last_history_time[obj.jid] and obj.msgtxt and \ obj.nick: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/995ade8a1145d53d7ce279cc46db517f0c… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/995ade8a1145d53d7ce279cc46db517f0c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont lose own JID from bind
by Philipp Hörist 06 Sep '17

06 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1a0b7ee1 by Philipp Hörist at 2017-09-06T21:26:40+02:00 Dont lose own JID from bind _registered_name is None on a smacks resume. Gajim creates on every connection attempt a new nbxmpp.NonBlockingClient instance. This is why _registered_name is None when we go through a smacks resume, because there is no bind event, and the new NonBlockingClient instance has no knowledge of the previous successful bind. - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1451,7 +1451,9 @@ class Connection(CommonConnection, ConnectionHandlers): return if hasattr(con, 'Resource'): self.server_resource = con.Resource - self.registered_name = con._registered_name + if con._registered_name is not None: + log.info('Bound JID: %s', con._registered_name) + self.registered_name = con._registered_name if app.config.get_per('accounts', self.name, 'anonymous_auth'): # Get jid given by server old_jid = app.get_jid_from_account(self.name) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1a0b7ee163f00e7742dc54f6c2a0eefce6… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1a0b7ee163f00e7742dc54f6c2a0eefce6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix typo
by Yann Leboulanger 06 Sep '17

06 Sep '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 16fcb3a3 by Yann Leboulanger at 2017-09-06T14:26:30+02:00 fix typo - - - - - 1 changed file: - data/gui/shortcuts_window.ui Changes: ===================================== data/gui/shortcuts_window.ui ===================================== --- a/data/gui/shortcuts_window.ui +++ b/data/gui/shortcuts_window.ui @@ -103,7 +103,7 @@ <object class="GtkShortcutsShortcut"> <property name="visible">1</property> <property name="accelerator"><shift>Page_Down</property> - <property name="title" translatable="yes">Sroll down</property> + <property name="title" translatable="yes">Scroll down</property> </object> </child> <child> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/16fcb3a3fcf7bdf9b742f055ffff0c5e9f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/16fcb3a3fcf7bdf9b742f055ffff0c5e9f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix Layout in Synchronise Contacts Dialog
by Philipp Hörist 04 Sep '17

04 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b5f5fdc1 by Philipp Hörist at 2017-09-04T17:37:42+02:00 Fix Layout in Synchronise Contacts Dialog - - - - - 2 changed files: - data/gui/synchronise_select_account_dialog.ui - data/gui/synchronise_select_contacts_dialog.ui Changes: ===================================== data/gui/synchronise_select_account_dialog.ui ===================================== --- a/data/gui/synchronise_select_account_dialog.ui +++ b/data/gui/synchronise_select_account_dialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkDialog" id="synchronise_select_account_dialog"> @@ -89,7 +89,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">3</property> </packing> ===================================== data/gui/synchronise_select_contacts_dialog.ui ===================================== --- a/data/gui/synchronise_select_contacts_dialog.ui +++ b/data/gui/synchronise_select_contacts_dialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkDialog" id="synchronise_select_contacts_dialog"> @@ -89,7 +89,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">3</property> </packing> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b5f5fdc19ca3942b9e90a5bef35e5c0f8b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b5f5fdc19ca3942b9e90a5bef35e5c0f8b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add more log output in case we drop carbons
by Philipp Hörist 03 Sep '17

03 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8bc2ab09 by Philipp Hörist at 2017-09-03T22:35:56+02:00 Add more log output in case we drop carbons - - - - - 2 changed files: - gajim/common/connection.py - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -741,7 +741,7 @@ class Connection(CommonConnection, ConnectionHandlers): def check_jid(self, jid): return helpers.parse_jid(jid) - def get_own_jid(self): + def get_own_jid(self, warn=False): """ Return the last full JID we received on a bind event. In case we were never connected it returns the bare JID from config. @@ -750,6 +750,8 @@ class Connection(CommonConnection, ConnectionHandlers): # This returns the full jid we received on the bind event return self.registered_name else: + if warn: + log.warning('only bare JID available') # This returns the bare jid return nbxmpp.JID(app.get_jid_from_account(self.name)) ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1156,12 +1156,12 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.encrypted = False account = self.conn.name - if self.stanza.getFrom() == self.conn.get_own_jid(): + if self.stanza.getFrom() == self.conn.get_own_jid(warn=True): # Drop messages sent from our own full jid # It can happen that when we sent message to our own bare jid # that the server routes that message back to us - log.info('Received message from self: %s, message is dropped' - % self.stanza.getFrom()) + log.info('Received message from self: %s, message is dropped', + self.stanza.getFrom()) return # check if the message is a roster item exchange (XEP-0144) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8bc2ab096eeff932b1626d7542bcd8443f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8bc2ab096eeff932b1626d7542bcd8443f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update gajim manpage
by Philipp Hörist 02 Sep '17

02 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6bb822f8 by Philipp Hörist at 2017-09-02T12:41:34+02:00 Update gajim manpage - - - - - 1 changed file: - data/gajim.1 Changes: ===================================== data/gajim.1 ===================================== --- a/data/gajim.1 +++ b/data/gajim.1 @@ -1,4 +1,4 @@ -.Dd August 26, 2015 +.Dd September 02, 2017 .Dt GAJIM 1 URM .Os UNIX .Sh NAME @@ -10,8 +10,10 @@ .Nm .Op Fl q .Op Fl v +.Op Fl w .Op Fl l Ar subsystem=level .Op Fl p Ar name +.Op Fl s .Op Fl c Ar directory .Sh DESCRIPTION .Nm @@ -33,8 +35,12 @@ on the XMPP protocol see <https://xmpp.org/about-xmpp/>. Show help options .It Fl q Fl Fl quiet Show only critical errors +.It Fl s Fl Fl separate +Separate profiles completely (even history db and plugins) .It Fl v Fl Fl verbose Print xml stanzas and other debug information +.It Fl w Fl Fl warnings +Show all GTK warnings with traceback .It Fl l Fl Fl loglevel Em subsystem=level Bq , Em subsystem=level Bq Em ... Configure logging system. Subsystem can be @@ -74,23 +80,20 @@ is not specified. Directory where certificates are stored. .It $XDG_DATA_DIR/gajim/logs.db The history database log file. -For more information on database logs see <https://trac.gajim.org/wiki/LogsDatabase>. +For more information on database logs see +<https://dev.gajim.org/gajim/gajim/wikis/development/LogsDatabase>. .El .Sh AUTHORS .An -nosplit .Nm is written and maintained by -.An Yann Leboulanger , +.An Yann Leboulanger and -.An Denis Fomin , +.An Philipp Hörist , with contributions and patches merged from many individuals around the world. -See files -.Pa AUTHORS -and -.Pa THANKS , -for a complete list. +See the About Dialog for a complete list. .Sh COPYRIGHT -Copyright (C) 2003-2015 Gajim Team +Copyright (C) 2003-2017 Gajim Team .Pp .Nm is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. @@ -103,7 +106,7 @@ You should have received a copy of the GNU General Public License along with If not, see <https://www.gnu.org/licenses/>. .Sh FEEDBACK You can report bugs or feature requests in our bug tracker at -.Em trac.gajim.org +.Em https://dev.gajim.org/gajim/gajim/issues or in the .Em gajim-devel mailing list; if you want to send us a patch, please do so in our bug tracker. @@ -126,9 +129,9 @@ https://lists.gajim.org/cgi-bin/listinfo .Sh BUGS Please submit bugs at .Bd -literal -offset indent -https://trac.gajim.org/ -https://trac-plugins.gajim.org/ -https://python-nbxmpp.gajim.org/ +https://dev.gajim.org/gajim/gajim/issues +https://dev.gajim.org/gajim/gajim-plugins +https://dev.gajim.org/gajim/python-nbxmpp .Ed .Sh SEE ALSO .Xr gajim-remote 1 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6bb822f88494f8363532a321cf67076f88… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6bb822f88494f8363532a321cf67076f88… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update makefile
by Philipp Hörist 02 Sep '17

02 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b532a7b9 by Philipp Hörist at 2017-09-02T12:13:17+02:00 Update makefile - - - - - 1 changed file: - Makefile.am Changes: ===================================== Makefile.am ===================================== --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,6 @@ ACLOCAL_AMFLAGS = -I m4 bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager scripts/gajim-remote EXTRA_DIST = \ - THANKS.artists \ autogen.sh \ intltool-extract.in \ intltool-merge.in \ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b532a7b9960fb05c298bad9e395624f090… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b532a7b9960fb05c298bad9e395624f090… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Add dummy AUTHORS file
by Philipp Hörist 02 Sep '17

02 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5837c470 by Philipp Hörist at 2017-09-02T12:05:32+02:00 Add dummy AUTHORS file we need this for automake as it seems - - - - - a462af55 by Philipp Hörist at 2017-09-02T12:07:14+02:00 Hide License Button only on Windows - - - - - 2 changed files: - + AUTHORS - gajim/dialogs.py Changes: ===================================== AUTHORS ===================================== --- /dev/null +++ b/AUTHORS ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -1329,7 +1329,9 @@ class AboutDialog(Gtk.AboutDialog): self.show_all() # GTK Bug, We have to manually hide the License Button - self.get_action_area().get_children()[1].hide() + # Bug exists only on Windows + if os.name == 'nt': + self.get_action_area().get_children()[1].hide() class Dialog(Gtk.Dialog): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4372b67433efae9f599fbed2acc501ce8… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4372b67433efae9f599fbed2acc501ce8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor AboutDialog
by Philipp Hörist 02 Sep '17

02 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4372b674 by Philipp Hörist at 2017-09-02T11:22:18+02:00 Refactor AboutDialog - Move Credits to const.py - Minor Refactoring - - - - - 4 changed files: - − AUTHORS - − THANKS.artists - THANKS → gajim/common/const.py - gajim/dialogs.py Changes: ===================================== AUTHORS deleted ===================================== --- a/AUTHORS +++ /dev/null @@ -1,18 +0,0 @@ -CURRENT DEVELOPERS: - -Yann Leboulanger (asterix AT lagaule.org) -Philipp Hörist (philipp AT hoerist.com) - -PAST DEVELOPERS: - -Stefan Bethge (stefan AT lanpartei.de) -Alexander Cherniuk (ts33kr AT gmail.com) -Stephan Erb (steve-e AT h3c.de) -Vincent Hanquez (tab AT snarc.org) -Dimitur Kirov (dkirov AT gmail.com) -Nikos Kouremenos (kourem AT gmail.com) -Julien Pivotto (roidelapluie AT gmail.com) -Jonathan Schleifer (js-gajim AT webkeks.org) -Travis Shirk (travis AT pobox.com) -Brendan Taylor (whateley AT gmail.com) -Jean-Marie Traissard (jim AT lapin.org) ===================================== THANKS.artists deleted ===================================== --- a/THANKS.artists +++ /dev/null @@ -1,10 +0,0 @@ -Anders Ström -Christophe Got -Dennis Craven -Dmitry Korzhevin -Guillaume Morin -Gvorcek Spajreh -Josef Vybíral -Membris Khan -Rederick Asher -Jakub Szypulka ===================================== THANKS → gajim/common/const.py ===================================== --- a/THANKS +++ b/gajim/common/const.py @@ -1,3 +1,4 @@ +THANKS = u"""\ Alexander Futász Alexander V. Butenko Alexey Nezhdanov @@ -41,5 +42,36 @@ Urtzi Alfaro Witold Kieraś Yakov Bezrukov Yavor Doganov +""".strip().split("\n") -Last but not least, we thank all the package maintainers. +ARTISTS = u"""\ +Anders Ström +Christophe Got +Dennis Craven +Dmitry Korzhevin +Guillaume Morin +Gvorcek Spajreh +Josef Vybíral +Membris Khan +Rederick Asher +Jakub Szypulka +""".strip().split("\n") + +DEVS_CURRENT = u"""\ +Yann Leboulanger (asterix AT lagaule.org) +Philipp Hörist (philipp AT hoerist.com) +""".strip().split("\n") + +DEVS_PAST = u"""\ +Stefan Bethge (stefan AT lanpartei.de) +Alexander Cherniuk (ts33kr AT gmail.com) +Stephan Erb (steve-e AT h3c.de) +Vincent Hanquez (tab AT snarc.org) +Dimitur Kirov (dkirov AT gmail.com) +Nikos Kouremenos (kourem AT gmail.com) +Julien Pivotto (roidelapluie AT gmail.com) +Jonathan Schleifer (js-gajim AT webkeks.org) +Travis Shirk (travis AT pobox.com) +Brendan Taylor (whateley AT gmail.com) +Jean-Marie Traissard (jim AT lapin.org) +""".strip().split("\n") ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -47,6 +47,7 @@ from gajim.common import defs from random import randrange from gajim.common import pep from gajim.common import ged +from gajim.common import const try: from gajim import gtkspell @@ -1287,98 +1288,49 @@ class AddNewContactWindow: self.gateway_prompt[obj.jid]['prompt'] = obj.prompt class AboutDialog(Gtk.AboutDialog): - """ - Class for about dialog - """ - def __init__(self): Gtk.AboutDialog.__init__(self) self.set_transient_for(app.interface.roster.window) self.set_name('Gajim') self.set_version(app.version) - s = 'Copyright © 2003-2017 Gajim Team' - self.set_copyright(s) - copying_file_path = self.get_path('COPYING') - if copying_file_path: - with open(copying_file_path) as a_file: - text = a_file.read() - self.set_license(text) - - gtk_ver = '%i.%i.%i' % (Gtk.get_major_version(), - Gtk.get_minor_version(), Gtk.get_micro_version()) - gobject_ver = self.tuple2str(GObject.pygobject_version) - nbxmpp_ver = nbxmpp.__version__ - self.set_comments('%s\n%s %s\n%s %s\n%s %s' % (_('A GTK+ XMPP client'), - _('GTK+ Version:'), gtk_ver, _('PyGobject Version:'), gobject_ver, - _('python-nbxmpp Version:'), nbxmpp_ver)) + self.set_copyright('Copyright © 2003-2017 Gajim Team') + self.set_license_type(Gtk.License.GPL_3_0) self.set_website('https://gajim.org/') - authors_file_path = self.get_path('AUTHORS') - if authors_file_path: - authors = [] - with open(authors_file_path) as a_file: - authors_file = a_file.read() - authors_file = authors_file.split('\n') - for author in authors_file: - if author == 'CURRENT DEVELOPERS:': - authors.append(_('Current Developers:')) - elif author == 'PAST DEVELOPERS:': - authors.append('\n' + _('Past Developers:')) - elif author != '': # Real author line - authors.append(author) - - thanks_file_path = self.get_path('THANKS') - if thanks_file_path: - authors.append('\n' + _('THANKS:')) - with open(thanks_file_path) as a_file: - text = a_file.read() - text_splitted = text.split('\n') - text = '\n'.join(text_splitted[:-2]) # remove one english sentence - # and add it manually as translatable - text += '\n%s\n' % _('Last but not least, we would like to ' - 'thank all the package maintainers.') - authors.append(text) - - self.set_authors(authors) - - self.props.wrap_license = True - - pixbuf = gtkgui_helpers.get_icon_pixmap('org.gajim.Gajim', 128) - - self.set_logo(pixbuf) - #here you write your name in the form Name FamilyName <someone@somewhere> + gtk_ver = '%i.%i.%i' % ( + Gtk.get_major_version(), + Gtk.get_minor_version(), + Gtk.get_micro_version()) + gobject_ver = '.'.join(map(str, GObject.pygobject_version)) + + comments = [] + comments.append(_('A GTK+ XMPP client')) + comments.append(_('GTK+ Version: %s' % gtk_ver)) + comments.append(_('PyGObject Version: %s') % gobject_ver) + comments.append(_('python-nbxmpp Version: %s') % nbxmpp.__version__) + self.set_comments("\n".join(comments)) + + self.add_credit_section(_('Current Developers'), const.DEVS_CURRENT) + self.add_credit_section(_('Past Developers'), const.DEVS_PAST) + self.add_credit_section(_('Artists'), const.ARTISTS) + + thanks = const.THANKS + thanks.append('') + thanks.append(_('Last but not least')) + thanks.append(_('we would like to thank all the package maintainers.')) + self.add_credit_section('Thanks', thanks) + self.set_translator_credits(_('translator-credits')) + self.set_logo(gtkgui_helpers.get_icon_pixmap('org.gajim.Gajim', 128)) - thanks_artists_file_path = self.get_path('THANKS.artists') - if thanks_artists_file_path: - with open(thanks_artists_file_path) as a_file: - artists_text = a_file.read() - artists = artists_text.split('\n') - self.set_artists(artists) + self.connect( + 'response', lambda dialog, *args: Gtk.AboutDialog.do_close(dialog)) - self.connect('response', self.on_response) self.show_all() - def on_response(self, dialog, response_id): - if response_id == Gtk.ResponseType.DELETE_EVENT: - dialog.destroy() - - def tuple2str(self, tuple_): - str_ = '' - for num in tuple_: - str_ += str(num) + '.' - return str_[0:-1] # remove latest . + # GTK Bug, We have to manually hide the License Button + self.get_action_area().get_children()[1].hide() - def get_path(self, filename): - """ - Where can we find this Credits file? - """ - if os.path.isfile(os.path.join(defs.docdir, filename)): - return os.path.join(defs.docdir, filename) - elif os.path.isfile('../' + filename): - return ('../' + filename) - else: - return None class Dialog(Gtk.Dialog): def __init__(self, parent, title, buttons, default=None, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4372b67433efae9f599fbed2acc501ce80… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4372b67433efae9f599fbed2acc501ce80… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2017