Commits

commits@gajim.org

17632 discussions

gajim: fix date and version for windows files
by Gajim 04 Aug '15

04 Aug '15

changeset ed474299848e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ed474299848e description: fix date and version for windows files diffstat: ChangeLog | 2 +- debian/changelog | 2 +- gajim.nsi | 2 +- setup_win32.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diffs (54 lines): diff -r fbffefe7eb56 -r ed474299848e ChangeLog --- a/ChangeLog Fri Jul 24 22:07:38 2015 +0200 +++ b/ChangeLog Fri Jul 24 22:22:39 2015 +0200 @@ -1,4 +1,4 @@ -Gajim 0.16.2 (20 July 2015) +Gajim 0.16.2 (24 July 2015) * improve Zeroconf under windows and with IPv6 * Fix errors with GnuPG diff -r fbffefe7eb56 -r ed474299848e debian/changelog --- a/debian/changelog Fri Jul 24 22:07:38 2015 +0200 +++ b/debian/changelog Fri Jul 24 22:22:39 2015 +0200 @@ -2,7 +2,7 @@ * New upstream release - -- Yann Leboulanger <yann(a)leboulanger.org> Sat, 20 Jul 2014 22:30:10 +0200 + -- Yann Leboulanger <yann(a)leboulanger.org> Sat, 24 Jul 2014 22:30:10 +0200 gajim (0.16.1-1) unstable; urgency=low diff -r fbffefe7eb56 -r ed474299848e gajim.nsi --- a/gajim.nsi Fri Jul 24 22:07:38 2015 +0200 +++ b/gajim.nsi Fri Jul 24 22:22:39 2015 +0200 @@ -212,7 +212,7 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.4" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.2" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" diff -r fbffefe7eb56 -r ed474299848e setup_win32.py --- a/setup_win32.py Fri Jul 24 22:07:38 2015 +0200 +++ b/setup_win32.py Fri Jul 24 22:22:39 2015 +0200 @@ -31,7 +31,7 @@ options = { 'build_exe': { - 'includes': ['Gdk.KEY_, 'dumbdbm', 'dbhash', 'bsddb', 'new', + 'includes': ['Gdk.KEY_', 'dumbdbm', 'dbhash', 'bsddb', 'new', 'goocanvas', 'Crypto.PublicKey.DSA', 'Crypto.Hash.HMAC', 'numbers', 'win32com.client', 'win32com.server', 'HTMLParser'], 'base': 'Win32GUI', @@ -56,7 +56,7 @@ setup( name='Gajim', - version='0.15.1', + version='0.16.2', description='A full featured Jabber client', author='Gajim Development Team', url='http://gajim.org/',

1 0

gajim: fix tag
by Gajim 04 Aug '15

04 Aug '15

changeset 104a58b0b31a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=104a58b0b31a description: fix tag diffstat: .hgtags | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (9 lines): diff -r ed474299848e -r 104a58b0b31a .hgtags --- a/.hgtags Fri Jul 24 22:22:39 2015 +0200 +++ b/.hgtags Fri Jul 24 22:25:24 2015 +0200 @@ -14,4 +14,4 @@ 129d3cce62cb497e490fef80e56bf97f57dc098b gajim-0.16-rc2 f33618265c92e3c591ebc8d4767363d5cea2cf71 gajim-0.16 33a5521fed877568ae1de04a76cc9031fdabacbf gajim-0.16.1 -d96858fee8dbe03f4e990a7c822e9bf12f42b0a3 gajim-0.16.2 +9b5eaf71e26776b12eac7f2e11b7d1afd3d78fe7 gajim-0.16.2

1 0

gajim: don't reconnect twice when connection is lost
by Gajim 04 Aug '15

04 Aug '15

changeset ebd4642babcd in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ebd4642babcd description: don't reconnect twice when connection is lost diffstat: src/common/connection.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (19 lines): diff -r 104a58b0b31a -r ebd4642babcd src/common/connection.py --- a/src/common/connection.py Fri Jul 24 22:25:24 2015 +0200 +++ b/src/common/connection.py Sun Jul 26 14:05:47 2015 +0200 @@ -885,6 +885,7 @@ self.connection.disconnect() self.last_connection = None self.connection = None + def set_oldst(self): # Set old state if self.old_show: self.connected = gajim.SHOW_LIST.index(self.old_show) @@ -913,6 +914,7 @@ self.sm.enabled = False gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show='error')) + self.connection.UnregisterDisconnectHandler(self._disconnectedReconnCB) self.disconnect() if gajim.config.get_per('accounts', self.name, 'autoreconnect'): self.connected = -1

1 0

gajim: set urgency_hint when notify_on_all_muc_messages is True....
by Gajim 04 Aug '15

04 Aug '15

