Commits

commits@gajim.org

17632 discussions

gajim: [NooN8] Fix parameter name. Fixes #8358
by Gajim 14 Jul '16

14 Jul '16

changeset 4f26d28d7943 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=4f26d28d7943 description: [NooN8] Fix parameter name. Fixes #8358 diffstat: src/common/dataforms.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (18 lines): diff -r a010e196496a -r 4f26d28d7943 src/common/dataforms.py --- a/src/common/dataforms.py Thu Jul 14 22:21:04 2016 +0200 +++ b/src/common/dataforms.py Thu Jul 14 22:29:21 2016 +0200 @@ -300,12 +300,12 @@ def fget(self): return map(Uri, self.getTags('uri')) - def fset(self, value): + def fset(self, values): fdel(self) for uri in values: self.addChild(node=uri) - def fdel(self, value): + def fdel(self): for element in self.getTags('uri'): self.delChild(element)

1 0

gajim: [NooN8] add missing event to events_dump plugin. Fixes #8357
by Gajim 14 Jul '16

14 Jul '16

changeset a010e196496a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=a010e196496a description: [NooN8] add missing event to events_dump plugin. Fixes #8357 diffstat: plugins/events_dump/plugin.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 193081600a08 -r a010e196496a plugins/events_dump/plugin.py --- a/plugins/events_dump/plugin.py Thu Jul 14 21:58:47 2016 +0200 +++ b/plugins/events_dump/plugin.py Thu Jul 14 22:21:04 2016 +0200 @@ -46,7 +46,7 @@ 'Subscribe', 'Subscribed', 'Unsubscribed', 'NewAccount', 'VcardInfo', 'LastStatusTime', 'OsInfo', 'GCPresence', 'GCMessage', 'RosterInfo', - 'NewGmail'] + 'NewGmail', 'EntityTime'] events_from_src_gajim = [ 'ROSTER', 'WARNING', 'ERROR',

1 0

gajim: [NooN8] Fix imports thanks to pyflakes. Fixes #8360
by Gajim 14 Jul '16

14 Jul '16

