Commits March 2018

commits@gajim.org

1 participants
106 discussions

[Git][gajim/gajim][master] 2 commits: Raise min GTK version to 3.22
by Philipp Hörist 26 Mar '18

26 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4f1ba653 by Philipp Hörist at 2018-03-26T19:41:41+02:00 Raise min GTK version to 3.22 - - - - - 1d2c3d9f by Philipp Hörist at 2018-03-26T19:46:25+02:00 Raise min Python version to 3.5 - - - - - 3 changed files: - README.md - gajim/gajim.py - setup.py Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ ### Runtime Requirements -- python3.4 or higher +- python3.5 or higher - python3-gi - python3-gi-cairo -- gir1.2-gtk-3.0 +- gir1.2-gtk-3.0 (>=3.22) - python3-nbxmpp - python3-openssl (>=0.14) - python3-pyasn1 ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -56,7 +56,7 @@ from gajim.common import i18n from gajim.common import logging_helpers MIN_NBXMPP_VER = "0.6.4" -MIN_GTK_VER = "3.20.0" +MIN_GTK_VER = "3.22.0" class GajimApplication(Gtk.Application): ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -3,8 +3,8 @@ import os import sys -if sys.version_info[0] < 3: - sys.exit('Tried to install with Python 2, gajim only supports Python 3.') +if sys.version_info[0] < (3, 5): + sys.exit('Gajim needs Python 3.5+') from setuptools import setup, find_packages from setuptools import Command View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5353f770a10ee0259c6421a7883e98dda… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5353f770a10ee0259c6421a7883e98dda… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix button text. Fixes #9005
by Yann Leboulanger 26 Mar '18

26 Mar '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 5353f770 by Yann Leboulanger at 2018-03-26T17:45:32+02:00 Fix button text. Fixes #9005 - - - - - 1 changed file: - gajim/chat_control.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -1581,7 +1581,7 @@ class ChatControl(ChatControlBase): markup += ' (%s)' % file_props.desc markup += '\n%s: %s' % (_('Size'), helpers.convert_bytes( file_props.size)) - b1 = Gtk.Button(_('_Accept')) + b1 = Gtk.Button(_('Accept')) b1.connect('clicked', self._on_accept_file_request, file_props) b2 = Gtk.Button(stock=Gtk.STOCK_CANCEL) b2.connect('clicked', self._on_cancel_file_request, file_props) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5353f770a10ee0259c6421a7883e98ddae… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5353f770a10ee0259c6421a7883e98ddae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused imports
by Philipp Hörist 25 Mar '18

