Commit b47248f0 authored by Yann Leboulanger's avatar Yann Leboulanger
Browse files

merge from trunk

parents ac0e0448 21ae2860
Gajim 0.14 (XX)
Gajim 0.14.1 (26 October 2010)
* Fix changing account name
* Fix sending XHTML
* Fix GnomeKayring usage
* Fix some GPG bugs
* Minor bugfixes
Gajim 0.14 (02 September 2010)
* Jingle audio / video chat
* Improve Startup time
......
......@@ -16,11 +16,8 @@ <h2>Runtime Requirements</h2>
<ul>
<li>python2.5 or higher</li>
<li>pygtk2.16 or higher</li>
<li>pysqlite2 (if you have python 2.5, you already have this)</li>
</ul>
<p><strong>Note to packagers</strong> Gajim is a GTK+ app that loves GNOME. You can do 'make' so you don't require gnomepythonextras (aka gnome-python-desktop) which is gnome dep, but you will miss gnomekeyring integration.</p>
<h2>Optional Runtime Requirements</h2>
<ul>
<li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) (>=0.9) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li>
......@@ -29,7 +26,8 @@ <h2>Optional Runtime Requirements</h2>
<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</li>
<li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li>
<li>gnome-python-desktop (for GnomeKeyring support)</li>
<li>gnome-python-desktop (for GnomeKeyring support as password storage)</li>
<li>kwalletcli (for support of KDE Wallet as password storage)</li>
<li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li>
<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li>
<li>python-dbus bindings (>=0.81)</li>
......@@ -40,8 +38,6 @@ <h2>Optional Runtime Requirements</h2>
<h2>Compile-time Requirements</h2>
<ul>
<li>python-dev</li>
<li>python-gtk2-dev</li>
<li>intltool (>= 0.40.1)</li>
</ul>
......@@ -52,15 +48,10 @@ <h2>Installation Procedure</h2>
<li>tar jxvf gajim-version.tar.bz2</li>
<li>cd gajim</li>
<li>./configure</li>
<li>make (builds all modules)</li>
<li>make (builds translations)</li>
<li>su -c make install</li>
</ol>
<p>To specify what modules to build do:</p>
<pre>
make help
</pre>
<p>To specify where to install do:</p>
<pre>
./configure --prefix=custom_path
......@@ -68,7 +59,7 @@ <h2>Installation Procedure</h2>
<h2>Running Gajim</h2>
<p>Just do <em>gajim</em> or you can run Gajim from your GNOME/Xfce/KDE/whatever menus.<br/><br/>
or if you didn't 'make install' you can also run from gajim folder with<em>./launch.sh</em></p>
or if you use hg version and you didn't 'make install' you can also run from gajim folder with<em>./launch.sh</em></p>
<hr />
<h3>Note for hg users</h3>
<p>You will need GNU autotools in order to install Gajim from svn. This includes:</p>
......@@ -120,7 +111,7 @@ <h3>FAQ/Wiki</h3>
<br/>
<br/>
<br/>
(C) 2003-2010<br/>
(C) 2003-2011<br/>
The Gajim Team<br/>
http://gajim.org<br/>
<br/>
......
#!/usr/bin/env bash
gajimversion="0.13.90.1"
gajimversion="0.14.0.1"
if [ -d ".hg" ]; then
node=$(hg tip --template "{node}")
hgversion="-${node:0:12}"
......@@ -8,7 +8,7 @@
fi
echo "define([AC_PACKAGE_VERSION], [${gajimversion}${hgversion}])" > m4/hgversion.m4
AM_ARGS="--add-missing --gnu --copy"
AM_ARGS="--add-missing --gnu --copy -Wno-portability"
CONF_ARGS=""
if test x`uname -s 2>/dev/null` = 'xDarwin' -a -f /Library/Frameworks/GTK+.framework/Versions/Current/env; then
. /Library/Frameworks/GTK+.framework/Versions/Current/env
......@@ -20,7 +20,7 @@
&& for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
po/POTFILES.in; done \
&& ls -1 data/gajim.desktop.in.in \
src/*py src/common/*py src/common/zeroconf/*.py | grep -v ipython_view.py >> \
src/*py src/common/*py src/common/zeroconf/*.py src/plugins/*.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***"
......@@ -36,6 +36,6 @@
&& aclocal -I ./m4 \
&& $LIBTOOLIZE --copy --force --automake \
&& autoheader \
&& autoconf \
&& autoconf \
&& automake ${AM_ARGS} \
&& ./configure ${CONF_ARGS} $@
......@@ -9,9 +9,6 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.8])
AM_MAINTAINER_MODE
dnl Make Objective-C work with automake
AM_CONDITIONAL([am__fastdepOBJC], false)
IT_PROG_INTLTOOL([0.35.0])
PKG_PROG_PKG_CONFIG([0.19])
......@@ -36,25 +33,10 @@ AM_GLIB_GNU_GETTEXT
AM_NLS
dnl ****
dnl pygtk and gtk+
dnl ****
PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.16.0 pygtk-2.0 >= 2.16.0])
AC_SUBST(PYGTK_CFLAGS)
AC_SUBST(PYGTK_LIBS)
PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
AC_SUBST(PYGTK_DEFS)
AM_PATH_PYTHON([2.5])
if test "x$PYTHON" = "x:"; then
AC_MSG_ERROR([Python not found])
fi
ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
AC_SUBST(ACLOCAL_AMFLAGS)
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
AC_SUBST([PYTHON_INCLUDES])
AM_PATH_PYTHON([2.5])
dnl ****
dnl enable installation in python-2.x/site-packages/gajim
......
......@@ -6,6 +6,7 @@
<property name="border_width">12</property>
<property name="title" translatable="yes">Gajim: Account Creation Wizard</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="on_wizard_window_destroy"/>
<child>
<object class="GtkVBox" id="vbox77">
......
......@@ -18,6 +18,7 @@
<property name="border_width">12</property>
<property name="title" translatable="yes">Accounts</property>
<property name="default_width">800</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="on_accounts_window_destroy"/>
<signal name="key_press_event" handler="on_accounts_window_key_press_event"/>
<child>
......@@ -484,6 +485,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Choose Client Cert</property>
<signal name="clicked" handler="on_browse_for_client_cert_button_clicked"/>
</object>
<packing>
<property name="expand">False</property>
......@@ -719,6 +721,7 @@
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
......
......@@ -6,6 +6,7 @@
<property name="border_width">6</property>
<property name="title" translatable="yes">Add New Contact</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="on_add_new_contact_window_destroy"/>
<signal name="key_press_event" handler="on_add_new_contact_window_key_press_event"/>
<child>
......@@ -100,6 +101,7 @@
<property name="visible">True</property>
<property name="no_show_all">True</property>
<property name="model">liststore2</property>
<signal name="changed" handler="on_protocol_jid_combobox_changed"/>
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
......
......@@ -6,6 +6,7 @@
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Ad-hoc Commands - Gajim</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="on_adhoc_commands_window_destroy"/>
<child>
<object class="GtkVBox" id="vbox1">
......
......@@ -8,6 +8,7 @@
<property name="role">ace</property>
<property name="default_width">650</property>
<property name="default_height">540</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="on_advanced_configuration_window_destroy"/>
<child>
<object class="GtkVBox" id="vbox70">
......
......@@ -4,7 +4,7 @@
<!-- interface-naming-policy project-wide -->
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name item text -->
<!-- column-name item -->
<column type="gchararray"/>
</columns>
<data>
......@@ -18,7 +18,7 @@
</object>
<object class="GtkListStore" id="liststore2">
<columns>
<!-- column-name item text -->
<!-- column-name item -->
<column type="gchararray"/>
</columns>
<data>
......@@ -35,7 +35,7 @@
</object>
<object class="GtkListStore" id="liststore3">
<columns>
<!-- column-name item text -->
<!-- column-name item -->
<column type="gchararray"/>
</columns>
<data>
......@@ -52,7 +52,7 @@
</object>
<object class="GtkListStore" id="liststore4">
<columns>
<!-- column-name item text -->
<!-- column-name item -->
<column type="gchararray"/>
</columns>
<data>
......@@ -69,6 +69,7 @@
</object>
<object class="GtkWindow" id="archiving_preferences_window">
<property name="border_width">12</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="on_archiving_preferences_window_destroy"/>
<child>
<object class="GtkVBox" id="vbox1">
......
......@@ -5,6 +5,7 @@
<object class="GtkWindow" id="blocked_contacts_window">
<property name="visible">True</property>
<property name="title" translatable="yes">Blocked Contacts</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="on_blocked_contacts_window_destroy"/>
<child>
<object class="GtkVBox" id="vbox1">
......
This diff is collapsed.
......@@ -6,6 +6,7 @@
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Invite Friends!</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="on_chat_to_muc_window_destroy"/>
<signal name="key_press_event" handler="on_chat_to_muc_window_key_press_event"/>
<child>
......
......@@ -7,6 +7,7 @@
<property name="title" translatable="yes">Room Configuration</property>
<property name="default_width">650</property>
<property name="default_height">450</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="on_data_form_window_destroy"/>
<child>
<object class="GtkVBox" id="vbox68">
......@@ -34,7 +35,7 @@
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel" id="instructions_label">
<object class="GtkLabel" id="title_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="wrap">True</property>
......@@ -47,7 +48,7 @@
</packing>
</child>
<child>
<object class="GtkHSeparator" id="hseparator15">
<object class="GtkHSeparator" id="title_hseparator">
<property name="visible">True</property>
</object>
<packing>
......@@ -65,7 +66,7 @@
</packing>
</child>
<child>
<object class="GtkHSeparator" id="hseparator14">
<object class="GtkHSeparator" id="config_hseparator">
<property name="visible">True</property>
</object>
<packing>
......
......@@ -7,7 +7,7 @@
<property name="title" translatable="yes">Edit Groups</property>
<property name="modal">True</property>
<property name="default_height">290</property>
<property name="type_hint">normal</property>
<property name="type_hint">dialog</property>
<signal name="response" handler="on_edit_groups_dialog_response"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox6">
......
......@@ -8,6 +8,7 @@
<property name="title" translatable="yes">Features</property>
<property name="default_width">300</property>
<property name="default_height">530</property>
<property name="type_hint">dialog</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
......
......@@ -5,6 +5,7 @@
<object class="GtkWindow" id="file_transfers_window">
<property name="border_width">12</property>
<property name="title" translatable="yes">File Transfers</property>
<property name="type_hint">dialog</property>
<child internal-child="accessible">
<object class="AtkObject" id="file_transfers_window-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">File Transfers</property>
......@@ -40,11 +41,11 @@
</object>
</child>
<signal name="button_press_event" handler="on_transfers_list_button_press_event"/>
<signal name="motion_notify_event" handler="on_transfers_list_motion_notify_event"/>
<signal name="button_release_event" handler="on_transfers_list_button_release_event"/>
<signal name="key_press_event" handler="on_transfers_list_key_press_event"/>
<signal name="leave_notify_event" handler="on_transfers_list_leave_notify_event"/>
<signal name="motion_notify_event" handler="on_transfers_list_motion_notify_event"/>
<signal name="row_activated" handler="on_transfers_list_row_activated"/>
<signal name="button_release_event" handler="on_transfers_list_button_release_event"/>
</object>
</child>
</object>
......
......@@ -4,7 +4,7 @@
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name item text -->
<!-- column-name item -->
<column type="gchararray"/>
</columns>
<data>
......@@ -25,6 +25,7 @@
<object class="GtkWindow" id="gajim_themes_window">
<property name="border_width">12</property>
<property name="title" translatable="yes">Gajim Themes Customization</property>
<property name="type_hint">dialog</property>
<child>
<object class="GtkVBox" id="vbox97">
<property name="visible">True</property>
......@@ -326,6 +327,7 @@
<property name="visible">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
......
......@@ -66,6 +66,19 @@
<property name="use_underline">True</property>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="request_voice_separator">
<property name="no_show_all">True</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="request_voice_menuitem">
<property name="label" translatable="yes">_Request Voice</property>
<property name="visible">True</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="bookmark_separator">
<property name="no_show_all">True</property>
......
......@@ -94,6 +94,15 @@
</child>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="invite_menuitem">
<property name="label" translatable="yes">In_vite to</property>
<property name="visible">True</property>
<property name="use_underline">True</property>
<property name="image">image7</property>
<property name="use_stock">False</property>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="separator6">
<property name="visible">True</property>
......@@ -185,4 +194,8 @@
<property name="stock">gtk-justify-fill</property>
<property name="icon-size">1</property>
</object>
<object class="GtkImage" id="image7">
<property name="visible">True</property>
<property name="stock">gtk-missing-image</property>
</object>
</interface>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment