Yann Leboulanger pushed to branch master at gajim / gajim
Commits:
6007ff14 by Yann Leboulanger at 2018-03-28T19:05:14+02:00
Add OpenSSL licese exception. Fixes #8999
- - - - -
1 changed file:
- COPYING
Changes:
=====================================
COPYING
=====================================
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,12 @@
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this Program, or any covered work, by linking or combining
+it with the OpenSSL library (or a modified version of that library),
+containing parts covered by the terms of the OpenSSL License, the
+licensors of this Program grant you additional permission to convey
+the resulting work.
+
+
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6007ff142d348c35f73147abd98b94575a…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6007ff142d348c35f73147abd98b94575a…
You're receiving this email because of your account on dev.gajim.org.
Yann Leboulanger pushed to branch master at gajim / gajim
Commits:
16b8eb1f by Yann Leboulanger at 2018-03-28T15:22:28+02:00
ability to fix room name when browsing muc service. See #8994
- - - - -
1 changed file:
- gajim/dialogs.py
Changes:
=====================================
gajim/dialogs.py
=====================================
--- a/gajim/dialogs.py
+++ b/gajim/dialogs.py
@@ -2378,7 +2378,12 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow):
self.requested_jid = None
self.room_jid = room_jid
self.account = account
- self.minimal_mode = room_jid is not None
+ self.minimal_mode = 0 # 2: very mini, 1: with room, 0: show all
+ if room_jid is not None:
+ if '@' in room_jid:
+ self.minimal_mode = 2
+ else:
+ self.minimal_mode = 1
glade_objects = ['grid', 'nick_entry', 'account_combo', 'jid_label',
'bookmark_switch', 'autojoin_switch', 'headerbar',
@@ -2388,6 +2393,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow):
'room_label', 'room_entry', 'search_button']
minimal_widgets = ['jid_label']
+ room_widgets = ['room_label', 'room_entry']
extended_widgets = ['server_label', 'server_combo', 'recent_label',
'recent_combo', 'room_label', 'room_entry',
@@ -2405,9 +2411,12 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow):
self.button_box.show()
# Show widgets depending on the mode the window is in
- if self.minimal_mode:
+ if self.minimal_mode > 0:
for widget in minimal_widgets:
getattr(self, widget).show()
+ if self.minimal_mode == 1:
+ for widget in room_widgets:
+ getattr(self, widget).show()
self.jid_label.set_text(room_jid)
else:
for widget in extended_widgets:
@@ -2426,7 +2435,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow):
self.connect('key-press-event', self._on_key_press_event)
self.connect('destroy', self._on_destroy)
- if not self.minimal_mode:
+ if self.minimal_mode == 0:
app.ged.register_event_handler('agent-info-received', ged.GUI1,
self._nec_agent_info_received)
app.ged.register_event_handler('agent-info-error-received', ged.GUI1,
@@ -2439,7 +2448,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow):
# Select first account
self.account_combo.set_active(0)
- if not self.minimal_mode:
+ if self.minimal_mode == 0:
self.recent_combo.set_active(0)
if self.password is not None:
@@ -2453,8 +2462,8 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow):
# Show password field if we are in extended mode or
# The MUC is passwordprotected
- if not self.minimal_mode or muc_caps_cache.supports(
- room_jid, 'muc_passwordprotected'):
+ if self.minimal_mode == 0 or muc_caps_cache.supports(
+ room_jid, 'muc_passwordprotected'):
self.password_entry.show()
self.password_label.show()
@@ -2509,8 +2518,11 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow):
account = self.account_combo.get_active_text()
nickname = self.nick_entry.get_text()
- if not self.minimal_mode:
- server = self.server_combo.get_active_text()
+ if self.minimal_mode < 2:
+ if self.minimal_mode == 0:
+ server = self.server_combo.get_active_text()
+ else: # mode 1
+ server = self.room_jid
room = self.room_entry.get_text()
if room == '':
ErrorDialog(_('Invalid Room'),
@@ -2581,7 +2593,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow):
account, name, self.room_jid, autojoin, 1, password, nickname)
def _on_destroy(self, *args):
- if not self.minimal_mode:
+ if self.minimal_mode == 0:
del app.interface.instances[self.account]['join_gc']
app.ged.remove_event_handler('agent-info-received', ged.GUI1,
self._nec_agent_info_received)
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/16b8eb1fd07571b8c633bd36c67b75e953…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/16b8eb1fd07571b8c633bd36c67b75e953…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
241deac3 by Philipp Hörist at 2018-03-27T23:43:24+02:00
ChatControl: Display status message nicer
- - - - -
1 changed file:
- gajim/chat_control.py
Changes:
=====================================
gajim/chat_control.py
=====================================
--- a/gajim/chat_control.py
+++ b/gajim/chat_control.py
@@ -1517,13 +1517,11 @@ class ChatControl(ChatControlBase):
self.update_ui()
self.parent_win.redraw_tab(self)
- self.print_conversation(_('%(name)s is now %(status)s') % {'name': name,
- 'status': uf_show}, 'status')
-
if status:
- self.print_conversation(' (', 'status', simple=True)
- self.print_conversation('%s' % (status), 'status', simple=True)
- self.print_conversation(')', 'status', simple=True)
+ status = '- %s' % status
+ status_line = _('%(name)s is now %(show)s %(status)s') % {
+ 'name': name, 'show': uf_show, 'status': status or ''}
+ self.print_conversation(status_line, 'status')
def _info_bar_show_message(self):
if self.info_bar.get_visible():
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/241deac31cf6992d451ff1c044f81df016…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/241deac31cf6992d451ff1c044f81df016…
You're receiving this email because of your account on dev.gajim.org.
Yann Leboulanger pushed to branch master at gajim / gajim
Commits:
a3853f69 by Yann Leboulanger at 2018-03-27T15:02:11+02:00
fix string
- - - - -
1 changed file:
- gajim/common/config.py
Changes:
=====================================
gajim/common/config.py
=====================================
--- a/gajim/common/config.py
+++ b/gajim/common/config.py
@@ -255,7 +255,7 @@ class Config:
'restored_messages_small': [opt_bool, True, _('If true, restored messages will use a smaller font than the default one.')],
'hide_avatar_of_transport': [opt_bool, False, _('Don\'t show avatar for the transport itself.')],
'roster_window_skip_taskbar': [opt_bool, False, _('Don\'t show roster in the system taskbar.')],
- 'use_urgency_hint': [opt_bool, True, _('If true and installed GTK+ and PyGTK versions are at least 2.8, make the window flash (the default behaviour in most Window Managers) when holding pending events.')],
+ 'use_urgency_hint': [opt_bool, True, _('If true, make the window flash (the default behaviour in most Window Managers) when holding pending events.')],
'notification_timeout': [opt_int, 5],
'send_sha_in_gc_presence': [opt_bool, True, _('Jabberd1.4 does not like sha info when one join a password protected group chat. Turn this option to False to stop sending sha info in group chat presences.')],
'one_message_window': [opt_str, 'always',
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a3853f6958fc0bf30c2827da7e8ae277f7…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a3853f6958fc0bf30c2827da7e8ae277f7…
You're receiving this email because of your account on dev.gajim.org.
Yann Leboulanger pushed to branch master at gajim / gajim
Commits:
7562acbe by Yann Leboulanger at 2018-03-27T12:25:20+02:00
correctly generate css for font that have a space. Fixes #9012
- - - - -
1 changed file:
- gajim/gtkgui_helpers.py
Changes:
=====================================
gajim/gtkgui_helpers.py
=====================================
--- a/gajim/gtkgui_helpers.py
+++ b/gajim/gtkgui_helpers.py
@@ -878,7 +878,7 @@ def add_css_font():
unit = "pt" if Gtk.check_version(3, 22, 0) is None else "px"
css = """
.font_custom {{
- font-family: {family};
+ font-family: "{family}";
font-size: {size}{unit};
font-weight: {weight};
}}""".format(
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7562acbe5b0d70839e21cb1ef28b5dc246…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7562acbe5b0d70839e21cb1ef28b5dc246…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
5794d54d by Philipp Hörist at 2018-03-26T23:47:43+02:00
Dont print status if it has not changed
Only print the status, if status has changed or the status message
Clients announce there idle-time with presences but adding a idle-time
does not necessarily mean they went from available -> away
Fixes #9001
- - - - -
2 changed files:
- gajim/common/connection_handlers.py
- gajim/roster_window.py
Changes:
=====================================
gajim/common/connection_handlers.py
=====================================
--- a/gajim/common/connection_handlers.py
+++ b/gajim/common/connection_handlers.py
@@ -851,10 +851,9 @@ class ConnectionHandlersBase:
obj.contact.contact_name = obj.contact_nickname
obj.need_redraw = True
- if obj.old_show == obj.new_show and obj.contact.status == \
- obj.status and obj.contact.priority == obj.prio and \
- obj.contact.idle_time == obj.idle_time: # no change
- return True
+ elif obj.old_show != obj.new_show or obj.contact.status != \
+ obj.status:
+ obj.need_redraw = True
else:
obj.contact = app.contacts.get_first_contact_from_jid(account,
jid)
=====================================
gajim/roster_window.py
=====================================
--- a/gajim/roster_window.py
+++ b/gajim/roster_window.py
@@ -2574,7 +2574,7 @@ class RosterWindow:
self.draw_contact(jid, account)
self.draw_group(_('Transports'), account)
- if obj.contact:
+ if obj.contact and obj.need_redraw:
self.chg_contact_status(obj.contact, obj.show, obj.status, account)
if obj.popup:
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5794d54d1c4a554125a880b5dfc296de5f…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5794d54d1c4a554125a880b5dfc296de5f…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim
Commits:
a3888302 by Philipp Hörist at 2018-03-26T22:46:54+02:00
Update ChangeLog
- - - - -
709afee3 by Philipp Hörist at 2018-03-26T22:46:54+02:00
Windows Build: Move ssl libs to correct dir
Python searches in lib-dynload and if not found it searches in
C:/Windows/system32 which can contain dlls with an invalid version
Fixes #8905
- - - - -
6793ecf5 by Philipp Hörist at 2018-03-26T22:46:54+02:00
Fix TextView scrolling
Fixes #8813
- - - - -
dce1c8b4 by Philipp Hörist at 2018-03-26T22:46:54+02:00
Commandline args are always type str in Python3
Fixes #8970
- - - - -
a22ea5ff by Andrey Gursky at 2018-03-26T22:46:55+02:00
Fixup for History Manager
Only call Gtk.main_quit() if History Manager is running standalone.
- - - - -
05e4299e by Andrey Gursky at 2018-03-26T22:46:55+02:00
Fix window position restore on multi-head setups
Gajim stopped to properly restore roster and dialogs windows positions
after restart with more than one monitor attached.
Gajim saves the absolute window positions, i.e. based on the total screen size
of all monitors attached. Despite Gtk deprecated Gdk.Screen.width() and height(),
we cannot just use width() and height() for one monitor, as recommended.
We still need the total screen size, which was the base for saving the positions.
[1] https://stackoverflow.com/questions/30207586/gdk-screen-vs-monitor-vs-displ…
- - - - -
dba8dbd2 by Philipp Hörist at 2018-03-26T22:46:55+02:00
Add stanza to log output in case of an error
- - - - -
e1cd1002 by Philipp Hörist at 2018-03-26T22:46:55+02:00
Show image preview in filechooser dialog
- - - - -
6420e7a7 by Philipp Hörist at 2018-03-26T22:46:55+02:00
Refactor resizing MUC rosters
Dont trigger resizes on notify::position, because the absolut
handle position changes also on window resizes, but the relative handle
position doesnt change.
Instead we use the notify::position event now to save the new position
to the config file and use left button release event (release of the handle after dragging)
and the window maximize/minimize event to trigger resizes in all controls
This fixes also fixes a issue where a previously hidden roster was shown again
if a new tab was opened.
Fixes #8984
- - - - -
07dda0ce by Yann Leboulanger at 2018-03-26T22:46:56+02:00
don't just ignore when we receive an error to vcard request. Fixes #8965
- - - - -
adf69a57 by Philipp Hörist at 2018-03-26T22:46:56+02:00
Remove cacert.pem
Dont ship cacerts, use certifi on Windows
- - - - -
08ab69be by Philipp Hörist at 2018-03-26T22:46:56+02:00
Remove conditional code for nbxmpp < 0.6.3
- - - - -
936085cb by Philipp Hörist at 2018-03-26T22:46:56+02:00
Add non-compliant mam:2 MUCs to blacklist
For MUCs on the blacklist we do a deduplication not depending on
stanza-id
This patch is only for current Prosody 0.10 stable and the mod_mam_muc
module which does not add stanza-id to the messages.
This can be removed once Prosody 0.11 hits or the module is updated
- - - - -
caba18ba by Philipp Hörist at 2018-03-26T22:46:56+02:00
Improve disabling autoscroll
Add the SHIFT + PAGE_UP keypress
Fix catching mouse scroll UP on some systems
- - - - -
edfceb8c by Philipp Hörist at 2018-03-26T22:46:56+02:00
Only test if MUCs are on the blacklist
- - - - -
db0b1266 by Philipp Hörist at 2018-03-26T22:46:57+02:00
Logger: Test for None after fetchone()
fetchone() returns None when nothing is found
len(None) yields a TypeError
- - - - -
2b003cc4 by Philipp Hörist at 2018-03-26T22:46:57+02:00
HistoryManager: Clear logs TextView when nothing is selected
- - - - -
03520606 by Philipp Hörist at 2018-03-26T22:46:57+02:00
Show error message on account registration
Prefer the error message text over the error code
- - - - -
232d4587 by Philipp Hörist at 2018-03-26T22:46:57+02:00
Fix NoneType Error
element can be None if there was a error while calling Gst.ElementFactory.make()
- - - - -
f389479e by Philipp Hörist at 2018-03-26T22:46:57+02:00
Fix Autoscroll (for real this time)
Fixes #8992
- - - - -
71740a0c by Philipp Hörist at 2018-03-26T22:46:57+02:00
Dont use invalid sound devices
PulseAudio has devices that are None
Fixes #8797
- - - - -
f57f6688 by Philipp Hörist at 2018-03-26T22:46:58+02:00
Disable autoscroll when moving the slider
- - - - -
5227939b by Philipp Hörist at 2018-03-26T22:46:58+02:00
MessageTextView: Remove placeholder on paste
Fixes #8975
- - - - -
06a98525 by Yann Leboulanger at 2018-03-26T22:47:23+02:00
ability to run history manager even when -s option is used to run Gajim
- - - - -
035a1005 by Philipp Hörist at 2018-03-26T22:47:46+02:00
Groupchat: Set minimize on auto join default True
- - - - -
86ad1263 by Roland Pallai at 2018-03-26T22:48:07+02:00
Fix sound playback for received group chat messages
Testing for historical messages was broken because `msg_obj.timestamp`
second resolution assumed but this is false and this led to broken
sound playback for received group chat messages.
- - - - -
8cfee200 by Roland Pallai at 2018-03-26T22:48:08+02:00
Fix regression in a4291a27
- - - - -
8ef3def3 by Philipp Hörist at 2018-03-26T22:48:08+02:00
Set min-width for notebooks tabs
Fixes #8973
- - - - -
10bc416c by Philipp Hörist at 2018-03-26T22:48:08+02:00
Fix some problematic imports
- - - - -
b56fda50 by Yann Leboulanger at 2018-03-26T22:48:48+02:00
Fix button text. Fixes #9005
- - - - -
1f11737b by Philipp Hörist at 2018-03-26T22:48:48+02:00
Raise min GTK version to 3.22
- - - - -
948df7de by Philipp Hörist at 2018-03-26T22:48:48+02:00
Raise min Python version to 3.5
- - - - -
a5dd159a by Philipp Hörist at 2018-03-26T22:48:48+02:00
Fix version check
- - - - -
30 changed files:
- ChangeLog
- README.md
- gajim/chat_control.py
- gajim/chat_control_base.py
- gajim/common/config.py
- gajim/common/connection.py
- gajim/common/connection_handlers.py
- gajim/common/connection_handlers_events.py
- gajim/common/helpers.py
- gajim/common/logger.py
- gajim/common/message_archiving.py
- gajim/common/multimedia_helpers.py
- gajim/config.py
- gajim/conversation_textview.py
- gajim/data/gui/chat_control.ui
- gajim/data/gui/groupchat_control.ui
- gajim/data/gui/message_window.ui
- − gajim/data/other/cacerts.pem
- gajim/data/style/gajim.css
- gajim/dialogs.py
- gajim/filetransfers_window.py
- gajim/gajim.py
- gajim/gajim_remote.py
- gajim/groupchat_control.py
- gajim/gtkgui_helpers.py
- gajim/gui_interface.py
- gajim/history_manager.py
- gajim/message_textview.py
- gajim/message_window.py
- gajim/roster_window.py
The diff was not included because it is too large.
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/08525402f25afd3b1294b1981dffd9da1…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/08525402f25afd3b1294b1981dffd9da1…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
4ef15d4a by Philipp Hörist at 2018-03-26T20:20:56+02:00
Fix version check
- - - - -
1 changed file:
- setup.py
Changes:
=====================================
setup.py
=====================================
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
import os
import sys
-if sys.version_info[0] < (3, 5):
+if sys.version_info < (3, 5):
sys.exit('Gajim needs Python 3.5+')
from setuptools import setup, find_packages
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4ef15d4aaa28a5c9be20dc9da93f802d1d…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4ef15d4aaa28a5c9be20dc9da93f802d1d…
You're receiving this email because of your account on dev.gajim.org.