changeset 8c5aff636fb7 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8c5aff636fb7 description: set urgency_hint when notify_on_all_muc_messages is True. Fixes #8110 diffstat: src/message_window.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r ebd4642babcd -r 8c5aff636fb7 src/message_window.py --- a/src/message_window.py Sun Jul 26 14:05:47 2015 +0200 +++ b/src/message_window.py Sun Jul 26 14:25:21 2015 +0200 @@ -502,7 +502,8 @@ if control.type_id == message_control.TYPE_GC: name = control.room_jid.split('@')[0] - urgent = control.attention_flag + urgent = control.attention_flag or \ + gajim.config.get('notify_on_all_muc_messages') else: name = control.contact.get_shown_name() if control.resource:

1 0

gajim: Correctly register gajim-remote with xmpp: URIs
by Gajim 04 Aug '15

04 Aug '15

changeset 437c32ee7d03 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=437c32ee7d03 description: Correctly register gajim-remote with xmpp: URIs diffstat: data/gajim-remote.desktop.in.in | 11 +++++ data/gui/preferences_window.ui | 17 ------- po/el.po | 2 +- po/he.po | 2 +- po/pl.po | 2 +- po/tr.po | 2 +- src/common/config.py | 1 - src/common/gnupg.py | 1 + src/config.py | 7 --- src/gtkgui_helpers.py | 88 ----------------------------------------- src/gui_interface.py | 6 +- 11 files changed, 18 insertions(+), 121 deletions(-) diffs (257 lines): diff -r 63e385c0e2c3 -r 437c32ee7d03 data/gajim-remote.desktop.in.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/gajim-remote.desktop.in.in Fri Jul 17 22:19:16 2015 +0200 @@ -0,0 +1,11 @@ +[Desktop Entry] +Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly; +_Name=Gajim Remote +_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip +Version=1.0 +Exec=gajim-remote handle_uri %u +TryExec=gajim-remote +StartupNotify=false +Terminal=false +Type=Application +MimeType=x-scheme-handler/xmpp diff -r 63e385c0e2c3 -r 437c32ee7d03 data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Fri Jul 31 22:08:00 2015 +0200 +++ b/data/gui/preferences_window.ui Fri Jul 17 22:19:16 2015 +0200 @@ -3049,23 +3049,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkCheckButton" id="check_default_client_checkbutton"> - <property name="label" translatable="yes">Check on startup if Gajim is the _default Jabber client</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_check_default_client_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> </object> </child> </object> diff -r 63e385c0e2c3 -r 437c32ee7d03 po/el.po --- a/po/el.po Fri Jul 31 22:08:00 2015 +0200 +++ b/po/el.po Fri Jul 17 22:19:16 2015 +0200 @@ -8859,7 +8859,7 @@ #: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277 #, fuzzy -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "Το URI \"%s\" δεν είναι έγκυρο." #: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279 diff -r 63e385c0e2c3 -r 437c32ee7d03 po/he.po --- a/po/he.po Fri Jul 31 22:08:00 2015 +0200 +++ b/po/he.po Fri Jul 17 22:19:16 2015 +0200 @@ -9628,7 +9628,7 @@ #: ../src/gajim-remote.py:277 #, fuzzy -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "cli" #: ../src/gajim-remote.py:279 diff -r 63e385c0e2c3 -r 437c32ee7d03 po/pl.po --- a/po/pl.po Fri Jul 31 22:08:00 2015 +0200 +++ b/po/pl.po Fri Jul 17 22:19:16 2015 +0200 @@ -8979,7 +8979,7 @@ msgstr "Konto, dla którego ma być ustawiony awatar; jeżeli nie jest określone, awatar zostanie ustawiony dla wszystkich kont" #: ../src/gajim-remote.py:278 -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "Obsługuj URI xmpp:/" #: ../src/gajim-remote.py:280 diff -r 63e385c0e2c3 -r 437c32ee7d03 po/tr.po --- a/po/tr.po Fri Jul 31 22:08:00 2015 +0200 +++ b/po/tr.po Fri Jul 17 22:19:16 2015 +0200 @@ -7786,7 +7786,7 @@ #: ../src/gajim-remote.py:277 #, fuzzy -msgid "Handle a xmpp:/ uri" +msgid "Handle a xmpp: uri" msgstr "Adres verilmedi" #: ../src/gajim-remote.py:279 diff -r 63e385c0e2c3 -r 437c32ee7d03 src/common/config.py --- a/src/common/config.py Fri Jul 31 22:08:00 2015 +0200 +++ b/src/common/config.py Fri Jul 17 22:19:16 2015 +0200 @@ -245,7 +245,6 @@ 'notification_avatar_height': [opt_int, 48], 'muc_highlight_words': [opt_str, '', _('A semicolon-separated list of words that will be highlighted in group chats.')], 'quit_on_roster_x_button': [opt_bool, False, _('If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if notification icon is used.')], - 'check_if_gajim_is_default': [opt_bool, True, _('If True, Gajim will check if it\'s the default jabber client on each startup.')], 'show_unread_tab_icon': [opt_bool, False, _('If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated.')], 'show_status_msgs_in_roster': [opt_bool, True, _('If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window.'), True], 'show_avatars_in_roster': [opt_bool, True, '', True], diff -r 63e385c0e2c3 -r 437c32ee7d03 src/common/gnupg.py --- a/src/common/gnupg.py Fri Jul 31 22:08:00 2015 +0200 +++ b/src/common/gnupg.py Fri Jul 17 22:19:16 2015 +0200 @@ -608,6 +608,7 @@ __bool__ = __nonzero__ def handle_status(self, key, value): + self.status = '' if key in ("USERID_HINT", "NEED_PASSPHRASE", "BAD_PASSPHRASE", "GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL", "INV_SGNR", "NO_SGNR", "MISSING_PASSPHRASE", "NEED_PASSPHRASE_PIN", diff -r 63e385c0e2c3 -r 437c32ee7d03 src/config.py --- a/src/config.py Fri Jul 31 22:08:00 2015 +0200 +++ b/src/config.py Fri Jul 17 22:19:16 2015 +0200 @@ -557,10 +557,6 @@ self.update_proxy_list() - # check if gajm is default - st = gajim.config.get('check_if_gajim_is_default') - self.xml.get_object('check_default_client_checkbutton').set_active(st) - # Ignore messages from unknown contacts w = self.xml.get_object('ignore_events_from_unknown_contacts_checkbutton') st = self.get_per_account_option('ignore_unknown_contacts') @@ -1179,9 +1175,6 @@ widget.set_inconsistent(False) self.on_per_account_checkbutton_toggled(widget, 'send_idle_time') - def on_check_default_client_checkbutton_toggled(self, widget): - self.on_checkbutton_toggled(widget, 'check_if_gajim_is_default') - def on_notify_gmail_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'notify_on_new_gmail_email') diff -r 63e385c0e2c3 -r 437c32ee7d03 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Fri Jul 31 22:08:00 2015 +0200 +++ b/src/gtkgui_helpers.py Fri Jul 17 22:19:16 2015 +0200 @@ -677,94 +677,6 @@ return file_paths_list -def possibly_set_gajim_as_xmpp_handler(): - """ - Register (by default only the first time) 'xmmp:' to Gajim - """ - path_to_dot_kde = os.path.expanduser('~/.kde') - if os.path.exists(path_to_dot_kde): - path_to_kde_file = os.path.join(path_to_dot_kde, - 'share/services/xmpp.protocol') - else: - path_to_kde_file = None - - def set_gajim_as_xmpp_handler(is_checked=None): - if is_checked is not None: - # come from confirmation dialog - gajim.config.set('check_if_gajim_is_default', is_checked) - path_to_gajim_script, typ = get_abspath_for_script('gajim-remote', True) - if path_to_gajim_script: - if typ == 'svn': - command = path_to_gajim_script + ' handle_uri %s' - else: # 'installed' - command = 'gajim-remote handle_uri %s' - - # setting for GNOME/Gconf - client.set_bool('/desktop/gnome/url-handlers/xmpp/enabled', True) - client.set_string('/desktop/gnome/url-handlers/xmpp/command', - command) - client.set_bool('/desktop/gnome/url-handlers/xmpp/needs_terminal', - False) - - # setting for KDE - if path_to_kde_file is not None: # user has run kde at least once - try: - f = open(path_to_kde_file, 'a') - f.write('''\ -[Protocol] -exec=%s "%%u" -protocol=xmpp -input=none -output=none -helper=true -listing=false -reading=false -writing=false -makedir=false -deleting=false -icon=gajim -Description=xmpp -''' % command) - f.close() - except IOError: - log.debug("I/O Error writing settings to %s", - repr(path_to_kde_file), exc_info=True) - else: # no gajim remote, stop ask user everytime - gajim.config.set('check_if_gajim_is_default', False) - - try: - gi.require_version('GConf', '2.0') - GConf = importlib.import_module('gi.repository.GConf') - # in try because daemon may not be there - client = GConf.Client.get_default() - except Exception: - return - - old_command = client.get_string('/desktop/gnome/url-handlers/xmpp/command') - if not old_command or old_command.endswith(' open_chat %s'): - # first time (GNOME/GCONF) or old Gajim version - we_set = True - elif path_to_kde_file is not None and not os.path.exists(path_to_kde_file): - # only the first time (KDE) - we_set = True - else: - we_set = False - - if we_set: - set_gajim_as_xmpp_handler() - elif old_command and not old_command.endswith(' handle_uri %s'): - # xmpp: is currently handled by another program, so ask the user - pritext = _('Gajim is not the default Jabber client') - sectext = _('Would you like to make Gajim the default Jabber client?') - checktext = _('Always check to see if Gajim is the default Jabber ' - 'client on startup') - def on_cancel(checked): - gajim.config.set('check_if_gajim_is_default', checked) - dlg = dialogs.ConfirmationDialogCheck(pritext, sectext, checktext, - set_gajim_as_xmpp_handler, on_cancel) - if gajim.config.get('check_if_gajim_is_default'): - dlg.checkbutton.set_active(True) - def escape_underscore(s): """ Escape underlines to prevent them from being interpreted as keyboard diff -r 63e385c0e2c3 -r 437c32ee7d03 src/gui_interface.py --- a/src/gui_interface.py Fri Jul 31 22:08:00 2015 +0200 +++ b/src/gui_interface.py Fri Jul 17 22:19:16 2015 +0200 @@ -1213,6 +1213,8 @@ file_props = None # get the file_props of our session file_props = FilesProp.getFileProp(obj.conn.name, obj.sid) + if not file_props: + return ft.set_status(file_props, 'stop') file_props.error = -4 # is it the right error code? ft.show_stopped(obj.jid, file_props, 'Peer cancelled ' + @@ -2772,10 +2774,6 @@ if gajim.config.get('verbose'): logging_helpers.set_verbose() - # Is Gajim default app? - if os.name != 'nt' and gajim.config.get('check_if_gajim_is_default'): - gtkgui_helpers.possibly_set_gajim_as_xmpp_handler() - for account in gajim.config.get_per('accounts'): if gajim.config.get_per('accounts', account, 'is_zeroconf'): gajim.ZEROCONF_ACC_NAME = account

