Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][gajim_0.16] Rejoin MUCs unconditionally on SignedInEvent
by Philipp Hörist 01 Jun '17

01 Jun '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: d3437d61 by Philipp Hörist at 2017-06-01T20:33:39+02:00 Rejoin MUCs unconditionally on SignedInEvent There is no reason that any Groupchat should be treated as already connected when we sign in. - - - - - 1 changed file: - src/groupchat_control.py Changes: ===================================== src/groupchat_control.py ===================================== --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -1365,9 +1365,6 @@ class GroupchatControl(ChatControlBase): def _nec_signed_in(self, obj): if obj.conn.name != self.account: return - if self.room_jid in gajim.gc_connected[obj.conn.name] and \ - gajim.gc_connected[obj.conn.name][self.room_jid]: - return password = gajim.gc_passwords.get(self.room_jid, '') obj.conn.join_gc(self.nick, self.room_jid, password, rejoin=True) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d3437d61cba9e1f368f47beca0f800131e…

1 0

[Git][gajim/gajim][master] Rejoin MUCs unconditionally on SignedInEvent
by Philipp Hörist 01 Jun '17

01 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: f803b544 by Philipp Hörist at 2017-06-01T19:10:06+02:00 Rejoin MUCs unconditionally on SignedInEvent There is no reason that any Groupchat should be treated as already connected when we sign in. - - - - - 1 changed file: - src/groupchat_control.py Changes: ===================================== src/groupchat_control.py ===================================== --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -1378,9 +1378,6 @@ class GroupchatControl(ChatControlBase): def _nec_signed_in(self, obj): if obj.conn.name != self.account: return - if self.room_jid in gajim.gc_connected[obj.conn.name] and \ - gajim.gc_connected[obj.conn.name][self.room_jid]: - return password = gajim.gc_passwords.get(self.room_jid, '') obj.conn.join_gc(self.nick, self.room_jid, password, rejoin=True) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f803b544bc57d12bc547ff9515bd072043…

1 0

[Git][gajim/python-nbxmpp][master] Dont leak JID to groupchats on resending messages
by Philipp Hörist 30 May '17

30 May '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f6226140 by Philipp Hörist at 2017-05-30T16:51:35+02:00 Dont leak JID to groupchats on resending messages - - - - - 1 changed file: - nbxmpp/dispatcher_nb.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== --- a/nbxmpp/dispatcher_nb.py +++ b/nbxmpp/dispatcher_nb.py @@ -578,11 +578,12 @@ class XMPPDispatcher(PlugIn): # add timestamp to message stanza in queue if (stanza.getName() == 'message' and stanza.getType() in ('chat', 'groupchat')): - our_jid = stanza.getAttr('from') timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) - stanza.addChild('delay', namespace=NS_DELAY2, - attrs={'from': our_jid or 'Gajim', - 'stamp': timestamp}) + attrs = {'stamp': timestamp} + if stanza.getType() != 'groupchat': + # Dont leak our JID to Groupchats + attrs['from'] = stanza.getAttr('from') + stanza.addChild('delay', namespace=NS_DELAY2, attrs=attrs) self.sm.uqueue.append(stanza) self.sm.out_h += 1 View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/f62261405ab90ca490c8ae73aa…

1 0

[Git][gajim/gajim][gajim_0.16] Add config option to activate XEP-0146 commands
by Philipp Hörist 26 May '17