changeset 193081600a08 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=193081600a08 description: [NooN8] Fix imports thanks to pyflakes. Fixes #8360 diffstat: src/chat_control.py | 5 --- src/command_system/framework.py | 1 - src/command_system/implementation/custom.py | 2 +- src/command_system/implementation/execute.py | 2 +- src/command_system/implementation/standard.py | 3 +- src/command_system/tools.py | 3 +- src/common/caps_cache.py | 2 +- src/common/check_paths.py | 1 - src/common/config.py | 2 - src/common/connection.py | 19 +++++++++++++- src/common/connection_handlers.py | 29 +++++++++++++++----- src/common/dbus_support.py | 2 +- src/common/fuzzyclock.py | 1 - src/common/gajim.py | 2 - src/common/gnupg.py | 1 - src/common/jingle_content.py | 1 - src/common/jingle_ft.py | 8 +++-- src/common/jingle_ftstates.py | 2 +- src/common/jingle_session.py | 6 +++- src/common/jingle_transport.py | 1 - src/common/jingle_xtls.py | 1 - src/common/location_listener.py | 1 - src/common/optparser.py | 1 - src/common/pep.py | 1 - src/common/protocol/bytestream.py | 1 - src/common/protocol/caps.py | 1 - src/common/sleepy.py | 2 +- src/common/socks5.py | 1 + src/common/zeroconf/client_zeroconf.py | 4 +- src/common/zeroconf/connection_handlers_zeroconf.py | 4 -- src/common/zeroconf/connection_zeroconf.py | 8 +++-- src/common/zeroconf/zeroconf_avahi.py | 2 +- src/common/zeroconf/zeroconf_bonjour.py | 2 +- src/config.py | 2 +- src/conversation_textview.py | 2 - src/dialogs.py | 1 - src/disco.py | 1 - src/features_window.py | 1 - src/groupchat_control.py | 1 - src/gui_interface.py | 4 +-- src/history_manager.py | 1 - src/history_window.py | 1 + src/htmltextview.py | 5 ++- src/network_manager_listener.py | 1 - src/notify.py | 1 - src/plugins/gui.py | 2 +- src/roster_window.py | 2 - src/statusicon.py | 4 -- src/tooltips.py | 1 - src/upower_listener.py | 1 - 50 files changed, 76 insertions(+), 77 deletions(-) diffs (truncated from 757 to 300 lines): diff -r 4bac6da40720 -r 193081600a08 src/chat_control.py --- a/src/chat_control.py Thu Jul 14 21:45:39 2016 +0200 +++ b/src/chat_control.py Thu Jul 14 21:58:47 2016 +0200 @@ -52,7 +52,6 @@ from common.stanza_session import EncryptedStanzaSession, ArchivingStanzaSession from common.contacts import GC_Contact from common.logger import constants -from common.pep import MOODS, ACTIVITIES from nbxmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC from nbxmpp.protocol import NS_RECEIPTS, NS_ESESSION from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO @@ -76,10 +75,6 @@ except ImportError: HAS_GTK_SPELL = False -from common import dbus_support -if dbus_support.supported: - import dbus - import remote_control ################################################################################ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): diff -r 4bac6da40720 -r 193081600a08 src/command_system/framework.py --- a/src/command_system/framework.py Thu Jul 14 21:45:39 2016 +0200 +++ b/src/command_system/framework.py Thu Jul 14 21:58:47 2016 +0200 @@ -19,7 +19,6 @@ declarative way. """ -import re from types import FunctionType from inspect import getargspec, getdoc diff -r 4bac6da40720 -r 193081600a08 src/command_system/implementation/custom.py --- a/src/command_system/implementation/custom.py Thu Jul 14 21:45:39 2016 +0200 +++ b/src/command_system/implementation/custom.py Thu Jul 14 21:58:47 2016 +0200 @@ -35,7 +35,7 @@ """ from ..framework import CommandContainer, command, doc -from hosts import * +from hosts import ChatCommands, PrivateChatCommands, GroupChatCommands class CustomCommonCommands(CommandContainer): """ diff -r 4bac6da40720 -r 193081600a08 src/command_system/implementation/execute.py --- a/src/command_system/implementation/execute.py Thu Jul 14 21:45:39 2016 +0200 +++ b/src/command_system/implementation/execute.py Thu Jul 14 21:58:47 2016 +0200 @@ -38,7 +38,7 @@ from glib import timeout_add from ..framework import CommandContainer, command, doc -from hosts import * +from hosts import ChatCommands, PrivateChatCommands, GroupChatCommands class Execute(CommandContainer): AUTOMATIC = True diff -r 4bac6da40720 -r 193081600a08 src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Thu Jul 14 21:45:39 2016 +0200 +++ b/src/command_system/implementation/standard.py Thu Jul 14 21:58:47 2016 +0200 @@ -30,8 +30,7 @@ from ..framework import CommandContainer, command, doc from ..mapping import generate_usage -from hosts import * -import execute +from hosts import PrivateChatCommands, GroupChatCommands, ChatCommands # This holds constants fron the logger, which we'll be using in some of our # commands. diff -r 4bac6da40720 -r 193081600a08 src/command_system/tools.py --- a/src/command_system/tools.py Thu Jul 14 21:45:39 2016 +0200 +++ b/src/command_system/tools.py Thu Jul 14 21:58:47 2016 +0200 @@ -24,8 +24,9 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -from types import * from glib import GError +from types import DictType, ListType + def remove(sequence, target): if isinstance(sequence, ListType): diff -r 4bac6da40720 -r 193081600a08 src/common/caps_cache.py --- a/src/common/caps_cache.py Thu Jul 14 21:45:39 2016 +0200 +++ b/src/common/caps_cache.py Thu Jul 14 21:58:47 2016 +0200 @@ -38,7 +38,7 @@ log = logging.getLogger('gajim.c.caps_cache') from nbxmpp import (NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, NS_CHATSTATES, - NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_CAPS, + NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_FILE_TRANSFER) # Features where we cannot safely assume that the other side supports them FEATURE_BLACKLIST = [NS_CHATSTATES, NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, diff -r 4bac6da40720 -r 193081600a08 src/common/check_paths.py --- a/src/common/check_paths.py Thu Jul 14 21:45:39 2016 +0200 +++ b/src/common/check_paths.py Thu Jul 14 21:58:47 2016 +0200 @@ -26,7 +26,6 @@ import os import shutil import sys -import stat from common import gajim import logger diff -r 4bac6da40720 -r 193081600a08 src/common/config.py --- a/src/common/config.py Thu Jul 14 21:45:39 2016 +0200 +++ b/src/common/config.py Thu Jul 14 21:58:47 2016 +0200 @@ -32,9 +32,7 @@ ## -import sys import re -import copy import defs import gobject diff -r 4bac6da40720 -r 193081600a08 src/common/connection.py --- a/src/common/connection.py Thu Jul 14 21:45:39 2016 +0200 +++ b/src/common/connection.py Thu Jul 14 21:58:47 2016 +0200 @@ -42,6 +42,24 @@ import hmac import json +import common +from common.connection_handlers import BLOCKING_ARRIVED, PRIVACY_ARRIVED, AGENT_REMOVED, \ + ConnectionHandlers, DELIMITER_ARRIVED, METACONTACTS_ARRIVED, ROSTER_ARRIVED +from common.connection_handlers_events import InformationEvent, \ + UniqueRoomIdNotSupportedEvent, UniqueRoomIdSupportedEvent, GatewayPromptReceivedEvent, \ + NewAccountNotConnectedEvent, StanzaMessageOutgoingEvent, OurShowEvent, SignedInEvent, \ + PrivacyListRemovedEvent, PingReplyEvent, PingErrorEvent, PingSentEvent, \ + AnonymousAuthEvent, ConnectionLostEvent, ConnectionTypeEvent, SSLErrorEvent, \ + FingerprintErrorEvent, InsecureSSLConnectionEvent, ClientCertPassphraseEvent, \ + PlainConnectionEvent, PrivacyListReceivedEvent, PrivacyListActiveDefaultEvent, \ + PrivacyListsReceivedEvent, RegisterAgentInfoReceivedEvent, NewAccountConnectedEvent, \ + AccountCreatedEvent, AccountNotCreatedEvent, BeforeChangeShowEvent, StanzaSentEvent, \ + StanzaReceivedEvent, MessageNotSentEvent, GPGTrustKeyEvent, BadGPGPassphraseEvent +from common.connection_handlers_events import InsecurePasswordEvent, MessageSentEvent, \ + NonAnonymousServerErrorEvent, Oauth2CredentialsRequiredEvent, PasswordRequiredEvent, \ + RosterReceivedEvent, SearchResultReceivedEvent +import common.ged as ged + try: randomsource = random.SystemRandom() except Exception: @@ -59,7 +77,6 @@ from common import passwords from common import exceptions from common import check_X509 -from connection_handlers import * if gajim.HAVE_PYOPENSSL: import OpenSSL.crypto diff -r 4bac6da40720 -r 193081600a08 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Jul 14 21:45:39 2016 +0200 +++ b/src/common/connection_handlers.py Thu Jul 14 21:58:47 2016 +0200 @@ -30,24 +30,41 @@ import os import base64 -import sys import operator import hashlib import gobject -import locale -from time import (altzone, daylight, gmtime, localtime, mktime, strftime, +from time import (altzone, daylight, gmtime, localtime, strftime, time as time_time, timezone, tzname) -from calendar import timegm import nbxmpp import common.caps_cache as capscache +from common.connection_handlers_events import InformationEvent, \ + AgentItemsErrorReceivedEvent, AgentInfoErrorReceivedEvent, RosterInfoEvent, \ + BadGPGPassphraseEvent, SignedInEvent, MucOwnerReceivedEvent, MucAdminReceivedEvent, \ + PingReceivedEvent, OurShowEvent, StreamReceivedEvent, BlockingEvent, \ + SearchFormReceivedEvent, GPGPasswordRequiredEvent, RosterReceivedEvent, \ + GMailQueryReceivedEvent, RosterItemExchangeEvent, TimeRevisedRequestEvent, \ + GcMessageReceivedEvent, TimeRequestEvent, VersionResultReceivedEvent, \ + PrivateStorageReceivedEvent, RosterSetReceivedEvent, VersionRequestEvent, \ + LastRequestEvent, TimeResultReceivedEvent, GmailNewMailReceivedEvent, \ + PrivateStorageBookmarksReceivedEvent, BookmarksReceivedEvent, \ + PrivateStorageRosternotesReceivedEvent, RosternotesReceivedEvent, \ + StreamConflictReceivedEvent, StreamOtherHostReceivedEvent, MessageReceivedEvent, \ + ArchivingErrorReceivedEvent, ArchivingPreferencesChangedReceivedEvent, \ + NotificationEvent, GcInvitationReceivedEvent, GcDeclineReceivedEvent, \ + MessageErrorEvent, LastResultReceivedEvent, PresenceReceivedEvent, FailedDecryptEvent, \ + DecryptedMessageReceivedEvent, MamDecryptedMessageReceivedEvent, HttpAuthReceivedEvent, \ + IqErrorReceivedEvent, VcardReceivedEvent, AgentRemovedEvent, MetacontactsReceivedEvent, \ + PEPConfigReceivedEvent, PEPReceivedEvent, AgentItemsReceivedEvent, \ + AgentInfoReceivedEvent, VcardPublishedEvent, VcardNotPublishedEvent +#from common.connection_handlers_events import * +from common.logger import LOG_DB_PATH from pep import LOCATION_DATA from common import helpers from common import gajim from common import exceptions -from common import dataforms from common import jingle_xtls from common.commands import ConnectionCommands from common.pubsub import ConnectionPubSub @@ -56,10 +73,8 @@ from common.protocol.bytestream import ConnectionIBBytestream from common.message_archiving import ConnectionArchive136 from common.message_archiving import ConnectionArchive313 -from common.connection_handlers_events import * from common import ged -from common import nec from common.nec import NetworkEvent from common.jingle import ConnectionJingle diff -r 4bac6da40720 -r 193081600a08 src/common/dbus_support.py --- a/src/common/dbus_support.py Thu Jul 14 21:45:39 2016 +0200 +++ b/src/common/dbus_support.py Thu Jul 14 21:58:47 2016 +0200 @@ -24,7 +24,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import os, sys +import os from common import gajim from common import exceptions diff -r 4bac6da40720 -r 193081600a08 src/common/fuzzyclock.py --- a/src/common/fuzzyclock.py Thu Jul 14 21:45:39 2016 +0200 +++ b/src/common/fuzzyclock.py Thu Jul 14 21:58:47 2016 +0200 @@ -32,7 +32,6 @@ So most of the credit goes to this guys, thanks :-) """ -import time class FuzzyClock: HOUR_NAMES = [ _('twelve'), _('one'), _('two'), _('three'), _('four'), diff -r 4bac6da40720 -r 193081600a08 src/common/gajim.py --- a/src/common/gajim.py Thu Jul 14 21:45:39 2016 +0200 +++ b/src/common/gajim.py Thu Jul 14 21:58:47 2016 +0200 @@ -27,7 +27,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import sys import os import logging import locale @@ -35,7 +34,6 @@ import config import nbxmpp -import defs import common.ged interface = None # The actual interface (the gtk one for the moment) diff -r 4bac6da40720 -r 193081600a08 src/common/gnupg.py --- a/src/common/gnupg.py Thu Jul 14 21:45:39 2016 +0200 +++ b/src/common/gnupg.py Thu Jul 14 21:58:47 2016 +0200 @@ -42,7 +42,6 @@ from cStringIO import StringIO import codecs -import locale import logging import os import re diff -r 4bac6da40720 -r 193081600a08 src/common/jingle_content.py --- a/src/common/jingle_content.py Thu Jul 14 21:45:39 2016 +0200 +++ b/src/common/jingle_content.py Thu Jul 14 21:58:47 2016 +0200 @@ -20,7 +20,6 @@ import os import gajim import nbxmpp -from jingle_transport import JingleTransportIBB from jingle_xtls import SELF_SIGNED_CERTIFICATE from jingle_xtls import load_cert_file diff -r 4bac6da40720 -r 193081600a08 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Jul 14 21:45:39 2016 +0200 +++ b/src/common/jingle_ft.py Thu Jul 14 21:58:47 2016 +0200 @@ -25,14 +25,16 @@ import nbxmpp import configpaths import jingle_xtls +from common.jingle_ftstates import StateCandReceived, JingleTransportSocks5, \ + StateCandSent, StateCandSentAndRecv, StateInitialized, StateTransfering,\ + StateTransportReplace +from common.jingle_transport import TransportType from jingle_content import contents, JingleContent -from jingle_transport import * from common import helpers -from common.socks5 import Socks5ReceiverClient, Socks5SenderClient from common.connection_handlers_events import FileRequestReceivedEvent import threading import logging -from jingle_ftstates import *