1 0

gajim: fix ipython usage
by Gajim 04 Aug '15

04 Aug '15

changeset 49d45a97f789 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=49d45a97f789 description: fix ipython usage diffstat: src/ipython_view.py | 40 +++++++++++++++++++++++++++++----------- 1 files changed, 29 insertions(+), 11 deletions(-) diffs (111 lines): diff -r 437c32ee7d03 -r 49d45a97f789 src/ipython_view.py --- a/src/ipython_view.py Fri Jul 17 22:19:16 2015 +0200 +++ b/src/ipython_view.py Sun Jul 19 00:03:32 2015 +0200 @@ -92,23 +92,23 @@ @param input_func: Replacement for builtin raw_input() @type input_func: function """ + io = IPython.utils.io if input_func: if IPython.version_info[0] >= 1: IPython.terminal.interactiveshell.raw_input_original = input_func else: IPython.frontend.terminal.interactiveshell.raw_input_original = input_func if cin: - IPython.utils.io.stdin = IPython.utils.io.IOStream(cin) + io.stdin = io.IOStream(cin) if cout: - IPython.utils.io.stdout = IPython.utils.io.IOStream(cout) + io.stdout = io.IOStream(cout) if cerr: - IPython.utils.io.stderr = IPython.utils.io.IOStream(cerr) + io.stderr = io.IOStream(cerr) # This is to get rid of the blockage that accurs during # IPython.Shell.InteractiveShell.user_setup() - IPython.utils.io.raw_input = lambda x: None + io.raw_input = lambda x: None - self.term = IPython.utils.io.IOTerm(stdin=cin, stdout=cout, stderr=cerr) os.environ['TERM'] = 'dumb' excepthook = sys.excepthook @@ -116,10 +116,19 @@ cfg = Config() cfg.InteractiveShell.colors = "Linux" + # InteractiveShell's __init__ overwrites io.stdout,io.stderr with + # sys.stdout, sys.stderr, this makes sure they are right + old_stdout, old_stderr = sys.stdout, sys.stderr + sys.stdout, sys.stderr = io.stdout.stream, io.stderr.stream + + # InteractiveShell inherits from SingletonConfigurable so use instance() if IPython.version_info[0] >= 1: - self.IP = IPython.terminal.embed.InteractiveShellEmbed(config=cfg, user_ns=user_ns) + self.IP = IPython.terminal.embed.InteractiveShellEmbed.instance(config=cfg, user_ns=user_ns) else: - self.IP = IPython.frontend.terminal.embed.InteractiveShellEmbed(config=cfg, user_ns=user_ns) + self.IP = IPython.frontend.terminal.embed.InteractiveShellEmbed.instance(config=cfg, user_ns=user_ns) + + sys.stdout, sys.stderr = old_stdout, old_stderr + self.IP.system = lambda cmd: self.shell(self.IP.var_expand(cmd), header='IPython system call: ', local_ns=user_ns) @@ -152,7 +161,7 @@ """ self.history_level = 0 orig_stdout = sys.stdout - sys.stdout = self.term.stdout + sys.stdout = IPython.utils.io.stdout orig_stdin = sys.stdin sys.stdin = IPython.utils.io.stdin; @@ -182,12 +191,16 @@ self.IP.autoedit_syntax): self.IP.edit_syntax_error() if not self.iter_more: - source_raw = self.IP.input_splitter.source_raw_reset()[1] + if IPython.version_info[0] >= 2: + source_raw = self.IP.input_splitter.raw_reset() + else: + source_raw = self.IP.input_splitter.source_raw_reset()[1] self.IP.run_cell(source_raw, store_history=True) + self.IP.rl_do_indent = False else: # TODO: Auto-indent # - pass + self.IP.rl_do_indent = True sys.stdout = orig_stdout sys.stdin = orig_stdin @@ -472,6 +485,10 @@ self.text_buffer.move_mark(self.line_start, self.text_buffer.get_end_iter()) self.text_buffer.place_cursor(self.text_buffer.get_end_iter()) + if self.IP.rl_do_indent: + indentation = self.IP.input_splitter.indent_spaces * ' ' + self.text_buffer.insert_at_cursor(indentation) + def onKeyPress(self, widget, event): """ Key press callback used for correcting behavior for console-like @@ -537,11 +554,11 @@ IterableIPShell.__init__(self, cout=self.cout, cerr=self.cout, input_func=self.raw_input) # self.connect('key_press_event', self.keyPress) + self.interrupt = False self.execute() self.prompt = self.generatePrompt(False) self.cout.truncate(0) self.showPrompt(self.prompt) - self.interrupt = False def raw_input(self, prompt=''): """ @@ -607,3 +624,4 @@ if rv: rv = rv.strip('\n') self.showReturned(rv) self.cout.truncate(0) + self.cout.seek(0)