26 May '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: b567bba5 by Philipp Hörist at 2017-05-26T23:55:06+02:00 Add config option to activate XEP-0146 commands Some of the Commands have security implications, thats why we disable them per default Fixes #8378 - - - - - 2 changed files: - src/common/commands.py - src/common/config.py Changes: ===================================== src/common/commands.py ===================================== --- a/src/common/commands.py +++ b/src/common/commands.py @@ -345,9 +345,10 @@ class ConnectionCommands: def __init__(self): # a list of all commands exposed: node -> command class self.__commands = {} - for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand, - LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand): - self.__commands[cmdobj.commandnode] = cmdobj + if gajim.config.get('remote_commands'): + for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand, + LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand): + self.__commands[cmdobj.commandnode] = cmdobj # a list of sessions; keys are tuples (jid, sessionid, node) self.__sessions = {} ===================================== src/common/config.py ===================================== --- a/src/common/config.py +++ b/src/common/config.py @@ -315,6 +315,7 @@ class Config: 'remember_opened_chat_controls': [ opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')], 'positive_184_ack': [ opt_bool, False, _('If enabled, Gajim will show an icon to show that sent message has been received by your contact')], 'pgp_encoding': [ opt_str, '', _('Sets the encoding used by python-gnupg'), True], + 'remote_commands': [opt_bool, False, _('If True, Gajim will execute XEP-0146 Commands.')], }, {}) __options_per_key = { View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b567bba56c814e8834e4fca3ee4acbb54a…

1 0

[Git][gajim/gajim][master] Add config option to activate XEP-0146 commands
by Philipp Hörist 26 May '17

26 May '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: cb65cfc5 by Philipp Hörist at 2017-05-26T23:10:05+02:00 Add config option to activate XEP-0146 commands Some of the Commands have security implications, thats why we disable them per default Fixes #8378 - - - - - 2 changed files: - src/common/commands.py - src/common/config.py Changes: ===================================== src/common/commands.py ===================================== --- a/src/common/commands.py +++ b/src/common/commands.py @@ -345,9 +345,10 @@ class ConnectionCommands: def __init__(self): # a list of all commands exposed: node -> command class self.__commands = {} - for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand, - LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand): - self.__commands[cmdobj.commandnode] = cmdobj + if gajim.config.get('remote_commands'): + for cmdobj in (ChangeStatusCommand, ForwardMessagesCommand, + LeaveGroupchatsCommand, FwdMsgThenDisconnectCommand): + self.__commands[cmdobj.commandnode] = cmdobj # a list of sessions; keys are tuples (jid, sessionid, node) self.__sessions = {} ===================================== src/common/config.py ===================================== --- a/src/common/config.py +++ b/src/common/config.py @@ -315,6 +315,7 @@ class Config: 'show_avatar_in_tabs': [ opt_bool, False, _('Show a mini avatar in chat window tabs and in window icon')], 'use_keyring': [opt_bool, True, _('If True, Gajim will use the Systems Keyring to store account passwords.')], 'pgp_encoding': [ opt_str, '', _('Sets the encoding used by python-gnupg'), True], + 'remote_commands': [opt_bool, False, _('If True, Gajim will execute XEP-0146 Commands.')], }, {}) __options_per_key = { View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cb65cfc5aed9efe05208ebbb7fb2d41fcf…

1 0

[Git][gajim/gajim][master] Add sqlite3 dependency to Windows build
by Philipp Hörist 25 May '17

25 May '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: d5d9456d by Philipp Hörist at 2017-05-25T19:12:09+02:00 Add sqlite3 dependency to Windows build - - - - - 2 changed files: - win/_base.sh - win/dev_env.sh Changes: ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -71,7 +71,8 @@ function install_deps { mingw-w64-"${ARCH}"-"${PYTHON_ID}"-gobject \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip \ mingw-w64-"${ARCH}"-gstreamer \ - mingw-w64-"${ARCH}"-adwaita-icon-theme + mingw-w64-"${ARCH}"-adwaita-icon-theme \ + mingw-w64-"${ARCH}"-sqlite3 build_pip install setuptools_scm ===================================== win/dev_env.sh ===================================== --- a/win/dev_env.sh +++ b/win/dev_env.sh @@ -13,7 +13,8 @@ function main { mingw-w64-i686-sqlite3 \ mingw-w64-i686-python3 \ mingw-w64-i686-python3-gobject \ - mingw-w64-i686-python3-pip + mingw-w64-i686-python3-pip \ + mingw-w64-i686-sqlite3 pip3 install setuptools_scm View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d5d9456d4239d5e1e6b76e999894c08408…

1 0

[Git][gajim/gajim][master] 2 commits: Switch to Automake 1.9
by Philipp Hörist 22 May '17

22 May '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: c6c1db04 by Philipp Hörist at 2017-05-22T21:47:20+02:00 Switch to Automake 1.9 - - - - - b1b5a134 by Philipp Hörist at 2017-05-22T21:48:27+02:00 Update Makefile.am - - - - - 2 changed files: - Makefile.am - configure.ac Changes: ===================================== Makefile.am ===================================== --- a/Makefile.am +++ b/Makefile.am @@ -10,8 +10,7 @@ EXTRA_DIST = \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ - gajim.nsi \ - setup_win32.py \ + win \ scripts/gajim.in DISTCLEANFILES = \ ===================================== configure.ac ===================================== --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_CONFIG_HEADER(config.h) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.8]) +AM_INIT_AUTOMAKE([1.9 tar-pax]) AM_MAINTAINER_MODE IT_PROG_INTLTOOL([0.35.0]) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9827c63f5f341f63dca521f19a70be825…

1 0

[Git][gajim/gajim][master] Clone correct project for windows build
by Philipp Hörist 20 May '17

20 May '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9827c63f by Philipp Hörist at 2017-05-20T10:25:51+02:00 Clone correct project for windows build - - - - - 1 changed file: - appveyor.yml Changes: ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -22,7 +22,7 @@ install: } bash 'pacman -Sy --noconfirm git' - bash 'git clone https://dev.gajim.org/lovetox/gajim.git' + bash 'git clone https://dev.gajim.org/gajim/gajim.git' - cmd: '%MSYS% C:/msys64/home/appveyor/gajim/win/build.sh' # Ugly workaround, because i found no way to tell when mingw32.exe returns View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9827c63f5f341f63dca521f19a70be825e…

1 0

[Git][gajim/gajim][master] Dont use deprecated icon in filter entry
by Philipp Hörist 18 May '17

18 May '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 48f492c5 by Philipp Hörist at 2017-05-18T22:19:56+02:00 Dont use deprecated icon in filter entry - - - - - 1 changed file: - data/gui/roster_window.ui Changes: ===================================== data/gui/roster_window.ui ===================================== --- a/data/gui/roster_window.ui +++ b/data/gui/roster_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkAccelGroup" id="accelgroup1"/> @@ -44,7 +44,7 @@ <property name="can_focus">True</property> <property name="no_show_all">True</property> <property name="editable">False</property> - <property name="primary_icon_name">gtk-clear</property> + <property name="primary_icon_name">edit-clear</property> <signal name="changed" handler="on_rfilter_entry_changed" swapped="no"/> <signal name="icon-press" handler="on_rfilter_entry_icon_press" swapped="no"/> </object> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/48f492c5d1768cf9db823b46daac84a1cd…

1 0

[Git][gajim/gajim][master] Add pillow to windows build dependencys
by Philipp Hörist 18 May '17

18 May '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7931af05 by Philipp Hörist at 2017-05-18T22:08:02+02:00 Add pillow to windows build dependencys - - - - - 2 changed files: - win/_base.sh - win/dev_env.sh Changes: ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -87,6 +87,7 @@ python-gnupg docutils qrcode keyring +pillow " build_pip install --no-binary ":all:" \ ===================================== win/dev_env.sh ===================================== --- a/win/dev_env.sh +++ b/win/dev_env.sh @@ -29,6 +29,7 @@ python-gnupg docutils qrcode keyring +pillow " pip3 install --no-binary ":all:" \ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7931af05238d2729157796ece99cb7bfa0…

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