1 0

gajim: fix using GPG2. Fixes #8355
by Gajim 14 Jul '16

14 Jul '16

changeset 4bac6da40720 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=4bac6da40720 description: fix using GPG2. Fixes #8355 diffstat: src/common/gnupg.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3a780a9e0da3 -r 4bac6da40720 src/common/gnupg.py --- a/src/common/gnupg.py Thu Jul 07 22:50:36 2016 +0200 +++ b/src/common/gnupg.py Thu Jul 14 21:45:39 2016 +0200 @@ -672,7 +672,7 @@ "GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL", "INV_SGNR", "NO_SGNR", "MISSING_PASSPHRASE", "NEED_PASSPHRASE_PIN", "SC_OP_FAILURE", "SC_OP_SUCCESS", "PROGRESS", - "PINENTRY_LAUNCHED"): + "PINENTRY_LAUNCHED", "KEY_CONSIDERED"): pass elif key in ("KEYEXPIRED", "SIGEXPIRED"): # pragma: no cover self.status = 'key expired'

1 0

gajim-plugins: correct version (some files were missing in the l...
by Gajim Plugins 08 Jul '16

08 Jul '16

changeset 9c59fa2d1609 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=9c59fa2d1609 description: correct version (some files were missing in the last commit diffstat: emoticons_pack/emoticons_pack.zip | Bin emoticons_pack/manifest.ini | 2 +- 2 files changed, 1 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 554c669b536e -r 9c59fa2d1609 emoticons_pack/emoticons_pack.zip Binary file emoticons_pack/emoticons_pack.zip has changed diff -r 554c669b536e -r 9c59fa2d1609 emoticons_pack/manifest.ini --- a/emoticons_pack/manifest.ini Fri Jul 08 16:25:51 2016 +0200 +++ b/emoticons_pack/manifest.ini Fri Jul 08 16:45:41 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Emoticons pack short_name: emoticons_pack -version: 0.1.4 +version: 0.1.5 description: Install, update and view detailed legend of emoticons authors: Denis Fomin <fominde(a)gmail.com> homepage: http://trac-plugins.gajim.org/wiki/

1 0

gajim-plugins: changed plugin version in manifest
by Gajim Plugins 08 Jul '16

08 Jul '16

changeset 554c669b536e in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=554c669b536e description: changed plugin version in manifest diffstat: emoticons_pack/manifest.ini | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8e331ea57267 -r 554c669b536e emoticons_pack/manifest.ini --- a/emoticons_pack/manifest.ini Fri Jul 08 16:25:04 2016 +0200 +++ b/emoticons_pack/manifest.ini Fri Jul 08 16:25:51 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Emoticons pack short_name: emoticons_pack -version: 0.1.3 +version: 0.1.4 description: Install, update and view detailed legend of emoticons authors: Denis Fomin <fominde(a)gmail.com> homepage: http://trac-plugins.gajim.org/wiki/

1 0

gajim-plugins: added noto emoticons pack (thanks Tommaso Sardelli)
by Gajim Plugins 08 Jul '16

08 Jul '16

changeset 8e331ea57267 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=8e331ea57267 description: added noto emoticons pack (thanks Tommaso Sardelli) diffstat: emoticons_pack/contents.ini | 13 +++++++++++++ emoticons_pack/emoticons_pack.zip | Bin 2 files changed, 13 insertions(+), 0 deletions(-) diffs (22 lines): diff -r a450e362488d -r 8e331ea57267 emoticons_pack/contents.ini --- a/emoticons_pack/contents.ini Tue Jul 05 00:04:14 2016 +0200 +++ b/emoticons_pack/contents.ini Fri Jul 08 16:25:04 2016 +0200 @@ -118,3 +118,16 @@ <img src="preview.image"/> </body> homepage: https://trac.gajim.org/wiki/TwemojiResized + +[Noto] +icon: 1f600.png +authors: Google Inc. and other contributors +converter: Tommaso Sardelli <lacapannadelloziotom(a)gmail.com>, Thilo Molitor <thilo(a)eightysoft.de> +description: <body xmlns='http://www.w3.org/1999/xhtml'> + <h1>Noto Emoji for Gajim</h1> + <br/> + <p>The size of this Emojis is 24px in order to fit well with text size.</p> + <br/> + <img src="preview.image"/> + </body> +homepage: https://github.com/googlei18n/noto-emoji diff -r a450e362488d -r 8e331ea57267 emoticons_pack/emoticons_pack.zip Binary file emoticons_pack/emoticons_pack.zip has changed

1 0

gajim: update gnupg from upstream. Fixes #8355
by Gajim 07 Jul '16

07 Jul '16

changeset 3a780a9e0da3 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=3a780a9e0da3 description: update gnupg from upstream. Fixes #8355 diffstat: src/common/gnupg.py | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diffs (49 lines): diff -r 9788d182df8b -r 3a780a9e0da3 src/common/gnupg.py --- a/src/common/gnupg.py Mon Jul 04 21:10:12 2016 +0200 +++ b/src/common/gnupg.py Thu Jul 07 22:50:36 2016 +0200 @@ -151,7 +151,7 @@ if not data: break sent += len(data) - logger.debug("sending chunk (%d): %r", sent, data[:256]) + # logger.debug("sending chunk (%d): %r", sent, data[:256]) try: outstream.write(data) except UnicodeError: # pragma: no cover @@ -245,7 +245,8 @@ "DECRYPTION_OKAY", "INV_SGNR", "FILE_START", "FILE_ERROR", "FILE_DONE", "PKA_TRUST_GOOD", "PKA_TRUST_BAD", "BADMDC", "GOODMDC", "NO_SGNR", "NOTATION_NAME", "NOTATION_DATA", - "PROGRESS", "PINENTRY_LAUNCHED", "NEWSIG"): + "PROGRESS", "PINENTRY_LAUNCHED", "NEWSIG", + "KEY_CONSIDERED"): pass elif key == "BADSIG": # pragma: no cover self.valid = False @@ -618,7 +619,11 @@ For now, just use an existing class to base it on - if needed, we can override handle_status for more specific message handling. """ - pass + def handle_status(self, key, value): + if key in ("EXPORTED", "EXPORT_RES"): + pass + else: + super(ExportResult, self).handle_status(key, value) class DeleteResult(object): "Handle status messages for --delete-key and --delete-secret-key" @@ -744,7 +749,12 @@ self.encoding = 'latin-1' if gnupghome and not os.path.isdir(self.gnupghome): os.makedirs(self.gnupghome,0x1C0) - p = self._open_subprocess(["--version"]) + try: + p = self._open_subprocess(["--version"]) + except OSError: + msg = 'Unable to run gpg - it may not be available.' + logger.exception(msg) + raise OSError(msg) result = self.result_map['verify'](self) # any result will do for this self._collect_output(p, result, stdin=p.stdin) if p.returncode != 0: # pragma: no cover

1 0

gajim: ability to compite the installer for gtk3 version
by Gajim 07 Jul '16

07 Jul '16

changeset 49137edc585e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=49137edc585e description: ability to compite the installer for gtk3 version diffstat: build.bat | 29 +--- gajim.nsi | 275 ++----------------------------------------- launch.bat | 2 +- setup_win32.py | 129 ++++++++++++++++---- src/command_system/tools.py | 2 +- src/common/crypto.py | 4 +- src/common/resolver.py | 3 +- src/features_window.py | 2 - src/gajim-remote.py | 2 +- src/gajim.py | 52 ++----- src/plugins/plugin.py | 2 +- 11 files changed, 151 insertions(+), 351 deletions(-) diffs (truncated from 788 to 300 lines): diff -r 8f80f0e56f0d -r 49137edc585e build.bat --- a/build.bat Thu Jun 16 21:49:09 2016 +0200 +++ b/build.bat Thu Jul 07 22:41:35 2016 +0200 @@ -5,35 +5,20 @@ xcopy ..\gajim-plugins\plugin_installer gajim_built\plugins\plugin_installer /e /i copy msgfmt.exe gajim_built -copy gettextsrc.dll gajim_built -copy gettextlib.dll gajim_built -copy msvcr90.dll gajim_built +copy msvcr100.dll gajim_built cd gajim_built -REM for libglade-2.0.0.dll -PATH=..\src\gtk\bin;%PATH% +for %%l in (po\*.po) do mkdir po\%%~nl & mkdir po\%%~nl\LC_MESSAGES & msgfmt -o po\%%~nl\LC_MESSAGES\gajim.mo %%l -c:\python27\python.exe setup_win32.py build_exe +c:\python34\python.exe setup_win32.py build_exe -move build\exe.win32-2.7 . -rename exe.win32-2.7 bin - -copy ..\LIBEAY32.dll bin -copy ..\SSLEAY32.dll bin +move build\exe.win32-3.4 . +rmdir build +rename exe.win32-3.4 build REM for snarl plugin -xcopy ..\win32com bin\win32com /e /i - -mkdir bin\gtk -cd ../src/gtk -hg archive ..\..\gajim_built\bin\gtk -cd ../../gajim_built/ - -REM for msgfmt -PATH=bin\gtk\bin;%PATH% - -for %%l in (po\*.po) do mkdir po\%%~nl & mkdir po\%%~nl\LC_MESSAGES & msgfmt -o po\%%~nl\LC_MESSAGES\gajim.mo %%l +xcopy ..\win32com build\win32com /e /i "C:\Program Files (x86)\NSIS\makensis" gajim.nsi diff -r 8f80f0e56f0d -r 49137edc585e gajim.nsi --- a/gajim.nsi Thu Jun 16 21:49:09 2016 +0200 +++ b/gajim.nsi Thu Jul 07 22:41:35 2016 +0200 @@ -31,7 +31,7 @@ !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder !insertmacro MUI_PAGE_INSTFILES -!define MUI_FINISHPAGE_RUN "$INSTDIR\bin\Gajim.exe" +!define MUI_FINISHPAGE_RUN "$INSTDIR\build\Gajim.exe" !insertmacro MUI_PAGE_FINISH !insertmacro MUI_UNPAGE_WELCOME @@ -59,7 +59,6 @@ LangString NAME_SecDesktopIcon ${LANG_ENGLISH} "Create icon on desktop" LangString NAME_SecAutostart ${LANG_ENGLISH} "Start Gajim when Windows starts" LangString DESC_SecGajim ${LANG_ENGLISH} "Installs the main Gajim files." -LangString DESC_SecGtk ${LANG_ENGLISH} "Installs Gtk+ 2 (necessary to run Gajim)." LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "If set, a shortcut for Gajim will be created on the desktop." LangString DESC_SecAutostart ${LANG_ENGLISH} "If set, Gajim will be automatically started when Windows starts." LangString STR_Installed ${LANG_ENGLISH} "Apparently, Gajim is already installed. Uninstall it?" @@ -75,7 +74,6 @@ LangString NAME_SecDesktopIcon ${LANG_FRENCH} "Créer une icône sur le bureau" LangString NAME_SecAutostart ${LANG_FRENCH} "Lancer Gajim au démarrage de Windows" LangString DESC_SecGajim ${LANG_FRENCH} "Installer les fichiers principaux de Gajim." -LangString DESC_SecGtk ${LANG_FRENCH} "Installer Gtk+ 2 (nécessaire à Gajim)." LangString DESC_SecDesktopIcon ${LANG_FRENCH} "Si selectionné, un raccourci pour Gajim sera créé sur le bureau." LangString DESC_SecAutostart ${LANG_FRENCH} "Si activé, Gajim sera automatiquement lancé au démarrage de Windows." LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement déjà installé. Lancer la désinstallation ?" @@ -91,7 +89,6 @@ LangString NAME_SecDesktopIcon ${LANG_GERMAN} "Desktop-Icon erstellen" LangString NAME_SecAutostart ${LANG_GERMAN} "Gajim mit Windows starten" LangString DESC_SecGajim ${LANG_GERMAN} "Installiert die Hauptdateien von Gajim." -LangString DESC_SecGtk ${LANG_GERMAN} "Installert Gtk+ 2 (notwendig um Gajim zu benutzen)." LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Wenn dies aktiviert wird, wird ein Icon für Gajim auf dem Desktop erstellt." LangString DESC_SecAutostart ${LANG_GERMAN} "Gajim wird automatisch gestartet, sowie Windows startet, wenn dies aktivier wird." LangString STR_Installed ${LANG_GERMAN} "Gajim is apparently already installed. Uninstall it?" @@ -107,7 +104,6 @@ LangString NAME_SecDesktopIcon ${LANG_ITALIAN} "Crea un'icona sul desktop" LangString NAME_SecAutostart ${LANG_ITALIAN} "Lancia Gajim quando parte Windows" LangString DESC_SecGajim ${LANG_ITALIAN} "Installa i file principali di Gajim." -LangString DESC_SecGtk ${LANG_ITALIAN} "Installa Gtk+ 2 (necessario per eseguire Gajim)." LangString DESC_SecDesktopIcon ${LANG_ITALIAN} "Se selezionato, un'icona verrà creata sul desktop." LangString DESC_SecAutostart ${LANG_ITALIAN} "Se selezionato, Gajim sarà eseguito all'avvio di Windows." LangString STR_Installed ${LANG_ITALIAN} "Gajim is apparently already installed. Uninstall it?" @@ -123,7 +119,6 @@ LangString NAME_SecDesktopIcon ${LANG_RUSSIAN} "Ñîçäàòü ÿðëûê íà ðàáî÷åì ñòîëå" LangString NAME_SecAutostart ${LANG_RUSSIAN} "Çàïóñêàòü Gajim ïðè çàãðóçêå Windows" LangString DESC_SecGajim ${LANG_RUSSIAN} "Óñòàíîâêà îñíîâíûõ ôàéëîâ Gajim." -LangString DESC_SecGtk ${LANG_RUSSIAN} "Óñòàíîâêà Gtk+ 2 (íåîáõîäèìî äëÿ ðàáîòû Gajim)." LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} "Åñëè îòìå÷åíî, íà ðàáî÷åì ñòîëå áóäåò ñîçäàí ÿðëûê Gajim." LangString DESC_SecAutostart ${LANG_RUSSIAN} "Åñëè îòìå÷åíî, Gajim áóäåò àâòîìàòè÷åñêè çàïóñêàòüñÿ ïðè çàãðóçêå Windows." LangString STR_Installed ${LANG_RUSSIAN} "Ïîõîæå, Gajim óæå óñòàíîâëåí. Äåèíñòàëëèðîâàòü óñòàíîâëåííóþ âåðñèþ?" @@ -138,7 +133,6 @@ LangString NAME_SecDesktopIcon ${LANG_HEBREW} "öåø ñîì áùåìçï òáåãä" LangString NAME_SecAutostart ${LANG_HEBREW} "äôòì àú Gajim ëàùø Windows îúçéì" LangString DESC_SecGajim ${LANG_HEBREW} "îú÷éï ÷áöé Gajim òé÷øééí." -LangString DESC_SecGtk ${LANG_HEBREW} "îú÷éï Gtk+ 2 (ðçåöä ìäøöú Gajim)." LangString DESC_SecDesktopIcon ${LANG_HEBREW} "áîéãä åð÷áòú, ÷éöåø ãøê òáåø Gajim éåùí òì ùåìçï äòáåãä." LangString DESC_SecAutostart ${LANG_HEBREW} "áîéãä åð÷áòú, Gajim éåôòì àåèåîèéú ëàùø Windows îúçéì." LangString STR_Installed ${LANG_HEBREW} "ëôé äðøàä, Gajim ëáø îåú÷ï. ìäñéø àåúå?" @@ -153,79 +147,25 @@ File "COPYING" File "THANKS" File "THANKS.artists" - - SetOutPath "$INSTDIR\bin" - File "bin\_bsddb.pyd" - File "bin\_cffi_backend.pyd" - File "bin\_ctypes.pyd" - File "bin\_hashlib.pyd" - File "bin\_socket.pyd" - File "bin\_sqlite3.pyd" - File "bin\_ssl.pyd" - File "bin\atk.pyd" - File "bin\bz2.pyd" - File "bin\cairo._cairo.pyd" - File "bin\Crypto.Cipher._AES.pyd" - File "bin\Crypto.Cipher._DES.pyd" - File "bin\Crypto.Cipher._DES3.pyd" - File "bin\Crypto.Hash._SHA256.pyd" - File "bin\Crypto.Random.OSRNG.winrandom.pyd" - File "bin\Crypto.Util._counter.pyd" - File "bin\Crypto.Util.strxor.pyd" - File "bin\cryptography.hazmat.bindings._constant_time.pyd" - File "bin\cryptography.hazmat.bindings._openssl.pyd" - File "bin\cryptography.hazmat.bindings._padding.pyd" - File "bin\farstream.pyd" - File "bin\gajim.exe" - File "bin\gio._gio.pyd" - File "bin\glib._glib.pyd" - File "bin\gobject._gobject.pyd" - File "bin\goocanvas.pyd" - File "bin\gst._gst.pyd" - File "bin\gst.interfaces.pyd" - File "bin\gtk._gtk.pyd" - File "bin\history_manager.exe" - File "bin\libeay32.dll" - File "bin\libgoocanvas-3.dll" - File "bin\library.zip" - File "bin\libxml2mod.pyd" - File "bin\libxmlmods.libxml2mod.pyd" - File "bin\pangocairo.pyd" - File "bin\pango.pyd" - File "bin\pycurl.pyd" - File "bin\pyexpat.pyd" - File "bin\python27.dll" - File "bin\pythoncom27.dll" - File "bin\pywintypes27.dll" - File "bin\select.pyd" - File "bin\sqlite3.dll" - File "bin\ssleay32.dll" - File "bin\unicodedata.pyd" - File "bin\win32api.pyd" - File "bin\win32file.pyd" - File "bin\win32pipe.pyd" - File "bin\win32ui.pyd" - File "bin\winsound.pyd" - File "msvcr90.dll" - File /r "bin\win32com" + File /r "build" + SetOutPath "$INSTDIR\build" + File "msvcr100.dll" WriteRegStr HKCU "Software\Gajim" "" $INSTDIR 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.16.5" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\build\Gajim.exe" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.4" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" !insertmacro MUI_STARTMENU_WRITE_BEGIN Application SetShellVarContext current CreateDirectory "$SMPROGRAMS\$StartMenuFolder" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Change Theme.lnk" "$INSTDIR\bin\gtk\bin\gtkthemeselector.exe" + CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" "$INSTDIR\build\Gajim.exe" SetShellVarContext all CreateDirectory "$SMPROGRAMS\$StartMenuFolder" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Change Theme.lnk" "$INSTDIR\bin\gtk\bin\gtkthemeselector.exe" + CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" "$INSTDIR\build\Gajim.exe" !insertmacro MUI_STARTMENU_WRITE_END SetOutPath "$INSTDIR\data" @@ -240,15 +180,6 @@ File /r "icons\hicolor" SectionEnd -Section "Gtk+ 2" SecGtk - SectionIn RO - SetOutPath "$INSTDIR\bin\gtk" - File /r "bin\gtk\bin" - File /r "bin\gtk\etc" - File /r "bin\gtk\lib" - File /r "bin\gtk\share" -SectionEnd - Section "Plugins" SecPlugins SetOutPath "$INSTDIR\plugins" File /r "plugins\plugin_installer" @@ -325,43 +256,31 @@ Section "English (UK)" SecLanguagesEnglishUK SetOutPath "$INSTDIR\po" File /r "po\en_GB" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\en_GB" SectionEnd Section "French" SecLanguagesFrench SetOutPath "$INSTDIR\po" File /r "po\fr" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\fr" SectionEnd Section "German" SecLanguagesGerman SetOutPath "$INSTDIR\po" File /r "po\de" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\de" SectionEnd Section "Italian" SecLanguagesItalian SetOutPath "$INSTDIR\po" File /r "po\it" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\it" SectionEnd Section "Spanish" SecLanguagesSpanish SetOutPath "$INSTDIR\po" File /r "po\es" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\es" SectionEnd Section "Russian" SecLanguagesRussian SetOutPath "$INSTDIR\po" File /r "po\ru" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\ru" SectionEnd Section $(NAME_SecLanguagesOther) SecLanguagesOther @@ -391,159 +310,25 @@ File /r "po\sv" File /r "po\uk" File /r "po\zh_CN" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\af" - File /r "bin\gtk\share\locale\am" - File /r "bin\gtk\share\locale\ang" - File /r "bin\gtk\share\locale\ar" - File /r "bin\gtk\share\locale\as" - File /r "bin\gtk\share\locale\az" - File /r "bin\gtk\share\locale\az_IR" - File /r "bin\gtk\share\locale\be" - File /r "bin\gtk\share\locale\be@latin" - File /r "bin\gtk\share\locale\bg" - File /r "bin\gtk\share\locale\bn" - File /r "bin\gtk\share\locale\bn_IN" - File /r "bin\gtk\share\locale\br" - File /r "bin\gtk\share\locale\bs" - File /r "bin\gtk\share\locale\ca" - File /r "bin\gtk\share\locale\ca@valencia" - File /r "bin\gtk\share\locale\cs" - File /r "bin\gtk\share\locale\cy" - File /r "bin\gtk\share\locale\da" - File /r "bin\gtk\share\locale\dz" - File /r "bin\gtk\share\locale\el" - File /r "bin\gtk\share\locale\en_CA" - File /r "bin\gtk\share\locale\eo" - File /r "bin\gtk\share\locale\et" - File /r "bin\gtk\share\locale\eu" - File /r "bin\gtk\share\locale\fa" - File /r "bin\gtk\share\locale\fi" - File /r "bin\gtk\share\locale\ga" - File /r "bin\gtk\share\locale\gl" - File /r "bin\gtk\share\locale\gu" - File /r "bin\gtk\share\locale\he" - File /r "bin\gtk\share\locale\hi" - File /r "bin\gtk\share\locale\hr" - File /r "bin\gtk\share\locale\hu" - File /r "bin\gtk\share\locale\hy" - File /r "bin\gtk\share\locale\ia" - File /r "bin\gtk\share\locale\id" - File /r "bin\gtk\share\locale\io" - File /r "bin\gtk\share\locale\is" - File /r "bin\gtk\share\locale\ja" - File /r "bin\gtk\share\locale\ka" - File /r "bin\gtk\share\locale\kn"

1 0

gajim-plugins: updated manifest file
by Gajim Plugins 05 Jul '16

05 Jul '16

changeset aa7dd59ea9b5 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: gtk3 details:gajim-plugins?cmd=changeset;node=aa7dd59ea9b5 description: updated manifest file diffstat: plugin_installer/manifest.ini | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 0d48834282a9 -r aa7dd59ea9b5 plugin_installer/manifest.ini --- a/plugin_installer/manifest.ini Tue Jul 05 23:44:44 2016 +0200 +++ b/plugin_installer/manifest.ini Tue Jul 05 23:45:57 2016 +0200 @@ -1,9 +1,10 @@ [info] name: Plugin Installer short_name: plugin_installer -version: 0.13.0 +version: 0.13.1 description: Install and upgrade plugins from ftp authors: Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> + Thilo Molitor <thilo(a)eightysoft.de> homepage: http://trac-plugins.gajim.org/wiki/PluginInstallerPlugin min_gajim_version: 0.16.10

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