Yann Leboulanger pushed to branch master at gajim / gajim
Commits:
9e771add by Yann Leboulanger at 2017-12-15T23:07:47+01:00
re-add usefull file
- - - - -
1 changed file:
- + MANIFEST.in
Changes:
=====================================
MANIFEST.in
=====================================
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,5 @@
+include COPYING
+recursive-include po *.po
+recursive-include data *.1 *.in
+recursive-include test *.py
+recursive-exclude * *.pyc
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9e771add7e8604ce5bcbbdbf5e65b498f5…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9e771add7e8604ce5bcbbdbf5e65b498f5…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
a344a941 by Philipp Hörist at 2017-12-15T23:00:15+01:00
Fix chatstate flood
The new Placeholder text inside MessageTextView was causing many
buffer changed events.
- Add a method that lets us know if there is user input
- Add logging
- - - - -
3 changed files:
- gajim/chat_control.py
- gajim/chat_control_base.py
- gajim/message_textview.py
Changes:
=====================================
gajim/chat_control.py
=====================================
--- a/gajim/chat_control.py
+++ b/gajim/chat_control.py
@@ -1116,12 +1116,14 @@ class ChatControl(ChatControlBase):
# if wel're inactive prevent composing (XEP violation)
if contact.our_chatstate == 'inactive' and state == 'composing':
# go active before
+ app.log('chatstates').info('%-10s - %s', 'active', self.contact.jid)
app.nec.push_outgoing_event(MessageOutgoingEvent(None,
account=self.account, jid=self.contact.jid, chatstate='active',
control=self))
contact.our_chatstate = 'active'
self.reset_kbd_mouse_timeout_vars()
+ app.log('chatstates').info('%-10s - %s', state, self.contact.jid)
app.nec.push_outgoing_event(MessageOutgoingEvent(None,
account=self.account, jid=self.contact.jid, chatstate=state,
control=self))
=====================================
gajim/chat_control_base.py
=====================================
--- a/gajim/chat_control_base.py
+++ b/gajim/chat_control_base.py
@@ -797,18 +797,16 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
self.possible_paused_timeout_id = None
return False # stop looping
- message_buffer = self.msg_textview.get_buffer()
- if (self.kbd_activity_in_last_5_secs and
- message_buffer.get_char_count()):
- # Only composing if the keyboard activity was in text entry
- self.send_chatstate('composing', self.contact)
- elif (self.mouse_over_in_last_5_secs and
- current_state == 'inactive' and
- jid == self.parent_win.get_active_jid()):
- self.send_chatstate('active', self.contact)
- else:
- if current_state == 'composing':
- self.send_chatstate('paused', self.contact) # pause composing
+ if current_state == 'composing':
+ if not self.kbd_activity_in_last_5_secs:
+ if self.msg_textview.has_text():
+ self.send_chatstate('paused', self.contact)
+ else:
+ self.send_chatstate('active', self.contact)
+ elif current_state == 'inactive':
+ if (self.mouse_over_in_last_5_secs and
+ jid == self.parent_win.get_active_jid()):
+ self.send_chatstate('active', self.contact)
# assume no activity and let the motion-notify or 'insert-text' make them
# True refresh 30 seconds vars too or else it's 30 - 5 = 25 seconds!
@@ -870,10 +868,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
def _on_message_tv_buffer_changed(self, textbuffer):
self.kbd_activity_in_last_5_secs = True
self.kbd_activity_in_last_30_secs = True
- if textbuffer.get_char_count():
- self.send_chatstate('composing', self.contact)
- else:
- self.send_chatstate('active', self.contact)
+ if not self.msg_textview.has_text():
+ return
+ self.send_chatstate('composing', self.contact)
def save_message(self, message, msg_type):
# save the message, so user can scroll though the list with key up/down
@@ -1146,8 +1143,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
self.redraw_after_event_removed(jid)
# send chatstate inactive to the one we're leaving
# and active to the one we visit
- message_buffer = self.msg_textview.get_buffer()
- if message_buffer.get_char_count():
+ if self.msg_textview.has_text():
self.send_chatstate('paused', self.contact)
else:
self.send_chatstate('active', self.contact)
=====================================
gajim/message_textview.py
=====================================
--- a/gajim/message_textview.py
+++ b/gajim/message_textview.py
@@ -100,10 +100,16 @@ class MessageTextView(Gtk.TextView):
buf = self.get_buffer()
start, end = buf.get_bounds()
text = buf.get_text(start, end, True)
- return text != self.PLACEHOLDER
+ return text != self.PLACEHOLDER and text != ''
+
+ def is_placeholder(self):
+ buf = self.get_buffer()
+ start, end = buf.get_bounds()
+ text = buf.get_text(start, end, True)
+ return text == self.PLACEHOLDER
def _on_focus_in(self, *args):
- if not self.has_text():
+ if self.is_placeholder():
self.get_buffer().set_text('')
self.toggle_speller(True)
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a344a941026852fc64921a4414e5db775f…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a344a941026852fc64921a4414e5db775f…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
1455db75 by Philipp Hörist at 2017-12-15T22:34:44+01:00
Remove unused files
- - - - -
3 changed files:
- − INSTALL
- − MANIFEST.in
- − NEWS
Changes:
=====================================
INSTALL deleted
=====================================
--- a/INSTALL
+++ /dev/null
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
-
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
=====================================
MANIFEST.in deleted
=====================================
--- a/MANIFEST.in
+++ /dev/null
@@ -1,5 +0,0 @@
-include COPYING
-recursive-include po *.po
-recursive-include data *.1 *.in
-recursive-include test *.py
-recursive-exclude * *.pyc
=====================================
NEWS deleted
=====================================
--- a/NEWS
+++ /dev/null
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1455db75222966e2a09e6801f3017dee3e…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1455db75222966e2a09e6801f3017dee3e…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
84317053 by Philipp Hörist at 2017-12-15T22:23:00+01:00
Update Changelog
- - - - -
1 changed file:
- ChangeLog
Changes:
=====================================
ChangeLog
=====================================
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,59 @@
-Gajim 0.16.6 ( September 2016)
+Gajim 0.98.1 (15 December 2017)
+
+ * Ported to GTK3 / Python3
+ * Flatpak support
+ * Lots of refactoring
+ * New Emoji support
+ * New Chat Window design
+ * New StartChat Window (Ctrl+N)
+ * New ServerInfo Window
+ * AccountWindow Redesign
+ * Moved some encryption code out into Plugins (see PGP Plugin, Esessions Plugin)
+ * OTR Plugin was not ported, use OMEMO
+ * Added mam:1 and mam:2 support (mam:0 was removed)
+ * Added MAM for MUCs support
+ * Added support for showing XEP-0084 Avatars
+ * Added xmpp URI handling directly in Gajim
+ * Removed Gajim-Remote
+ * Removed XEP-0012 (Last Activity)
+ * Removed XEP-0136 (Message Archiving)
+ * Added XEP-0156 (Discovering Alternative XMPP Connection Methods)
+ * Added XEP-0319 (Last User Interaction in Presence)
+ * Added XEP-0380 (Explicit Message Encryption)
+ * Added Jingle FT:5 support
+
+Gajim 0.16.9 (30 November 2017)
+
+ * Improve Zeroconf behavior
+ * Fix showing normal message event
+ * remove usage of OpenSSL.rand
+ * a few minor bugfixes
+
+Gajim 0.16.8 (04 June 2017)
+
+ * Fix rejoining MUCs after connection loss
+ * Fix Groupchat invites
+ * Fix encoding problems with newer GnuPG versions
+ * Fix old messages randomly reappearing in the chat window
+ * Fix some problems with IBB filetransfer
+ * Make XEP-0146 Commands opt-in
+ * Improve sending messages to your own resources
+ * Improve reliability of delivery recipes
+ * Many minor bugfixes
+
+Gajim 0.16.7 (30 January 2017)
+
+ * Better compatibility with XEP-0191: Blocking Command
+ * Windows Credential Vault is used for password storage on Windows
+ * Gajim now depends on python-gnupg for PGP encryption
+ * Add portable installer for Windows
+ * Remove usage of demandimport
+ * Many minor bugfixes
+
+Gajim 0.16.6 (02 October 2016)
* Fix using gpg2
- * Improve message receips usage
+ * Improve message receipts usage
* Improve roster filtering
* several minor bugs
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/84317053ddf925edff30698a00d5241380…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/84317053ddf925edff30698a00d5241380…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
0707f1a2 by Emmanuel Gil Peyrot at 2017-12-15T02:40:53+01:00
Fix xmpp: URI handling.
It was previously removing the first three characters of the JID, and
ignored any URI without an action.
- - - - -
df762976 by Philipp Hörist at 2017-12-15T21:22:00+01:00
Merge branch 'fix-uri-handling' into 'master'
Fix xmpp: URI handling.
See merge request gajim/gajim!170
- - - - -
1 changed file:
- gajim/gajim.py
Changes:
=====================================
gajim/gajim.py
=====================================
--- a/gajim/gajim.py
+++ b/gajim/gajim.py
@@ -239,13 +239,15 @@ class GajimApplication(Gtk.Application):
for arg in file:
uri = arg.get_uri()
app.log('uri_handler').info('open %s', uri)
- # remove xmpp:///
- uri = uri[8:]
+ if not uri.startswith('xmpp:'):
+ continue
+ # remove xmpp:
+ uri = uri[5:]
try:
jid, cmd = uri.split('?')
except ValueError:
- # Invalid URI
- return
+ # No query argument
+ jid, cmd = uri, 'message'
if cmd == 'join':
self.interface.join_gc_minimal(None, jid)
elif cmd == 'roster':
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d858ff5171724af4bae68e725d6b293b6…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d858ff5171724af4bae68e725d6b293b6…
You're receiving this email because of your account on dev.gajim.org.
Yann Leboulanger pushed to branch master at gajim / gajim
Commits:
d8bba454 by Emmanuel Gil Peyrot at 2017-12-15T02:34:45+01:00
Fix Gajim’s .desktop file to pass the URI to the program.
- - - - -
1959b486 by Emmanuel Gil Peyrot at 2017-12-15T02:34:45+01:00
Remove gajim-remote.desktop, its URI handling is now done in Gajim itself.
- - - - -
d858ff51 by Yann Leboulanger at 2017-12-15T08:29:37+01:00
Merge branch 'remove-gajim-remote-desktop' into 'master'
Remove gajim-remote.desktop and fix gajim.desktop
See merge request gajim/gajim!169
- - - - -
3 changed files:
- − data/gajim-remote.desktop.in
- data/org.gajim.Gajim.desktop.in
- setup.py
Changes:
=====================================
data/gajim-remote.desktop.in deleted
=====================================
--- a/data/gajim-remote.desktop.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly;
-Name=Open URI using Gajim
-# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-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
-NoDisplay=true
=====================================
data/org.gajim.Gajim.desktop.in
=====================================
--- a/data/org.gajim.Gajim.desktop.in
+++ b/data/org.gajim.Gajim.desktop.in
@@ -6,7 +6,7 @@ Comment=A GTK+ Jabber client
# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
Keywords=chat;messaging;im;xmpp;bonjour;voip;
Version=1.0
-Exec=gajim
+Exec=gajim %u
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=org.gajim.Gajim
StartupNotify=true
=====================================
setup.py
=====================================
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,6 @@ def update_trans():
template = os.path.join('po', 'gajim.pot')
files = [os.path.join(root, f) for root, d, files in os.walk('gajim') for f in files if os.path.isfile(
os.path.join(root, f)) and (f.endswith('.py') or f.endswith('.ui'))]
- files.append(os.path.join("data", "gajim-remote.desktop.in"))
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 -o %s %s' % (
@@ -116,7 +115,6 @@ def build_intl(build_cmd):
base = build_dir
merge_files = (('data/org.gajim.Gajim.desktop', 'share/applications', '--desktop'),
- ('data/gajim-remote.desktop', 'share/applications', '--desktop'),
('data/org.gajim.Gajim.appdata.xml', 'share/metainfo', '--xml'))
for filename, target, option in merge_files:
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4009625e02c08e1adfb66557648a2cbf7…
---
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4009625e02c08e1adfb66557648a2cbf7…
You're receiving this email because of your account on dev.gajim.org.