25 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 99b3aebc by Philipp Hörist at 2018-03-26T01:06:56+02:00 Remove unused imports - - - - - 17 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/connection_handlers_events.py - gajim/conversation_textview.py - gajim/disco.py - gajim/emoticons.py - gajim/gajim.py - gajim/gajim_remote.py - gajim/gui_menu_builder.py - gajim/history_sync.py - gajim/history_window.py - gajim/htmltextview.py - gajim/message_window.py - gajim/remote_control.py - gajim/screensaver_listener.py - gajim/session.py - gajim/statusicon.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -31,7 +31,6 @@ import os import time from gi.repository import Gtk from gi.repository import Gio -from gi.repository import GdkPixbuf from gi.repository import Pango from gi.repository import GLib from gajim import gtkgui_helpers ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -36,7 +36,6 @@ from gi.repository import GLib from gi.repository import Gio from gajim import gtkgui_helpers -from gajim.gtkgui_helpers import Color from gajim import message_control from gajim import dialogs from gajim import history_window ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -38,9 +38,8 @@ from gajim.common import helpers from gajim.common import app from gajim.common import i18n from gajim.common import dataforms -from gajim.common import exceptions from gajim.common.zeroconf.zeroconf import Constant -from gajim.common.logger import LOG_DB_PATH, KindConstant +from gajim.common.logger import KindConstant from gajim.common.pep import SUPPORTED_PERSONAL_USER_EVENTS from gajim.common.jingle_transport import JingleTransportSocks5 from gajim.common.file_props import FilesProp ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -27,8 +27,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -from threading import Timer # for smooth scrolling - from gi.repository import Gtk from gi.repository import Gdk from gi.repository import Pango ===================================== gajim/disco.py ===================================== --- a/gajim/disco.py +++ b/gajim/disco.py @@ -61,7 +61,6 @@ from gajim import gui_menu_builder from gajim.common import app import nbxmpp -from gajim.common.exceptions import GajimGeneralException from gajim.common import helpers from gajim.common import ged ===================================== gajim/emoticons.py ===================================== --- a/gajim/emoticons.py +++ b/gajim/emoticons.py @@ -18,7 +18,6 @@ import os import sys import logging -import importlib.util as imp from collections import OrderedDict from importlib.machinery import SourceFileLoader ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -54,7 +54,6 @@ from gi.repository import GLib, Gio, Gtk from gajim.common import i18n from gajim.common import logging_helpers -from gajim.common import crypto MIN_NBXMPP_VER = "0.6.4" MIN_GTK_VER = "3.20.0" ===================================== gajim/gajim_remote.py ===================================== --- a/gajim/gajim_remote.py +++ b/gajim/gajim_remote.py @@ -30,7 +30,6 @@ import os import sys import locale -import urllib import signal signal.signal(signal.SIGINT, signal.SIG_DFL) # ^C exits the application ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -26,7 +26,7 @@ from gajim import message_control from gajim.common import app from gajim.common import helpers from gajim.common import i18n -from nbxmpp.protocol import NS_COMMANDS, NS_FILE, NS_MUC, NS_ESESSION +from nbxmpp.protocol import NS_COMMANDS, NS_FILE, NS_MUC from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5, NS_CONFERENCE from gajim.gtkgui_helpers import get_action ===================================== gajim/history_sync.py ===================================== --- a/gajim/history_sync.py +++ b/gajim/history_sync.py @@ -21,7 +21,6 @@ import logging from enum import IntEnum from datetime import datetime, timedelta -import nbxmpp from gi.repository import Gtk, GLib from gajim.common import app ===================================== gajim/history_window.py ===================================== --- a/gajim/history_window.py +++ b/gajim/history_window.py @@ -29,7 +29,6 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib import time -import calendar import datetime from enum import IntEnum, unique ===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -36,7 +36,6 @@ modular. """ from gi.repository import GObject -from gi.repository import GLib from gi.repository import Pango from gi.repository import Gtk from gi.repository import Gdk @@ -55,10 +54,8 @@ from gajim.common import app from gajim import gtkgui_helpers from gajim.gtkgui_helpers import get_icon_pixmap from gajim.common import helpers -from gajim.common.exceptions import GajimGeneralException from gajim import dialogs -from gajim import tooltips import logging log = logging.getLogger('gajim.htmlview') ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -31,7 +31,6 @@ import time from gi.repository import Gtk from gi.repository import Gdk -from gi.repository import GdkPixbuf from gi.repository import GObject from gi.repository import GLib ===================================== gajim/remote_control.py ===================================== --- a/gajim/remote_control.py +++ b/gajim/remote_control.py @@ -27,15 +27,13 @@ ## from gi.repository import GLib -from gi.repository import Gtk import os import base64 import mimetypes from gajim.common import app from gajim.common import helpers -from time import time -from gajim.dialogs import AddNewContactWindow, JoinGroupchatWindow +from gajim.dialogs import AddNewContactWindow from gajim.common import ged from gajim.common.connection_handlers_events import MessageOutgoingEvent from gajim.common.connection_handlers_events import GcMessageOutgoingEvent ===================================== gajim/screensaver_listener.py ===================================== --- a/gajim/screensaver_listener.py +++ b/gajim/screensaver_listener.py @@ -20,7 +20,7 @@ import logging -from gi.repository import Gio, GLib +from gi.repository import Gio from gajim.common import app ===================================== gajim/session.py ===================================== --- a/gajim/session.py +++ b/gajim/session.py @@ -21,10 +21,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import nbxmpp - from gajim.common import helpers - from gajim.common import events from gajim.common import exceptions from gajim.common import app @@ -34,11 +31,8 @@ from gajim.common import ged from gajim.common.connection_handlers_events import ChatstateReceivedEvent, \ InformationEvent from gajim.common.logger import KindConstant - from gajim import message_control - from gajim import notify - from gajim import dialogs from gajim import negotiation ===================================== gajim/statusicon.py ===================================== --- a/gajim/statusicon.py +++ b/gajim/statusicon.py @@ -23,16 +23,15 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## +import os + from gi.repository import Gtk from gi.repository import Gdk -import os -import sys from gajim import dialogs from gajim import config from gajim import tooltips from gajim import gtkgui_helpers - from gajim.common import app from gajim.common import helpers View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/99b3aebc99f24e85d8046ff3baed546081… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/99b3aebc99f24e85d8046ff3baed546081… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix some problematic imports
by Philipp Hörist 25 Mar '18