1 0

gajim: require python-nbxmpp 0.5.3
by Gajim 04 Aug '15

04 Aug '15

changeset 8d23ebbee93b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8d23ebbee93b description: require python-nbxmpp 0.5.3 diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 49d45a97f789 -r 8d23ebbee93b src/gajim.py --- a/src/gajim.py Sun Jul 19 00:03:32 2015 +0200 +++ b/src/gajim.py Mon Jul 20 19:47:30 2015 +0200 @@ -69,7 +69,7 @@ pass HAS_NBXMPP=True -MIN_NBXMPP_VER = "0.5.2" +MIN_NBXMPP_VER = "0.5.3" try: import nbxmpp except ImportError:

1 0

gajim: don't try to reconnect when network goes down. See #8062
by Gajim 04 Aug '15

04 Aug '15

changeset 86931b5d08f5 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=86931b5d08f5 description: don't try to reconnect when network goes down. See #8062 diffstat: src/network_manager_listener.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diffs (22 lines): diff -r 8d23ebbee93b -r 86931b5d08f5 src/network_manager_listener.py --- a/src/network_manager_listener.py Mon Jul 20 19:47:30 2015 +0200 +++ b/src/network_manager_listener.py Fri Jul 24 20:49:14 2015 +0200 @@ -47,8 +47,7 @@ """ For Network Manager 0.7 - 0.9 """ - nm_state = props.Get("org.freedesktop.NetworkManager", "State") - if nm_state == 3 or nm_state == 70: + if state == 70: for connection in gajim.connections.values(): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and connection.time_to_reconnect: @@ -57,7 +56,7 @@ for connection in gajim.connections.values(): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and connection.connected > 1: - connection._disconnectedReconnCB() + connection._on_disconnected() supported = False

