...
 
Commits (166)
Gajim 0.12.4 (08 August 2009)
* Don't depend on GTK 2.14
Gajim 0.12.4 (07 August 2009)
* Fix History manager
* Fix file transfer proxy discovering at connection
* Improve filetransfer with IPv6
* Fix zeroconf when receiving badly encoded info
Gajim 0.12.3 (12 June 2009)
* Fix PLAIN authentication (in particular with Gtalk
* fix PEP discovery
Gajim 0.12.2 (07 June 2009)
* Better keepalive / ping behaviour
* Fix custom port handling
* Improve error messages handling
* Totem support for played music
* Fix SSL with some servers
* Handle XFCE notification-daemon
* Restore old behaviour of click on systray: left click to open events
* Network manager 0.7 support
* Move logs file under windows to $APPDATA/gajim
* Improve Kerberos support
* Many bugfixes here and there
* Add -c option to history_manager
Gajim 0.12.1 (21 December 2008)
* Fix filetransfer
* Updated german translation
* Fix click on notifications when text string is empty
* Improve systray popup menu
Gajim 0.12 (17 December 2008)
* Fix text rendering in notifications
* Fix forward unread messages under Windows
* Better sessions support
* Better auto-away support
* Fix banshee support
* Quodlibet support
* Fix GSSAPI authentification
* Fix IPV4 filetransfer on Windows Vista when IPV6 is used too
* Fix caps usage
* Fix end to end encryption autonegotiation
Gajim 0.12-beta1 (11 November 2008)
* SECURITY
......
......@@ -8,7 +8,7 @@ else
OPTIONAL_BIN =
endif
bin_SCRIPTS = scripts/gajim $(OPTIONAL_BIN)
bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager $(OPTIONAL_BIN)
docfilesdir = $(docdir)
......@@ -28,15 +28,15 @@ EXTRA_DIST = \
intltool-update.in \
gajim.nsi \
setup_win32.py \
scripts/gajim.in \
scripts/gajim-remote.in
scripts/gajim.in
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
intltool-update \
scripts/gajim \
scripts/gajim-remote
scripts/gajim-remote \
scripts/gajim-histrory-manager
MAINTAINERCLEANFILES = \
configure \
......
......@@ -31,14 +31,15 @@ Gajim is a GTK+ app that loves GNOME. You can do 'make' so you don't require gno
<li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li>
<li>python-crypto to enable End to end encryption</li>
<li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li>
<li>dnsutils (or whatever package provides the nslookup binary) for SRV support; if you don't know what that is, you don't need it</li>
<li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li>
<li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li>
<li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li>
<li>gnome-python-desktop (for GnomeKeyring support)</li>
<li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li>
<li>D-Bus running to have gajim-remote working</li>
<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim.</li>
<li>python-dbus bindings</li>
<li>python-sexy to have clickable URLs in chat windows</li>
<li>python-kerberos to use GSSAPI authentication. Note: version1.1 or higher is required</li>
</ul>
<p>
......@@ -55,7 +56,7 @@ the xml lib that *comes* with python and not pyxml or whatever.
<li>libxss-dev (for idle detection module; some distributions such as Debian split xscreensaver)</li>
<li>libgtkspell-dev (for the gtkspell module)</li>
<li>libdbus-1-dev (for the remote control module)</li>
<li>intltool</li>
<li>intltool (>= 0.40.1)</li>
</ul>
<p>
......@@ -95,7 +96,7 @@ You will need GNU autotools in order to install Gajim from svn. This includes:
<li>automake &gt;= 1.8 </li>
<li>autoconf &gt;= 2.59 </li>
<li>libtool</li>
<li>intltool-0.35.0 </li>
<li>intltool-0.40.1 </li>
<li>pkgconfig &gt;= 0.19</li>
</ul>
</p>
......
......@@ -5,3 +5,4 @@ Guillaume Morin
Josef Vybíral
Membris Khan
Rederick Asher
Jakub Szypulka
• configure access model when changing it in the combobox
• PEP in status change
Tune use cases:
• on disconnection of an account set Tune to None
Tooltips use cases:
• Show PEP in GC tooltips
......@@ -9,7 +9,7 @@
echo "[encoding: UTF-8]" > po/POTFILES.in \
&& ls -1 data/gajim.desktop.in.in data/glade/*.glade \
src/*py src/common/*py src/common/zeroconf/*.py src/osx/*.py >> \
src/*py src/common/*py src/common/zeroconf/*.py | grep -v ipython_view.py >> \
po/POTFILES.in || exit 1
if test -z `which pkg-config 2>/dev/null`;then
echo "***Error: pkg-config not found***"
......
/* config.h.in. Generated from configure.ac by autoheader. */
/* always defined to indicate that i18n is enabled */
#undef ENABLE_NLS
/* Gettext package */
#undef GETTEXT_PACKAGE
/* Define to 1 if you have the `bind_textdomain_codeset' function. */
#undef HAVE_BIND_TEXTDOMAIN_CODESET
/* Define to 1 if you have the `dcgettext' function. */
#undef HAVE_DCGETTEXT
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define if your <locale.h> file defines LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
/* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H
/* Define to 1 if you have the `X11' library (-lX11). */
#undef HAVE_LIBX11
/* Define to 1 if you have the `Xext' library (-lXext). */
#undef HAVE_LIBXEXT
/* Define to 1 if you have the `Xss' library (-lXss). */
#undef HAVE_LIBXSS
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Name of package */
#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Version number of package */
#undef VERSION
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
AC_INIT([Gajim - A Jabber Instant Messager],
[0.12-beta1],[http://trac.gajim.org/],[gajim])
[0.12.5],[http://trac.gajim.org/],[gajim])
AC_PREREQ([2.59])
AM_INIT_AUTOMAKE([1.8])
AC_CONFIG_HEADER(config.h)
......@@ -207,18 +207,12 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
AC_SUBST([PYTHON_INCLUDES])
AS_AC_EXPAND(DATADIR, "${datadir}")
AS_AC_EXPAND(LIBDIR, ${libdir})
AS_AC_EXPAND(LIBDIR, "${libdir}")
AS_AC_EXPAND(DOCDIR, "${docdir}")
AS_AC_EXPAND(LOCALEDIR, "${localedir}")
AC_SUBST(VERSION)
AC_SUBST(PACKAGE)
AC_SUBST(DATADIR)
AC_SUBST(LIBDIR)
AS_AC_EXPAND(DATADIR, "${DATADIR}")
AC_SUBST(DOCDIR)
AS_AC_EXPAND(DOCDIR, "${DOCDIR}")
AC_CONFIG_FILES([
Makefile
......@@ -237,7 +231,8 @@ AC_CONFIG_FILES([
src/osx/growl/Makefile
src/osx/syncmenu/Makefile
scripts/gajim
scripts/gajim-remote
scripts/gajim-remote:scripts/gajim.in
scripts/gajim-history-manager:scripts/gajim.in
po/Makefile.in
])
AC_OUTPUT
......
......@@ -5,3 +5,5 @@ docdir = "@DOCDIR@"
datadir = "@DATADIR@"
version = "@VERSION@"
localedir = "@LOCALEDIR@"
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -40,6 +40,9 @@
<item jid="aszlig.net" name="">
<active port="5222"/>
</item>
<item jid="blabla.kz" name="">
<active port="5222"/>
</item>
<item jid="bloodyxml.com" name="Hosted by Chote Networks (http://www.chote.com)">
<active port="5222"/>
</item>
......@@ -73,6 +76,9 @@
<item jid="fritalk.org" name="French Jabber Server">
<active port="5222"/>
</item>
<item jid="gnubox.eu" name="">
<active port="5222"/>
</item>
<item jid="here.dk" name="Jabber server in Denmark">
<active port="5222"/>
</item>
......@@ -85,6 +91,9 @@
<item jid="im.flosoft.biz" name="">
<active port="5222"/>
</item>
<item jid="im.toile-libre.org" name="">
<active port="5222"/>
</item>
<item jid="ims.kelkoo.net" name="Server hosted by Kelkoo (France)">
<active port="5222"/>
</item>
......@@ -160,12 +169,18 @@
<item jid="jabber.i-pobox.net" name="Server in Germany">
<active port="5222"/>
</item>
<item jid="jabber.kiev.ua" name="Server in Ukrain (Kiev)">
<active port="5222"/>
</item>
<item jid="jabber.killerbees.org.uk" name="">
<active port="5222"/>
</item>
<item jid="jabber.linux.it" name="Jabber server in Italy">
<active port="5222"/>
</item>
<item jid="jabber.lutix.org" name="">
<active port="5222"/>
</item>
<item jid="jabber.meta.net.nz" name="Jabber server in New Zealand">
<active port="5222"/>
</item>
......@@ -237,6 +252,9 @@
<item jid="jabber.turk-php.com" name="">
<active port="5222"/>
</item>
<item jid="jabber.tuxfamily.org" name="">
<active port="5222"/>
</item>
<item jid="jabber.typhon.net" name="">
<active port="5222"/>
</item>
......
pixmapsdir = $(pkgdatadir)/data/pixmaps
pixmaps_DATA = $(srcdir)/*.png \
gajim.svg \
gajim.ico
pixmapseventsdir = $(pkgdatadir)/data/pixmaps/events
......@@ -12,6 +13,7 @@ EXTRA_DIST = $(pixmaps_DATA) $(pixmapsevents_DATA) $(pixmapsagents_DATA)
gajimpixmapdir = $(datadir)/pixmaps
gajimpixmap_DATA = gajim.png \
gajim_about.png
gajim.svg \
gajim_about.png
MAINTAINERCLEANFILES = Makefile.in
data/pixmaps/gajim.ico

4.19 KB | W: | H:

data/pixmaps/gajim.ico

293 KB | W: | H:

data/pixmaps/gajim.ico
data/pixmaps/gajim.ico
data/pixmaps/gajim.ico
data/pixmaps/gajim.ico
  • 2-up
  • Swipe
  • Onion skin
This diff is collapsed.
gajim (0.12.5-1) unstable; urgency=low
* New upstream release.
-- Yann Leboulanger <asterix@lagaule.org> Sun, 08 Aug 2009 00:06:15 +0100
gajim (0.12.4-1) unstable; urgency=low
* New upstream release.
* Fix history manager. Closes: #539109
* Fix custom host / port usage. Closes: #539267
-- Yann Leboulanger <asterix@lagaule.org> Sun, 07 Aug 2009 18:16:15 +0100
gajim (0.12.3-1) unstable; urgency=low
* New upstream release.
* OS info are now caches. Closes: #509675
* keepalive system has been improved. Closes: #521144
* Recommends python-crypto for encryption. Closes: #513892
* update to 3.8.2 Debian Policy
* update to debhelper V6
* added watch file
-- Yann Leboulanger <asterix@lagaule.org> Sun, 24 Jun 2009 20:46:15 +0100
gajim (0.12.1-1) unstable; urgency=low
* New upstream release.
* Fix coming back from suspend. Closes: #500523
* Fix menuitem shortcut. Closes: #440530
* Warn user when logs database is brocken. Closes: #447889
* Check server certificate using python-openssl. Closes: #450756
* Don't pool to get played music from Banshee. Closes: #472862
* Escape non-ascii password correcly. Closes: #495540
* Fix URL recognition. Closes: #407806
* Suggest python-kerberos for GSSAPI authentication.
* Suggest python-sexy for clickable links in chat banners.
* Recommends python-openssl instead of python-pyopenssl. Package name has
changed.
* Depends on libc6 for gtkspell.so module
* Build Gajim modules against python2.5
-- Yann Leboulanger <asterix@lagaule.org> Wed, 21 Dec 2008 14:40:16 +0100
gajim (0.11.4-1) unstable; urgency=low
* New upstream release.
......
Source: gajim
Section: net
Priority: optional
Maintainer: Yann Le Boulanger <asterix@lagaule.org>
Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-support (>= 0.7.1), python-dev, libgtk2.0-dev, python-gtk2-dev, libgtkspell-dev, gettext (>= 0.17-4), libxss-dev, intltool, imagemagick, python-central (>= 0.5), libdbus-1-dev
Maintainer: Yann Leboulanger <asterix@lagaule.org>
Build-Depends: debhelper (>= 6), cdbs (>= 0.4.43), python-support (>= 0.7.1), python-dev, libgtk2.0-dev, python-gtk2-dev, libgtkspell-dev, gettext (>= 0.17-4), libxss-dev, intltool (>= 0.40.1), imagemagick, python-central (>= 0.5), libdbus-1-dev
Build-Conflicts: python2.3
XS-Python-Version: >= 2.4
Standards-Version: 3.7.3
Standards-Version: 3.8.2
Homepage: http://www.gajim.org
Vcs-Svn: svn://svn.gajim.org/gajim/
Vcs-Browser: http://trac.gajim.org/browser
Vcs-Hg: http://hg.gajim.org/gajim/
Vcs-Browser: http://hg.gajim.org/gajim/file
Package: gajim
Architecture: any
XB-Python-Version: ${python:Versions}
Depends: python (>= 2.4), python-support (>= 0.7.1), python-glade2 (>= 2.8.0), python-gtk2 (>= 2.8.0), python-pysqlite2 | python (>= 2.5), dnsutils
Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-pyopenssl
Suggests: python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnome2-desktop (>= 2.16.0), gnome-keyring
Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-support (>= 0.7.1), python-glade2 (>= 2.8.0), python-gtk2 (>= 2.8.0), dnsutils
Recommends: dbus, python-dbus, notification-daemon, python-gnupginterface, python-openssl, python-crypto
Suggests: python-gnome2, nautilus-sendto, avahi-daemon, python-avahi, network-manager, libgtkspell0, aspell-en, python-gnome2-desktop (>= 2.16.0), gnome-keyring, python-sexy, python-kerberos (>= 1.1), texlive-latex-base, dvipng
Description: Jabber client written in PyGTK
Gajim is a Jabber client. It has a tabbed user interface with normal chats,
group chats, and has many features such as, TLS, GPG, SSL, multiple accounts,
......
This package was debianized by Yann L.B. asterix@lagaule.org on
This package was debianized by Yann Leboulanger asterix@lagaule.org on
Wed, 16 Jun 2005 20:00:00 +0100.
It was downloaded from:
http://www.gajim.org/downloads/gajim-0.11.0.tar.gz
http://www.gajim.org/downloads/gajim-0.12.3.tar.gz
Upstream Authors:
- Yann Le Boulanger <asterix@lagaule.org>
......@@ -10,12 +10,11 @@ Upstream Authors:
- Travis Shirk <travis@pobox.com>
Copyright: (c) 2003-2006 Gajim Team
Copyright: (c) 2003-2009 Gajim Team
This program 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; either version 2, or (at your option)
any later version.
the Free Software Foundation; version 3
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
......@@ -23,7 +22,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Debian system; see the file /usr/share/common-licenses/GPL. If not,
along with Debian system; see the file /usr/share/common-licenses/GPL-3. If not,
write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
.\" 20050901
.TH "Gajim-history-manager" "1" "September 01, 2005" "Gajim dev team" ""
.SH "NAME"
Gajim-history-manager \- Tool to manage gajim logs
.SH "SYNOPSIS"
.B gajim-history-manager [\-c config-path] [\-h]
.SH "DESCRIPTION"
.B Gajim-history-manager
is a tool to manage (do some cleanup) log file of Gajim jabber client.
.PP
.SH "OPTIONS"
.TP
\fB\-c\fR, \fB\-\-config-path\fR path
Path where logs.db is located. ~/.gajim by default.
.TP
\fB\-h\fR, \fB\-\-help\fR
Print this help.
.SH "FEEDBACK"
You can report bugs or feature requests in http://trac.gajim.org or in the mailing list: http://lists.gajim.org/cgi\-bin/listinfo/gajim\-devel. You can also find us in our room gajim@conference.gajim.org
.SH "AUTHORS"
Written by Yann Le Boulanger <asterix@lagaule.org>, Nikos Kouremenos <kourem@gmail.com> and Dimitur Kirov <dkirov@gmail.com>.
data/gajim.1
data/gajim-remote.1
debian/gajim-history-manager.1
......@@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/autotools.mk
PYTHONVER = 2.4
PYTHONVER = 2.5
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr
DEB_MAKE_BUILD_TARGET := all PYTHON=python$(PYTHONVER)
DEB_MAKE_INSTALL_TARGET = install PYTHON=python$(PYTHONVER) DESTDIR=$(DEB_DESTDIR)
......
# Control file for uscan
# Run the "uscan" command to check for upstream updates and more.
# See uscan(1) for format
# Compulsory line, this is a version 3 file
version=3
http://www.gajim.org/downloads/ gajim-(.*)\.tar\.gz
......@@ -146,21 +146,21 @@ Section "Gajim" SecGajim
File "THANKS.artists"
SetOutPath "$INSTDIR\bin"
File "bin\_cairo.pyd"
File "bin\cairo._cairo.pyd"
File "bin\_ctypes.pyd"
File "bin\_gobject.pyd"
File "bin\_gtk.pyd"
File "bin\gobject._gobject.pyd"
File "bin\gtk._gtk.pyd"
File "bin\_hashlib.pyd"
File "bin\_socket.pyd"
File "bin\_sqlite3.pyd"
File "bin\_ssl.pyd"
File "bin\_win32sysloader.pyd"
File "bin\AES.pyd"
File "bin\Crypto.Cipher.AES.pyd"
File "bin\atk.pyd"
File "bin\bz2.pyd"
File "bin\crypto.pyd"
File "bin\OpenSSL.crypto.pyd"
File "bin\gajim.exe"
File "bin\glade.pyd"
File "bin\gtk.glade.pyd"
File "bin\history_manager.exe"
File "bin\libeay32.dll"
File "bin\libglade-2.0-0.dll"
......@@ -172,12 +172,12 @@ Section "Gajim" SecGajim
File "bin\pyexpat.pyd"
File "bin\python25.dll"
File "bin\pywintypes25.dll"
File "bin\rand.pyd"
File "bin\OpenSSL.rand.pyd"
File "bin\select.pyd"
File "bin\SHA256.pyd"
File "bin\Crypto.Hash.SHA256.pyd"
File "bin\sqlite3.dll"
File "bin\ssleay32.dll"
File "bin\SSL.pyd"
File "bin\OpenSSL.SSL.pyd"
File "bin\unicodedata.pyd"
File "bin\w9xpopen.exe"
File "bin\win32api.pyd"
......@@ -189,7 +189,7 @@ Section "Gajim" SecGajim
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.12-beta1"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.12.5"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/"
WriteUninstaller "$INSTDIR\Uninstall.exe"
......@@ -365,20 +365,16 @@ Section $(NAME_SecLanguagesOther) SecLanguagesOther
File /r "po\be"
File /r "po\be@latin"
File /r "po\bg"
File /r "po\br"
File /r "po\cs"
File /r "po\da"
File /r "po\el"
File /r "po\eo"
File /r "po\eu"
File /r "po\gl"
File /r "po\hr"
File /r "po\lt"
File /r "po\nb"
File /r "po\nl"
File /r "po\no"
File /r "po\pl"
File /r "po\pt"
File /r "po\pt_BR"
File /r "po\sk"
File /r "po\sr"
......@@ -656,39 +652,39 @@ Section "Uninstall"
RMDir /r "$INSTDIR\bin\gtk\share\xml"
RMDir "$INSTDIR\bin\gtk\share"
RMDir "$INSTDIR\bin\gtk"
Delete "$INSTDIR\bin\_cairo.pyd"
Delete "$INSTDIR\bin\_ctypes.pyd"
Delete "$INSTDIR\bin\_gobject.pyd"
Delete "$INSTDIR\bin\_gtk.pyd"
Delete "$INSTDIR\bin\_hashlib.pyd"
Delete "$INSTDIR\bin\_socket.pyd"
Delete "$INSTDIR\bin\_sqlite3.pyd"
Delete "$INSTDIR\bin\_sqlite.pyd"
Delete "$INSTDIR\bin\_ssl.pyd"
Delete "$INSTDIR\bin\_win32sysloader.pyd"
Delete "$INSTDIR\bin\AES.pyd"
Delete "$INSTDIR\bin\atk.pyd"
Delete "$INSTDIR\bin\bz2.pyd"
Delete "$INSTDIR\bin\crypto.pyd"
Delete "$INSTDIR\bin\cairo._cairo.pyd"
Delete "$INSTDIR\bin\Crypto.Cipher.AES.pyd"
Delete "$INSTDIR\bin\Crypto.Hash.SHA256.pyd"
Delete "$INSTDIR\bin\gajim.exe"
Delete "$INSTDIR\bin\glade.pyd"
Delete "$INSTDIR\bin\gobject._gobject.pyd"
Delete "$INSTDIR\bin\gtk._gtk.pyd"
Delete "$INSTDIR\bin\gtk.glade.pyd"
Delete "$INSTDIR\bin\history_manager.exe"
Delete "$INSTDIR\bin\libeay32.dll"
Delete "$INSTDIR\bin\libglade-2.0-0.dll"
Delete "$INSTDIR\bin\library.zip"
Delete "$INSTDIR\bin\libxml2.dll"
Delete "$INSTDIR\bin\msvcr71.dll"
Delete "$INSTDIR\bin\OpenSSL.crypto.pyd"
Delete "$INSTDIR\bin\OpenSSL.rand.pyd"
Delete "$INSTDIR\bin\OpenSSL.SSL.pyd"
Delete "$INSTDIR\bin\pangocairo.pyd"
Delete "$INSTDIR\bin\pango.pyd"
Delete "$INSTDIR\bin\pyexpat.pyd"
Delete "$INSTDIR\bin\python25.dll"
Delete "$INSTDIR\bin\pywintypes25.dll"
Delete "$INSTDIR\bin\rand.pyd"
Delete "$INSTDIR\bin\select.pyd"
Delete "$INSTDIR\bin\SHA256.pyd"
Delete "$INSTDIR\bin\sqlite3.dll"
Delete "$INSTDIR\bin\ssleay32.dll"
Delete "$INSTDIR\bin\SSL.pyd"
Delete "$INSTDIR\bin\unicodedata.pyd"
Delete "$INSTDIR\bin\w9xpopen.exe"
Delete "$INSTDIR\bin\win32api.pyd"
......@@ -723,11 +719,9 @@ Section "Uninstall"
RMDir /r "$INSTDIR\po\be"
RMDir /r "$INSTDIR\po\be@latin"
RMDir /r "$INSTDIR\po\bg"
RMDir /r "$INSTDIR\po\br"
RMDir /r "$INSTDIR\po\cs"
RMDir /r "$INSTDIR\po\da"
RMDir /r "$INSTDIR\po\de"
RMDir /r "$INSTDIR\po\el"
RMDir /r "$INSTDIR\po\en_GB"
RMDir /r "$INSTDIR\po\eo"
RMDir /r "$INSTDIR\po\es"
......@@ -738,10 +732,8 @@ Section "Uninstall"
RMDir /r "$INSTDIR\po\it"
RMDir /r "$INSTDIR\po\lt"
RMDir /r "$INSTDIR\po\nb"
RMDir /r "$INSTDIR\po\nl"
RMDir /r "$INSTDIR\po\no"
RMDir /r "$INSTDIR\po\pl"
RMDir /r "$INSTDIR\po\pt"
RMDir /r "$INSTDIR\po\pt_BR"
RMDir /r "$INSTDIR\po\ru"
RMDir /r "$INSTDIR\po\sk"
......
dnl as-ac-expand.m4 0.2.0 -*- autoconf -*-
dnl autostars m4 macro for expanding directories using configure's prefix
dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org>
dnl Copying and distribution of this file, with or without modification,
dnl are permitted in any medium without royalty provided the copyright
dnl notice and this notice are preserved.
dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
dnl
dnl example
dnl example:
dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
......@@ -15,7 +24,7 @@ AC_DEFUN([AS_AC_EXPAND],
dnl if no prefix given, then use /usr/local, the default prefix
if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix
prefix="$ac_default_prefix"
fi
dnl if no exec_prefix given, then use prefix
if test "x$exec_prefix" = "xNONE"; then
......@@ -26,7 +35,7 @@ AC_DEFUN([AS_AC_EXPAND],
dnl loop until it doesn't change anymore
while true; do
new_full_var="`eval echo $full_var`"
if test "x$new_full_var"="x$full_var"; then break; fi
if test "x$new_full_var" = "x$full_var"; then break; fi
full_var=$new_full_var
done
......
# available languages
fr
pt
el
pl
es
ru
......@@ -9,7 +7,6 @@ bg
de
nb
cs
nl
pt_BR
sv
it
......@@ -17,7 +14,6 @@ eu
sk
no
zh_CN
br
eo
hr
en_GB
......
data/gajim.desktop.in
src/eggtrayicon.c
src/ipython_view.py
src/osx/dbus.py
src/osx/growler.py
src/osx/__init__.py
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
#!/bin/sh
## scripts/gajim-remote.in
##
## Copyright (C) 2006 Yann Leboulanger <asterix AT lagaule.org>
## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org>
##
## This file is part of Gajim.
##
## Gajim 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.
##
## Gajim is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
##
if test $(id -u) -eq 0; then
echo "You must not launch gajim-remote as root, it is INSECURE"
exit 1
fi
datadir=@DATADIR@
PYTHON_EXEC=@PYTHON@
cd ${datadir}/gajim/src
export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
exec ${PYTHON_EXEC} -OO gajim-remote.py "$@"
......@@ -21,14 +21,17 @@
## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
##
APP=`basename $0`
if test $(id -u) -eq 0; then
echo "You must not launch Gajim as root, it is INSECURE"
echo "You must not launch $APP as root, it is INSECURE"
exit 1
fi
datadir=@DATADIR@
[ "$APP" = "gajim-history-manager" ] && APP="history_manager"
export datadir=@DATADIR@/gajim
PYTHON_EXEC=@PYTHON@
cd ${datadir}/gajim/src
cd ${datadir}/src
export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
exec ${PYTHON_EXEC} -OO gajim.py $@
exec ${PYTHON_EXEC} -OO $APP.py "$@"
......@@ -35,7 +35,7 @@ from shutil import move, copy, copytree, rmtree
GTK_DIR="/Library/Frameworks/GTK+.framework/Versions/Current"
NAME = 'Gajim'
VERSION = '0.12-beta1'
VERSION = '0.12.1'
DESCRIPTION = 'A full featured Jabber client'
AUTHOR = 'Gajim Development Team'
URL = 'http://www.gajim.org/'
......
......@@ -25,15 +25,34 @@ import glob
import sys
import os
docutils_files = []
def fill_docutils_files(folder, base=u'docutils'):
docutils_files.append((base, glob.glob(os.path.join(folder, base, '*.pyc'))))
for path in os.listdir(os.path.join(folder, base)):
if os.path.isdir(os.path.join(folder, base, path)):
fill_docutils_files(folder, base=os.path.join(base, path))
try:
import docutils.readers
import docutils.writers.html4css1
import docutils.languages
except ImportError:
pass
else:
fill_docutils_files(os.path.join(sys.prefix, 'Lib', 'site-packages'))
docutils_files.append((os.path.join('docutils', 'writers', 'html4css1'),
glob.glob(os.path.join(sys.prefix, 'Lib', 'site-packages', 'docutils',
'writers', 'html4css1', '*.css'))))
sys.path.append('src')
# Use local gtk folder instead of the one in PATH that is not latest gtk
if 'gtk' in os.listdir('.'):
sys.path.append('gtk/bin')
includes = ['encodings', 'encodings.utf-8',]
opts = {
'py2exe': {
'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*,docutils.readers.*,docutils.writers.html4css1',
# ConfigParser,UserString,roman are needed for docutils
'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*,ConfigParser,UserString',
'dll_excludes': [
'iconv.dll','intl.dll','libatk-1.0-0.dll',
'libgdk_pixbuf-2.0-0.dll','libgdk-win32-2.0-0.dll',
......@@ -43,24 +62,16 @@ opts = {
'libpangowin32-1.0-0.dll','libcairo-2.dll',
'libpangocairo-1.0-0.dll','libpangoft2-1.0-0.dll',
],
'excludes': [
'docutils'
],
}
}
try:
import docutils.readers
except ImportError:
opts['py2exe']['includes'] = \
opts['py2exe']['includes'].replace(',docutils.readers.*', '')
try:
import docutils.writers.html4css1
except ImportError:
opts['py2exe']['includes'] = \
opts['py2exe']['includes'].replace(',docutils.writers.html4css1', '')
setup(
name = 'Gajim',
version = '0.12-beta1',
version = '0.12.5',
description = 'A full featured Jabber client',
author = 'Gajim Development Team',
url = 'http://www.gajim.org/',
......@@ -73,9 +84,8 @@ setup(
'icon_resources': [(1, 'data/pixmaps/gajim.ico')]}],
options=opts,
data_files=[('.', glob.glob('src/gtkgui.glade')),
('.', glob.glob('src/history_manager.glade')),
],
data_files=docutils_files,
)
# vim: se ts=3:
......@@ -8,7 +8,7 @@ export MACOSX_DEPLOYMENT_TARGET=10.4
if BUILD_GTKSPELL
gtkspelllib_LTLIBRARIES = gtkspell.la
gtkspelllibdir = $(libdir)/gajim
gtkspelllibdir = $(pkglibdir)
gtkspell_la_LIBADD = \
$(GTKSPELL_LIBS) $(PYGTK_LIBS)
......@@ -23,7 +23,7 @@ gtkspell_la_CFLAGS = $(GTKSPELL_CFLAGS) $(PYGTK_CFLAGS)
endif
if BUILD_TRAYICON
trayiconlib_LTLIBRARIES = trayicon.la
trayiconlibdir = $(libdir)/gajim
trayiconlibdir = $(pkglibdir)
trayicon_la_LIBADD = $(PYGTK_LIBS)
trayicon_la_SOURCES = \
eggtrayicon.c \
......
......@@ -44,7 +44,7 @@ class CommandWindow:
TODO: gtk 2.10 has a special wizard-widget, consider using it...'''
def __init__(self, account, jid):
def __init__(self, account, jid, commandnode=None):
'''Create new window.'''
# an account object
......@@ -55,7 +55,7 @@ class CommandWindow:
self.commandlist=None # a list of (commandname, commanddescription)
# command's data
self.commandnode = None
self.commandnode = commandnode
self.sessionid = None
self.dataform = None
self.allow_stage3_close = False
......@@ -78,8 +78,12 @@ class CommandWindow:
self.data_form_widget.show()
self.sending_form_stage_vbox.pack_start(self.data_form_widget)
# setting initial stage
self.stage1()
if self.commandnode:
# Execute command
self.stage3()
else:
# setting initial stage
self.stage1()
# displaying the window
self.xml.signal_autoconnect(self)
......
......@@ -267,9 +267,19 @@ class AdvancedConfigurationWindow(object):
self.model.append(parent, [name, value, type_])
def visible_func(self, model, treeiter):
search_string = self.entry.get_text()
return any(search_string in model[it][C_PREFNAME] for it in
tree_model_pre_order(model, treeiter) if model[it][C_TYPE] != '')
search_string = self.entry.get_text().decode('utf-8').lower()
for it in tree_model_pre_order(model,treeiter):
if model[it][C_TYPE] != '':
opt_path = self.get_option_path(model, it)
if len(opt_path) == 3:
desc = gajim.config.get_desc_per(opt_path[2], opt_path[1],
opt_path[0])
elif len(opt_path) == 1:
desc = gajim.config.get_desc(opt_path[0])
if search_string in model[it][C_PREFNAME] or (desc and \
search_string in desc.lower()):
return True
return False
@rate_limit(3)
def on_advanced_entry_changed(self, widget):
......
......@@ -42,6 +42,10 @@ class AtomWindow:
else:
cls.window.updateCounter()
@classmethod
def windowClosed(cls):
cls.window = None
def __init__(self):
''' Create new window... only if we have anything to show. '''
assert len(self.__class__.entries)>0
......@@ -113,6 +117,7 @@ class AtomWindow:
def on_close_button_clicked(self, widget):
self.window.destroy()
self.windowClosed()
def on_next_button_clicked(self, widget):
self.displayNextEntry()
......
This diff is collapsed.
......@@ -35,11 +35,15 @@ if gajim.HAVE_GPG:
GnuPGInterface.GnuPG.__init__(self)
self.use_agent = use_agent
self._setup_my_options()
self.always_trust = False
def _setup_my_options(self):
self.options.armor = 1
self.options.meta_interactive = 0
self.options.extra_args.append('--no-secmem-warning')
# disable photo viewer when verifying keys
self.options.extra_args.append('--verify-options')
self.options.extra_args.append('no-show-photo')
if self.use_agent:
self.options.extra_args.append('--use-agent')
......@@ -68,10 +72,13 @@ if gajim.HAVE_GPG:
resp[ keyword ] = ""
return resp
def encrypt(self, str_, recipients):
def encrypt(self, str_, recipients, always_trust=False):
self.options.recipients = recipients # a list!
proc = self.run(['--encrypt'], create_fhs=['stdin', 'stdout', 'status',
opt = ['--encrypt']
if always_trust or self.always_trust:
opt.append('--always-trust')
proc = self.run(opt, create_fhs=['stdin', 'stdout', 'status',
'stderr'])
proc.handles['stdin'].write(str_)
try:
......@@ -97,11 +104,14 @@ if gajim.HAVE_GPG:
try: proc.wait()
except IOError: pass
if 'INV_RECP' in resp and resp['INV_RECP'].split()[0] == '10':
# unusable recipient "Key not trusted"
return '', 'NOT_TRUSTED'
if 'BEGIN_ENCRYPTION' in resp and 'END_ENCRYPTION' in resp:
# Encryption succeeded, even if there is output on stderr. Maybe
# verbose is on
error = ''
return self._stripHeaderFooter(output), error
return self._stripHeaderFooter(output), helpers.decode_string(error)
def decrypt(self, str_, keyID):
proc = self.run(['--decrypt', '-q', '-u %s'%keyID], create_fhs=['stdin', 'stdout'])
......@@ -142,6 +152,8 @@ if gajim.HAVE_GPG:
except IOError: pass
if 'GOOD_PASSPHRASE' in resp or 'SIG_CREATED' in resp:
return self._stripHeaderFooter(output)
if 'KEYEXPIRED' in resp:
return 'KEYEXPIRED'
return 'BAD_PASSPHRASE'
def verify(self, str_, sign):
......@@ -182,6 +194,9 @@ if gajim.HAVE_GPG:
output = proc.handles['stdout'].read()
proc.handles['stdout'].close()
try: proc.wait()
except IOError: pass
keys = {}
lines = output.split('\n')
for line in lines:
......@@ -224,4 +239,4 @@ if gajim.HAVE_GPG:
out = out + "-----END PGP %s-----\n" % type_
return out
# vim: se ts=3:
# vim: set ts=3:
......@@ -64,7 +64,7 @@ class Entry(xmpp.Node, object):
xmpp.Node.__init__(self, 'entry', node=node)
def __repr__(self):
return '<Atom:Entry object of id="%r">' % self.id
return '<Atom:Entry object of id="%r">' % self.getAttr('id')
class OldEntry(xmpp.Node, object):
''' Parser for feeds from pubsub.com. They use old Atom 0.3 format with
......@@ -74,7 +74,7 @@ class OldEntry(xmpp.Node, object):
xmpp.Node.__init__(self, 'entry', node=node)
def __repr__(self):
return '<Atom0.3:Entry object of id="%r">' % self.id
return '<Atom0.3:Entry object of id="%r">' % self.getAttr('id')
def get_feed_title(self):
''' Returns title of feed, where the entry was created. The result is the feed name
......
......@@ -208,10 +208,14 @@ class CapsCache(object):
# likely implement a fallback to disco (could be disabled
# for mobile users who pay for traffic)
if contact.caps_hash_method == 'old':
features = self[(contact.caps_hash_method, contact.caps_node + '#' + \
contact.caps_hash)].features
if not contact.caps_node or not contact.caps_hash:
features = []
else:
features = self[('old', contact.caps_node + '#' + \
contact.caps_hash)].features
else:
features = self[(contact.caps_hash_method, contact.caps_hash)].features
features = self[(contact.caps_hash_method, contact.caps_hash)].\
features
if feature in features or features == []:
return True
......@@ -229,7 +233,11 @@ class ConnectionCaps(object):
# for disco... so that disco will learn how to interpret
# these caps
pm_ctrl = None
jid = helpers.get_full_jid_from_iq(presence)
try:
jid = helpers.get_full_jid_from_iq(presence)
except:
# Bad jid
return
contact = gajim.contacts.get_contact_from_full_jid(self.name, jid)
if contact is None:
room_jid, nick = gajim.get_room_and_nick_from_fjid(jid)
......@@ -281,8 +289,6 @@ class ConnectionCaps(object):
return
if not contact.caps_node:
return # we didn't asked for that?
if contact.caps_hash_method != 'old':
return
if contact.caps_hash_method != 'old':
computed_hash = helpers.compute_caps_hash(identities, features,
dataforms=dataforms, hash_method=contact.caps_hash_method)
......
......@@ -80,7 +80,6 @@ class Config:
'notify_on_new_message': [ opt_bool, True ],
'autopopupaway': [ opt_bool, False ],
'use_notif_daemon': [ opt_bool, True , _('Use D-Bus and Notification-Daemon to show notifications') ],
'ignore_unknown_contacts': [ opt_bool, False ],
'showoffline': [ opt_bool, False ],
'show_transports_group': [ opt_bool, True ],
'autoaway': [ opt_bool, True ],
......@@ -136,6 +135,7 @@ class Config:
'gc-hpaned-position': [opt_int, 430],
'gc_refer_to_nick_char': [opt_str, ',', _('Character to add after nickname when using nick completion (tab) in group chat.')],
'gc_proposed_nick_char': [opt_str, '_', _('Character to propose to add after desired nickname when desired nickname is used by someone else in group chat.')],
'msgwin-max-state': [opt_bool, False],
'msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide
'msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide
'msgwin-width': [opt_int, 500],
......@@ -161,7 +161,6 @@ class Config:
'time_stamp': [ opt_str, '[%X] ', _('This option let you customize timestamp that is printed in conversation. For exemple "[%H:%M] " will show "[hour:minute] ". See python doc on strftime for full documentation: http://docs.python.org/lib/module-time.html') ],
'before_nickname': [ opt_str, '', _('Characters that are printed before the nickname in conversations') ],
'after_nickname': [ opt_str, ':', _('Characters that are printed after the nickname in conversations') ],
'send_os_info': [ opt_bool, True ],
'notify_on_new_gmail_email': [ opt_bool, True ],
'notify_on_new_gmail_email_extra': [ opt_bool, False ],
'use_gpg_agent': [ opt_bool, False ],
......@@ -200,7 +199,6 @@ class Config:
'tabs_always_visible': [opt_bool, False, _('Show tab when only one conversation?')],
'tabs_border': [opt_bool, False, _('Show tabbed notebook border in chat windows?')],
'tabs_close_button': [opt_bool, True, _('Show close button in tab?')],
'log_encrypted_sessions': [opt_bool, True, _('When negotiating an encrypted session, should Gajim assume you want your messages to be logged?')],
'esession_modp': [opt_str, '5,14', _('A list of modp groups to use in a Diffie-Hellman, highest preference first, separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher numbers are more secure, but take longer to calculate when you start a session.')],
'chat_avatar_width': [opt_int, 52],
'chat_avatar_height': [opt_int, 52],
......@@ -306,11 +304,13 @@ class Config:
'no_log_for': [ opt_str, '' ],
'minimized_gc': [ opt_str, '' ],
'attached_gpg_keys': [ opt_str, '' ],
'keep_alives_enabled': [ opt_bool, True],
'keep_alives_enabled': [ opt_bool, True, _('Whitespace sent after inactivity')],
'ping_alives_enabled': [ opt_bool, True, _('XMPP ping sent after inactivity')],
# send keepalive every N seconds of inactivity