25 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6f55cf3d by Philipp Hörist at 2018-03-26T00:19:59+02:00 Fix some problematic imports - - - - - 4 changed files: - gajim/config.py - gajim/dialogs.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py Changes: ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -48,6 +48,8 @@ from gajim import dialogs from gajim import cell_renderer_image from gajim import message_control from gajim.chat_control_base import ChatControlBase +from gajim.gajim_themes_window import GajimThemesWindow +from gajim.advanced_configuration_window import AdvancedConfigurationWindow from gajim import dataforms_widget from gajim import gui_menu_builder @@ -696,7 +698,7 @@ class PreferencesWindow: def on_manage_theme_button_clicked(self, widget): if self.theme_preferences is None: - self.theme_preferences = dialogs.GajimThemesWindow() + self.theme_preferences = GajimThemesWindow() else: self.theme_preferences.window.present() self.theme_preferences.select_active_theme() @@ -1188,7 +1190,7 @@ class PreferencesWindow: app.interface.instances['advanced_config'].window.present() else: app.interface.instances['advanced_config'] = \ - dialogs.AdvancedConfigurationWindow() + AdvancedConfigurationWindow() #---------- ManageProxiesWindow class -------------# class ManageProxiesWindow: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -53,12 +53,6 @@ from gajim.common import const from gajim.options_dialog import OptionsDialog from gajim.common.const import Option, OptionKind, OptionType -# those imports are not used in this file, but in files that 'import dialogs' -# so they can do dialog.GajimThemesWindow() for example -from gajim.filetransfers_window import FileTransfersWindow -from gajim.gajim_themes_window import GajimThemesWindow -from gajim.advanced_configuration_window import AdvancedConfigurationWindow - from gajim.common import app from gajim.common import helpers from gajim.common import i18n ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -86,9 +86,6 @@ def get_icon_path(icon_name, size=16): log.error("Unable to find icon %s: %s" % (icon_name, str(e))) -from gajim import dialogs - - HAS_PYWIN32 = True if os.name == 'nt': try: @@ -447,6 +444,7 @@ def scale_with_ratio(size, width, height): return size, int(size / ratio) def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): + from gajim import dialogs def on_continue(response, file_path): if response < 0: return ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -73,6 +73,7 @@ from gajim.chat_control import ChatControl from gajim.groupchat_control import GroupchatControl from gajim.groupchat_control import PrivateChatControl from gajim.message_window import MessageWindowMgr +from gajim.filetransfers_window import FileTransfersWindow from gajim.atom_window import AtomWindow from gajim.session import ChatControlSession @@ -2717,7 +2718,7 @@ class Interface: self.roster._after_fill() # get instances for windows/dialogs that will show_all()/hide() - self.instances['file_transfers'] = dialogs.FileTransfersWindow() + self.instances['file_transfers'] = FileTransfersWindow() GLib.timeout_add(100, self.autoconnect) if sys.platform == 'win32': View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6f55cf3dd4f00d52975b7cef09c2de6021… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6f55cf3dd4f00d52975b7cef09c2de6021… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Set min-width for notebooks tabs
by Philipp Hörist 25 Mar '18

25 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b54f2759 by Philipp Hörist at 2018-03-25T23:28:17+02:00 Set min-width for notebooks tabs Fixes #8973 - - - - - 2 changed files: - gajim/data/gui/message_window.ui - gajim/data/style/gajim.css Changes: ===================================== gajim/data/gui/message_window.ui ===================================== --- a/gajim/data/gui/message_window.ui +++ b/gajim/data/gui/message_window.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkEventBox" id="chat_tab_ebox"> @@ -30,8 +30,11 @@ <property name="can_focus">False</property> <property name="use_markup">True</property> <property name="ellipsize">end</property> - <property name="max_width_chars">9</property> + <property name="single_line_mode">True</property> <property name="xalign">0</property> + <style> + <class name="notebook-tab-label"/> + </style> </object> <packing> <property name="expand">False</property> ===================================== gajim/data/style/gajim.css ===================================== --- a/gajim/data/style/gajim.css +++ b/gajim/data/style/gajim.css @@ -99,3 +99,6 @@ popover#EmoticonPopover flowboxchild { padding-top: 5px; padding-bottom: 5px; } .status-away { color: #ff8533;} .status-dnd { color: #e62e00;} .status-online { color: #66bf10;} + +/*MessageWindow Notebook*/ +.notebook-tab-label {min-width: 80px} View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b54f27599cb762a0cdc975b61af8684170… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b54f27599cb762a0cdc975b61af8684170… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix regression in a4291a27
by Philipp Hörist 25 Mar '18