1 0

gajim: prevent warning
by Gajim 31 Jul '15

31 Jul '15

changeset 63e385c0e2c3 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=63e385c0e2c3 description: prevent warning diffstat: src/common/connection.py | 7 +++++-- src/common/connection_handlers_events.py | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diffs (53 lines): diff -r 2587bc2e1946 -r 63e385c0e2c3 src/common/connection.py --- a/src/common/connection.py Thu Jul 30 23:06:32 2015 +0200 +++ b/src/common/connection.py Fri Jul 31 22:08:00 2015 +0200 @@ -40,6 +40,7 @@ import time import locale import hmac +import hashlib import json try: @@ -2655,7 +2656,8 @@ p = nbxmpp.Presence(to='%s/%s' % (room_jid, nick), show=show, status=self.status) - h = hmac.new(self.secret_hmac, room_jid.encode('utf-8')).hexdigest()[:6] + h = hmac.new(self.secret_hmac, room_jid.encode('utf-8'), hashlib.md5).\ + hexdigest()[:6] id_ = self.connection.getAnID() id_ = 'gajim_muc_' + id_ + '_' + h p.setID(id_) @@ -2763,7 +2765,8 @@ xmpp_show = helpers.get_xmpp_show(show) p = nbxmpp.Presence(to='%s/%s' % (jid, nick), typ=ptype, show=xmpp_show, status=status) - h = hmac.new(self.secret_hmac, jid.encode('utf-8')).hexdigest()[:6] + h = hmac.new(self.secret_hmac, jid.encode('utf-8'), hashlib.md5).\ + hexdigest()[:6] id_ = self.connection.getAnID() id_ = 'gajim_muc_' + id_ + '_' + h p.setID(id_) diff -r 2587bc2e1946 -r 63e385c0e2c3 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Jul 30 23:06:32 2015 +0200 +++ b/src/common/connection_handlers_events.py Fri Jul 31 22:08:00 2015 +0200 @@ -24,6 +24,7 @@ from time import (localtime, time as time_time) from calendar import timegm import hmac +import hashlib from common import atom from common import nec @@ -808,8 +809,8 @@ and self.ptype == 'error': # Error presences may not include sent stanza, so we don't detect # it's a muc presence. So detect it by ID - h = hmac.new(self.conn.secret_hmac, self.jid.encode('utf-8')).\ - hexdigest()[:6] + h = hmac.new(self.conn.secret_hmac, self.jid.encode('utf-8'), + hashlib.md5).hexdigest()[:6] if self.id_.split('_')[-1] == h: self.is_gc = True self.status = self.stanza.getStatus() or ''

