Commit ddc0bdf1 authored by Martin's avatar Martin

Imported upstream master from 2017-09-16

parent 1a2774c9

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

**Please first check if another issue has been opened for your problem**
## Versions
- OS:
- Gajim version:
- GTK version:
- Python-nbxmpp version:
## Steps to reproduce the problem
1.
1.
1.
## Expected behavior
## Actual behavior
**Please note by far the quickest way to get a new feature is to file a Merge Request.**
## Description of the new feature
CURRENT DEVELOPERS:
Yann Leboulanger (asterix AT lagaule.org)
Philipp Hörist (philipp AT hoerist.com)
PAST DEVELOPERS:
Stefan Bethge (stefan AT lanpartei.de)
Alexander Cherniuk (ts33kr AT gmail.com)
Stephan Erb (steve-e AT h3c.de)
Vincent Hanquez (tab AT snarc.org)
Dimitur Kirov (dkirov AT gmail.com)
Nikos Kouremenos (kourem AT gmail.com)
Julien Pivotto (roidelapluie AT gmail.com)
Jonathan Schleifer (js-gajim AT webkeks.org)
Travis Shirk (travis AT pobox.com)
Brendan Taylor (whateley AT gmail.com)
Jean-Marie Traissard (jim AT lapin.org)
......@@ -5,7 +5,6 @@ ACLOCAL_AMFLAGS = -I m4
bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager scripts/gajim-remote
EXTRA_DIST = \
THANKS.artists \
autogen.sh \
intltool-extract.in \
intltool-merge.in \
......
Anders Ström
Christophe Got
Dennis Craven
Dmitry Korzhevin
Guillaume Morin
Gvorcek Spajreh
Josef Vybíral
Membris Khan
Rederick Asher
Jakub Szypulka
......@@ -3,7 +3,7 @@
CONF_ARGS=""
echo "[encoding: UTF-8]" > po/POTFILES.in \
&& for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
&& for p in `ls gajim/data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
po/POTFILES.in; done \
&& ls -1 data/org.gajim.Gajim.appdata.xml.in data/org.gajim.Gajim.desktop.in.in data/gajim-remote.desktop.in.in \
gajim/*.py gajim/common/*.py gajim/command_system/*.py gajim/command_system/implementation/*.py gajim/common/zeroconf/*.py gajim/plugins/*.py | grep -v ipython_view.py >> \
......
......@@ -54,12 +54,13 @@ AC_SUBST(PACKAGE)
AC_CONFIG_FILES([
Makefile
data/Makefile
data/gui/Makefile
data/emoticons/Makefile
gajim/data/Makefile
gajim/data/gui/Makefile
gajim/data/emoticons/Makefile
data/pixmaps/Makefile
data/iconsets/Makefile
data/moods/Makefile
data/activities/Makefile
gajim/data/iconsets/Makefile
gajim/data/moods/Makefile
gajim/data/activities/Makefile
icons/Makefile
data/org.gajim.Gajim.appdata.xml
data/org.gajim.Gajim.desktop.in
......
SUBDIRS = gui emoticons pixmaps iconsets moods activities
SUBDIRS = pixmaps
@INTLTOOL_DESKTOP_RULE@
appstreamdir = $(datadir)/metainfo/
......@@ -13,25 +13,12 @@ desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
installdefsdir = $(gajim_srcdir)/common
installdefs_DATA = defs.py
soundsdir = $(pkgdatadir)/data/sounds
sounds_DATA = $(srcdir)/sounds/*.wav
styledir = $(pkgdatadir)/data/style
style_DATA = $(srcdir)/style/*.css
otherdir = $(pkgdatadir)/data/other
other_DATA = other/servers.xml other/dh4096.pem
# other/cacert.pem is used only on Windows. On Unix platforms
# use CA certificates installed in /etc/ssl/certs
man_MANS = gajim.1 gajim-remote.1 gajim-history-manager.1
EXTRA_DIST = $(appstream_in_files) \
$(desktop_in_files) \
$(sounds_DATA) \
$(style_DATA) \
$(other_DATA) \
$(man_MANS) \
defs.py.in
......
......@@ -27,7 +27,7 @@ Where to look for logs file
.El
.Sh FILES
.Bl -tag -width Ds
.It $XDG_DATA_DIR/gajim/logs.db
.It $XDG_DATA_HOME/gajim/logs.db
The history database log file used when
.Op Fl c
is not specified.
......
.Dd August 26, 2015
.Dd September 02, 2017
.Dt GAJIM 1 URM
.Os UNIX
.Sh NAME
......@@ -10,8 +10,10 @@
.Nm
.Op Fl q
.Op Fl v
.Op Fl w
.Op Fl l Ar subsystem=level
.Op Fl p Ar name
.Op Fl s
.Op Fl c Ar directory
.Sh DESCRIPTION
.Nm
......@@ -33,8 +35,12 @@ on the XMPP protocol see <https://xmpp.org/about-xmpp/>.
Show help options
.It Fl q Fl Fl quiet
Show only critical errors
.It Fl s Fl Fl separate
Separate profiles completely (even history db and plugins)
.It Fl v Fl Fl verbose
Print xml stanzas and other debug information
.It Fl w Fl Fl warnings
Show all GTK warnings with traceback
.It Fl l Fl Fl loglevel Em subsystem=level Bq , Em subsystem=level Bq Em ...
Configure logging system.
Subsystem can be
......@@ -60,37 +66,34 @@ Where to look for configuration files
.El
.Sh FILES
.Bl -tag -width Ds
.It $XDG_CACHE_DIR/gajim/cache.db
.It $XDG_CACHE_HOME/gajim/cache.db
Cache database file of transports, caps, roster entry, and roster group.
.It $XDG_CACHE_DIR/gajim/avatars/
.It $XDG_CACHE_HOME/gajim/avatars/
Cache directory of avatars.
.It $XDG_CACHE_DIR/gajim/vcards/
.It $XDG_CACHE_HOME/gajim/vcards/
Cache directory of vCards (virtual cards).
.It $XDG_CONFIG_DIR/gajim/
.It $XDG_CONFIG_HOME/gajim/
The config-path used when
.Op Fl c
is not specified.
.It $XDG_DATA_DIR/gajim/certs/
.It $XDG_DATA_HOME/gajim/certs/
Directory where certificates are stored.
.It $XDG_DATA_DIR/gajim/logs.db
.It $XDG_DATA_HOME/gajim/logs.db
The history database log file.
For more information on database logs see <https://trac.gajim.org/wiki/LogsDatabase>.
For more information on database logs see
<https://dev.gajim.org/gajim/gajim/wikis/development/LogsDatabase>.
.El
.Sh AUTHORS
.An -nosplit
.Nm
is written and maintained by
.An Yann Leboulanger ,
.An Yann Leboulanger
and
.An Denis Fomin ,
.An Philipp Hörist ,
with contributions and patches merged from many individuals around the world.
See files
.Pa AUTHORS
and
.Pa THANKS ,
for a complete list.
See the About Dialog for a complete list.
.Sh COPYRIGHT
Copyright (C) 2003-2015 Gajim Team
Copyright (C) 2003-2017 Gajim Team
.Pp
.Nm
is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only.
......@@ -103,7 +106,7 @@ You should have received a copy of the GNU General Public License along with
If not, see <https://www.gnu.org/licenses/>.
.Sh FEEDBACK
You can report bugs or feature requests in our bug tracker at
.Em trac.gajim.org
.Em https://dev.gajim.org/gajim/gajim/issues
or in the
.Em gajim-devel
mailing list; if you want to send us a patch, please do so in our bug tracker.
......@@ -126,9 +129,9 @@ https://lists.gajim.org/cgi-bin/listinfo
.Sh BUGS
Please submit bugs at
.Bd -literal -offset indent
https://trac.gajim.org/
https://trac-plugins.gajim.org/
https://python-nbxmpp.gajim.org/
https://dev.gajim.org/gajim/gajim/issues
https://dev.gajim.org/gajim/gajim-plugins
https://dev.gajim.org/gajim/python-nbxmpp
.Ed
.Sh SEE ALSO
.Xr gajim-remote 1
......
This source diff could not be displayed because it is too large. You can view the blob instead.
SUBDIRS = data
INCLUDES = \
$(PYTHON_INCLUDES)
export MACOSX_DEPLOYMENT_TARGET=10.4
......
This diff is collapsed.
......@@ -25,10 +25,12 @@ from gajim.common.exceptions import GajimGeneralException
from gi.repository import Gtk
import sys
import os
from gajim import config
from gajim import dialogs
from gajim import features_window
from gajim import shortcuts_window
from gajim import accounts_window