25 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 23add367 by Roland Pallai at 2018-03-25T22:46:51+02:00 Fix regression in a4291a27 - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1404,7 +1404,7 @@ class GroupchatControl(ChatControlBase): sound = 'received' # Is it a history message? Don't want sound-floods when we join. - if tim - time.mktime(time.localtime()) > 1: + if time.mktime(time.localtime()) - tim > 1: sound = None return (highlight, sound) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/23add367be7aa0deb60a4461437344e0fb… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/23add367be7aa0deb60a4461437344e0fb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix sound playback for received group chat messages
by Philipp Hörist 25 Mar '18

25 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a4291a27 by Roland Pallai at 2018-03-25T22:26:59+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. - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1404,7 +1404,7 @@ class GroupchatControl(ChatControlBase): sound = 'received' # Is it a history message? Don't want sound-floods when we join. - if tim != time.mktime(time.localtime()): + if tim - time.mktime(time.localtime()) > 1: sound = None return (highlight, sound) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a4291a27f10d1c90a58747cb99e6451033… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a4291a27f10d1c90a58747cb99e6451033… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Set minimize on auto join default True
by Philipp Hörist 25 Mar '18

25 Mar '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 69fd7dc7 by Philipp Hörist at 2018-03-25T21:34:42+02:00 Groupchat: Set minimize on auto join default True - - - - - 1 changed file: - gajim/dialogs.py Changes: ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -2584,7 +2584,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): # Add as bookmark, with autojoin and not minimized name = app.get_nick_from_jid(self.room_jid) app.interface.add_gc_bookmark( - account, name, self.room_jid, autojoin, 0, password, nickname) + account, name, self.room_jid, autojoin, 1, password, nickname) def _on_destroy(self, *args): if not self.minimal_mode: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/69fd7dc73764c39acb9c9419d8fffe748b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/69fd7dc73764c39acb9c9419d8fffe748b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] add translator comments in pot/po files
by Yann Leboulanger 25 Mar '18

25 Mar '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 039f2215 by Yann Leboulanger at 2018-03-25T21:09:13+02:00 add translator comments in pot/po files - - - - - 1 changed file: - setup.py Changes: ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ def update_trans(): os.path.join(root, f)) and (f.endswith('.py') or f.endswith('.ui'))] files.append(os.path.join("data", "org.gajim.Gajim.desktop.in")) files.append(os.path.join("data", "org.gajim.Gajim.appdata.xml.in")) - cmd = 'xgettext --from-code=utf-8 --keyword=Q_ -o %s %s' % ( + cmd = 'xgettext -c# --from-code=utf-8 --keyword=Q_ -o %s %s' % ( template, " ".join(files)) if os.system(cmd) != 0: msg = "ERROR: %s could not be created!\n" % template View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/039f2215dc705f05fafe3ded988be46dc0… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/039f2215dc705f05fafe3ded988be46dc0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ability to run history manager even when -s option is used to run Gajim
by Yann Leboulanger 25 Mar '18

25 Mar '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 5874f5c3 by Yann Leboulanger at 2018-03-25T20:52:36+02:00 ability to run history manager even when -s option is used to run Gajim - - - - - 1 changed file: - gajim/history_manager.py Changes: ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -44,8 +44,8 @@ def parseOpts(): config_path = None try: - shortargs = 'hvc:l:p:' - longargs = 'help verbose config-path= loglevel= profile=' + shortargs = 'hvsc:l:p:' + longargs = 'help verbose separate config-path= loglevel= profile=' opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0] except getopt.error as msg: print(str(msg)) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5874f5c38880881315fad0b43102de7a1c… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5874f5c38880881315fad0b43102de7a1c… 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 March 2018