1 0

gajim-website: update website for 0.16.3
by Gajim Website 31 Jul '15

31 Jul '15

changeset 3d923a1e852c in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=3d923a1e852c description: update website for 0.16.3 diffstat: downloads.php | 2 +- index.php | 39 ++++++++++++++-------- locale/ar_AE/LC_MESSAGES/msg.po | 69 +++++++++++++++++++++++----------------- locale/bg_BG/LC_MESSAGES/msg.po | 49 ++++++++++++++++++---------- locale/de_DE/LC_MESSAGES/msg.po | 49 ++++++++++++++++++---------- locale/eo/LC_MESSAGES/msg.po | 49 ++++++++++++++++++---------- locale/es_ES/LC_MESSAGES/msg.po | 65 +++++++++++++++++++++++--------------- locale/fr_FR/LC_MESSAGES/msg.po | 67 ++++++++++++++++++++++----------------- locale/he_IL/LC_MESSAGES/msg.po | 53 +++++++++++++++++++------------ locale/hu_HU/LC_MESSAGES/msg.po | 49 ++++++++++++++++++---------- locale/it_IT/LC_MESSAGES/msg.po | 69 +++++++++++++++++++++++----------------- locale/pl_PL/LC_MESSAGES/msg.po | 49 ++++++++++++++++++---------- locale/pt_BR/LC_MESSAGES/msg.po | 49 ++++++++++++++++++---------- locale/ru_RU/LC_MESSAGES/msg.po | 49 ++++++++++++++++++---------- msg.pot | 64 ++++++++++++++++++++++--------------- 15 files changed, 470 insertions(+), 301 deletions(-) diffs (truncated from 1703 to 300 lines): diff -r fc15a840c235 -r 3d923a1e852c downloads.php --- a/downloads.php Sat Jul 25 14:16:44 2015 +0200 +++ b/downloads.php Fri Jul 31 14:34:04 2015 +0200 @@ -5,7 +5,7 @@ Entete (_("Gajim, a Jabber client"), "GAJIM"); $download_folder = "0.16"; -$last_version = "0.16.2"; +$last_version = "0.16.3"; print (" \n"); print _(" Latest version of Gajim is")." ".$last_version." \n"; #printf(_(" A %s version is in test"), "0.16-rc2"); diff -r fc15a840c235 -r 3d923a1e852c index.php --- a/index.php Sat Jul 25 14:16:44 2015 +0200 +++ b/index.php Fri Jul 31 14:34:04 2015 +0200 @@ -50,47 +50,58 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Gajim %s is here!"), "0.16.2"), - 1 => sprintf(_("Gajim %s is here!"), "0.16.1"), - 2 => sprintf(_("Gajim %s is here!"), "0.16"), + 0 => sprintf(_("Gajim %s is here!"), "0.16.3"), + 1 => sprintf(_("Gajim %s is here!"), "0.16.2"), + 2 => sprintf(_("Gajim %s is here!"), "0.16.1"), + 3 => sprintf(_("Gajim %s is here!"), "0.16"), ); // 5 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"), // 7 => sprintf(_("Alpha-release of Gajim %s"), "0.12")); // 3 => sprintf(_("New windows installer")), $array_news_date = array( - 0 => _("24 July 2015"), - 1 => _("28 February 2015"), - 2 => _("04 October 2014"), + 0 => _("31 July 2015"), + 1 => _("24 July 2015"), + 2 => _("28 February 2015"), + 3 => _("04 October 2014"), ); $array_news_desc = array( - 0 => sprintf(_("Version %s of Gajim has been released."), "0.16.2"), - 1 => sprintf(_("Version %s of Gajim has been released."), "0.16.1"), - 2 => sprintf(_("Version %s of Gajim has been released."), "0.16"), + 0 => sprintf(_("Version %s of Gajim has been released."), "0.16.3"), + 1 => sprintf(_("Version %s of Gajim has been released."), "0.16.2"), + 2 => sprintf(_("Version %s of Gajim has been released."), "0.16.1"), + 3 => sprintf(_("Version %s of Gajim has been released."), "0.16"), ); // 6 => sprintf(_("Version %s will arrive very soon."), "0.12"), // 7 => sprintf(_("Version %s will arrive soon."), "0.12")); // 3 => sprintf(_("New Windows Installer with GTK+ included.")), $array_news_whats_new = array( - 0 => sprintf(_("What's new since %s:"), "0.16.1"), - 1 => sprintf(_("What's new since %s:"), "0.16"), - 2 => sprintf(_("What's new since %s:"), "0.15.4"), + 0 => sprintf(_("What's new since %s:"), "0.16.2"), + 1 => sprintf(_("What's new since %s:"), "0.16.1"), + 2 => sprintf(_("What's new since %s:"), "0.16"), + 3 => sprintf(_("What's new since %s:"), "0.15.4"), ); $array_news_items[0] = array( + 0 => _("Fix regression of 0.16.2 when reading secrets file"), + 1 => _("Fix reconnection after suspend"), + 2 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.16.3/ChangeLog\">"._("Full ChangeLog")."</a> ", + 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.16.3\">"._("List of fixed bugs")."</a>", + ); + +$array_news_items[1] = array( 0 => _("Improve Zeroconf under windows and with IPv6"), 1 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.16.2/ChangeLog\">"._("Full ChangeLog")."</a> ", 2 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.16.2\">"._("List of fixed bugs")."</a>", ); -$array_news_items[1] = array( +$array_news_items[2] = array( 0 => _("Message Archive Management") . " (<a href=\"http://xmpp.org/extensions/xep-0313.html\">XEP-0313</a>)", 1 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.16.1/ChangeLog\">"._("Full ChangeLog")."</a> ", 2 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.16.1\">"._("List of fixed bugs")."</a>", ); -$array_news_items[2] = array( +$array_news_items[3] = array( 0 => _("Improve File transfer"), 1 => _("Improve security"), 2 => _("Improve audio / video calls"), diff -r fc15a840c235 -r 3d923a1e852c locale/ar_AE/LC_MESSAGES/msg.po --- a/locale/ar_AE/LC_MESSAGES/msg.po Sat Jul 25 14:16:44 2015 +0200 +++ b/locale/ar_AE/LC_MESSAGES/msg.po Fri Jul 31 14:34:04 2015 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: mag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-25 14:15+0200\n" +"POT-Creation-Date: 2015-07-31 14:32+0200\n" "PO-Revision-Date: 2014-06-02 01:08+0300\n" "Last-Translator: Yann <asterix(a)asterix.lagaule.org>\n" "Language-Team: Arabic <karrar.kazuya(a)gmail.com>\n" @@ -626,73 +626,87 @@ msgid "NEWS" msgstr "الاخبار" -#: index.php:53 index.php:54 index.php:55 +#: index.php:53 index.php:54 index.php:55 index.php:56 #, c-format msgid "Gajim %s is here!" msgstr "كاجيم %s هنا!" -#: index.php:61 +#: index.php:62 +#, fuzzy +msgid "31 July 2015" +msgstr "25 ماي 2013" + +#: index.php:63 #, fuzzy msgid "24 July 2015" msgstr "25 ماي 2013" -#: index.php:62 +#: index.php:64 msgid "28 February 2015" msgstr "" -#: index.php:63 +#: index.php:65 #, fuzzy msgid "04 October 2014" msgstr "30 اوكتوبر 2012" -#: index.php:67 index.php:68 index.php:69 +#: index.php:69 index.php:70 index.php:71 index.php:72 #, c-format msgid "Version %s of Gajim has been released." msgstr "النسخة %s من كاجيم تم اصدارها." -#: index.php:76 index.php:77 index.php:78 +#: index.php:79 index.php:80 index.php:81 index.php:82 #, c-format msgid "What's new since %s:" msgstr "الجديد منذ %s:" -#: index.php:82 +#: index.php:86 +msgid "Fix regression of 0.16.2 when reading secrets file" +msgstr "" + +#: index.php:87 +#, fuzzy +msgid "Fix reconnection after suspend" +msgstr "اصلاح مشكلة الاتصال الى الخوادم التي لا تدعم SSL" + +#: index.php:88 index.php:94 index.php:100 index.php:110 +msgid "Full ChangeLog" +msgstr "سجل التغيير الكامل" + +#: index.php:88 index.php:94 index.php:100 index.php:110 +msgid "Full changelog, see" +msgstr "سجل التغيير الكامل, شاهد " + +#: index.php:89 index.php:95 index.php:101 index.php:111 +msgid "List of fixed bugs" +msgstr "قائمة المشاكل التي تم اصلاحها" + +#: index.php:93 msgid "Improve Zeroconf under windows and with IPv6" msgstr "" -#: index.php:83 index.php:89 index.php:99 -msgid "Full ChangeLog" -msgstr "سجل التغيير الكامل" - -#: index.php:83 index.php:89 index.php:99 -msgid "Full changelog, see" -msgstr "سجل التغيير الكامل, شاهد " - -#: index.php:84 index.php:90 index.php:100 -msgid "List of fixed bugs" -msgstr "قائمة المشاكل التي تم اصلاحها" - -#: index.php:88 +#: index.php:99 #, fuzzy msgid "Message Archive Management" msgstr "ارشفة الرسالة" -#: index.php:94 +#: index.php:105 msgid "Improve File transfer" msgstr "تطوير ارسال ملفات" -#: index.php:95 +#: index.php:106 msgid "Improve security" msgstr "تطوير الامن" -#: index.php:96 +#: index.php:107 msgid "Improve audio / video calls" msgstr "تطوير الاتصال الصوتي و المرئي" -#: index.php:97 +#: index.php:108 msgid "Last message correction" msgstr "تصحيح اخر رسالة" -#: index.php:98 +#: index.php:109 msgid "Jingle Audio under windows" msgstr " دعم صوت Jingle للوندوز" @@ -750,9 +764,6 @@ #~ msgid "Version %s will arrive soon." #~ msgstr "النسخة %s سوف يتم اصدارها قريباً.." -#~ msgid "Fix connection to non-SSL servers" -#~ msgstr "اصلاح مشكلة الاتصال الى الخوادم التي لا تدعم SSL" - #~ msgid "Minor other fixes" #~ msgstr "المزيد تم اصلاحة" diff -r fc15a840c235 -r 3d923a1e852c locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Sat Jul 25 14:16:44 2015 +0200 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Fri Jul 31 14:34:04 2015 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-25 14:15+0200\n" +"POT-Creation-Date: 2015-07-31 14:32+0200\n" "PO-Revision-Date: 2007-03-14 17:52+0200\n" "Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n" "Language-Team: Bulgarian <dict(a)fsa-bg.org>\n" @@ -652,76 +652,89 @@ msgid "NEWS" msgstr "НОВИНИ" -#: index.php:53 index.php:54 index.php:55 +#: index.php:53 index.php:54 index.php:55 index.php:56 #, fuzzy, c-format msgid "Gajim %s is here!" msgstr "Излезе Gajim 0.11!" -#: index.php:61 +#: index.php:62 +#, fuzzy +msgid "31 July 2015" +msgstr "18 февруари 2007 г." + +#: index.php:63 #, fuzzy msgid "24 July 2015" msgstr "18 февруари 2007 г." -#: index.php:62 +#: index.php:64 #, fuzzy msgid "28 February 2015" msgstr "7 февруари 2007 г." -#: index.php:63 +#: index.php:65 #, fuzzy msgid "04 October 2014" msgstr "19 декември 2006 г." -#: index.php:67 index.php:68 index.php:69 +#: index.php:69 index.php:70 index.php:71 index.php:72 #, fuzzy, c-format msgid "Version %s of Gajim has been released." msgstr "Издадена е версия 0.11 на Gajim." -#: index.php:76 index.php:77 index.php:78 +#: index.php:79 index.php:80 index.php:81 index.php:82 #, fuzzy, c-format msgid "What's new since %s:" msgstr "Какво е новото спрямо " -#: index.php:82 -msgid "Improve Zeroconf under windows and with IPv6" +#: index.php:86 +msgid "Fix regression of 0.16.2 when reading secrets file" msgstr "" -#: index.php:83 index.php:89 index.php:99 +#: index.php:87 +msgid "Fix reconnection after suspend" +msgstr "" + +#: index.php:88 index.php:94 index.php:100 index.php:110 msgid "Full ChangeLog" msgstr "Пълен дневник на промените" -#: index.php:83 index.php:89 index.php:99 +#: index.php:88 index.php:94 index.php:100 index.php:110 #, fuzzy msgid "Full changelog, see" msgstr "Пълен дневник на промените"

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