diff --git a/.hgignore b/.hgignore
new file mode 100644
index 000000000..1f56821c2
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,28 @@
+syntax: glob
+*.orig
+*.gmo
+*.in
+*.la
+*.lo
+*.m4
+*.pyc
+*.pyo
+*.o
+*.Plo
+*~
+autom4te.cache
+data/defs.py
+data/gajim.desktop
+libtool
+po/.intltool-merge-cache
+po/POTFILES
+po/stamp-it
+stamp-h1
+Makefile
+
+syntax: regexp
+^config\.*
+^config\/
+^src\/\.libs
+^src\/trayicon.c
+^scripts\/gajim.*
diff --git a/ChangeLog b/ChangeLog
index 2c0637605..6f77eb6d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,57 @@
+Gajim 0.13 (XX November 2009)
+
+ * Improve gtkspell (fix memleak)
+ * BOSH connection
+ * Roster versioning
+ * Ability to send contacts
+ * GUI to send XHTML messages
+ * Improve sessions handling
+ * pubsub storage (for bookmarks)
+ * Ability to select account when joining a groupchat
+ * Better Gnome keyring support
+ * Ability to ignore occupants in groupchats
+ * Ability to show / hide self contact row
+ * Automatically go away when screensaver is enabled under windows
+ * Ability to enable / disable accounts
+ * better URL recognition
+ * groupchat autoreconnect
+ * Store passwords in KDE wallet if available
+ * Better MUC errors handling
+ * Fix sound player launch (don't create zombies anymore)
+ * Optional shell like completion
+ * New color theme
+
+Gajim 0.12.5 (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
diff --git a/Makefile.am b/Makefile.am
index 9140f24f9..019f7a1d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,3 +57,12 @@ MAINTAINERCLEANDIRS = \
autom4te.cache \
build \
dist
+
+
+test:
+ python test/runtests.py
+.PHONY: test
+
+doc:
+ epydoc --config=doc/epydoc.conf
+.PHONY: doc
diff --git a/README.html b/README.html
index 3ddfa08d5..558d23a80 100644
--- a/README.html
+++ b/README.html
@@ -37,8 +37,8 @@ Gajim is a GTK+ app that loves GNOME. You can do 'make' so you don't require gno
GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell
gnome-python-desktop (for GnomeKeyring support)
notification-daemon or notify-python (and D-Bus) to get cooler popups
-D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.60 is required.
-python-dbus bindings
+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.
+python-dbus bindings (>=0.80)
python-sexy to have clickable URLs in chat windows
python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required
diff --git a/THANKS.artists b/THANKS.artists
index 728d456e1..5cdff9134 100644
--- a/THANKS.artists
+++ b/THANKS.artists
@@ -2,6 +2,9 @@ Anders Ström
Christophe Got
Dennis Craven
Guillaume Morin
+Gvorcek Spajreh
Josef Vybíral
Membris Khan
Rederick Asher
+Jakub Szypulka
+
diff --git a/TODO.osx b/TODO.osx
deleted file mode 100644
index b5c332299..000000000
--- a/TODO.osx
+++ /dev/null
@@ -1,36 +0,0 @@
-The bits that work
-------------------
-
--idle checking
--dbus and gajim-remote, using dbus from GTK+.framework.
--systray icon
--app bundle with universal binaries. Depends on the GTK+.framework.
--notifications through growl, internal fallback works fine as well
--spell checking
--running apps and opening files/urls
--playing sounds
--Network monitoring
--Mostly everything else except for whats below.
-
-
-
-The bits that dont work
------------------------
-
--Application start/stop/doc/DnD handling
--finish the .app bundle
- - setup gajim-remote, maybe install it to /usr/local
- - fix user session management
--integrate the Gajim and gajim-remote scripts with autoconf and add GTK
- framework detection
--Maybe setup the pasteboard services for an OS/X alternative to the
- gajim_remote
--CFBundleDocumentTypes.NSDocument
--zeroconf has a parsing problem with the MDNS result.
-
-
-Native GTK bugs
-----------------
-
--cut and paste blows up Finder and the os/x GUI server. very very nasty.
--with mutiple displays, popup menus show up on the wrong display
diff --git a/TODO.pep b/TODO.pep
deleted file mode 100644
index be8ae8b70..000000000
--- a/TODO.pep
+++ /dev/null
@@ -1,8 +0,0 @@
-• 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
diff --git a/autogen.sh b/autogen.sh
index 42fa19eeb..d6cdc6996 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -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***"
diff --git a/configure.ac b/configure.ac
index b6b63c166..6363cb90b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_INIT([Gajim - A Jabber Instant Messager],
- [0.12.1.5-svn],[http://trac.gajim.org/],[gajim])
+ [0.13.0.1-dev],[http://trac.gajim.org/],[gajim])
AC_PREREQ([2.59])
AC_CONFIG_HEADER(config.h)
@@ -39,7 +39,7 @@ AM_NLS
dnl ****
dnl pygtk and gtk+
dnl ****
-PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.8.0 pygtk-2.0 >= 2.8.0])
+PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.12.0 pygtk-2.0 >= 2.12.0])
AC_SUBST(PYGTK_CFLAGS)
AC_SUBST(PYGTK_LIBS)
PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
@@ -59,72 +59,6 @@ AC_ARG_ENABLE(trayicon,
test "x$enable_trayicon" = "xyes" && have_trayicon=true || have_trayicon=false
AM_CONDITIONAL(BUILD_TRAYICON, $have_trayicon)
-dnl ****
-dnl Cocoa
-dnl ****
-AC_ARG_ENABLE([cocoa],
- [ --disable-cocoa do not build cocoa integration [default auto]],
- enable_cocoa=$enableval, enable_cocoa=yes)
-
-if test "x$enable_cocoa" = "xyes";then
- dnl There is no pkgconfig for cocoa; lets do a header check
- temp_save_cflags="$CFLAGS"
- CFLAGS="$CFLAGS -ObjC"
- AC_CHECK_HEADER(Cocoa/Cocoa.h, [have_cocoa=true], [have_cocoa=false])
- AC_CHECK_HEADER(AppKit/AppKit.h, [have_appkit=true], [have_appkit=false])
- CFLAGS="$temp_save_cflags"
-
- if test "x$have_cocoa" = "xtrue";then
- COCOA_LIBS="$COCOA_LIBS -Xlinker -framework -Xlinker Cocoa"
- fi
- if test "x$have_appkit" = "xtrue";then
- COCOA_LIBS="$COCOA_LIBS -Xlinker -framework -Xlinker AppKit"
- fi
- if test "x$COCOA_LIBS" != "x";then
- AC_SUBST(COCOA_LIBS)
- true
- fi
-fi
-AM_CONDITIONAL(BUILD_COCOA, $have_cocoa)
-
-dnl ****
-dnl Carbon
-dnl ****
-AC_ARG_ENABLE([carbon],
- [ --disable-carbon do not build with carbon [default auto]],
- enable_carbon=$enableval, enable_carbon=yes)
-
-if test "x$enable_carbon" = "xyes";then
- dnl There is no pkgconfig for carbon; lets do a header check
- AC_CHECK_HEADER(Carbon/Carbon.h, [have_carbon=true], [have_carbon=false])
- AC_CHECK_HEADER(IOKit/IOKitLib.h, [have_iokit=true], [have_iokit=false])
-
- if test "x$have_carbon" = "xtrue";then
- CARBON_LIBS="$CARBON_LIBS -Xlinker -framework -Xlinker Carbon"
- fi
- if test "x$have_iokit" = "xtrue";then
- CARBON_LIBS="$CARBON_LIBS -Xlinker -framework -Xlinker IOKit"
- fi
- if test "x$CARBON_LIBS" != "x";then
- AC_SUBST(CARBON_LIBS)
- have_idle_osx=true
- dnl Disable custom trayicon
- have_trayicon=gtk+
- AM_CONDITIONAL(BUILD_TRAYICON, false)
- dnl Hack to work around failure in gettext package detection on OS/X
- if test "x$GMSGFMT" = "x";then
- AC_SUBST(GMSGFMT, msgfmt)
- AC_SUBST(MSGFMT, msgfmt)
- AC_SUBST(XGETTEXT, xgettext)
- fi
- else
- have_carbon=false
- have_idle_osx=false
- fi
-fi
-AM_CONDITIONAL(BUILD_IDLE_OSX, $have_carbon)
-AM_CONDITIONAL(BUILD_CARBON, $have_carbon)
-
ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
AC_SUBST(ACLOCAL_AMFLAGS)
@@ -151,9 +85,6 @@ AC_CONFIG_FILES([
data/gajim.desktop.in
data/defs.py
src/Makefile
- src/osx/Makefile
- src/osx/growl/Makefile
- src/osx/syncmenu/Makefile
scripts/gajim
scripts/gajim-remote:scripts/gajim.in
scripts/gajim-history-manager:scripts/gajim.in
@@ -164,6 +95,4 @@ echo "
*****************************
Build features:
trayicon ......... ${have_trayicon}
- idle module OSX .. ${have_idle_osx}
- cocoa (OSX)....... ${have_cocoa}
*****************************"
diff --git a/data/glade/account_creation_wizard_window.glade b/data/glade/account_creation_wizard_window.glade
index 8458e66e6..028492ba3 100644
--- a/data/glade/account_creation_wizard_window.glade
+++ b/data/glade/account_creation_wizard_window.glade
@@ -1,7 +1,7 @@
-
-
-
+
+
+
12
Gajim: Account Creation Wizard
@@ -30,13 +30,14 @@ to the Jabber network.
False
False
+ 0
True
0
- GTK_SHADOW_NONE
+ none
True
@@ -49,25 +50,26 @@ to the Jabber network.
6
+ I already have an account I want to _use
True
True
- I already have an account I want to _use
+ False
True
- 0
True
False
False
+ 0
+ I want to _register for a new account
True
True
- I want to _register for a new account
+ False
True
- 0
True
use_existing_account_radiobutton
@@ -105,8 +107,8 @@ to the Jabber network.
True
- tab
False
+ tab
@@ -124,12 +126,13 @@ to the Jabber network.
False
False
+ 0
True
- 2
+ 3
4
12
6
@@ -154,21 +157,21 @@ to the Jabber network.
password_entry
- 1
- 2
+ 2
+ 3
GTK_FILL
+ Save pass_word
True
True
+ False
If checked, Gajim will remember the password for this account
- Save pass_word
True
False
- 0
True
True
@@ -176,8 +179,8 @@ to the Jabber network.
2
4
- 1
- 2
+ 2
+ 3
GTK_FILL
@@ -192,8 +195,8 @@ to the Jabber network.
1
2
- 1
- 2
+ 2
+ 3
@@ -225,10 +228,6 @@ to the Jabber network.
True
-
-
-
-
3
@@ -237,6 +236,26 @@ to the Jabber network.
GTK_FILL
+
+
+ Anon_ymous authentication
+ True
+ True
+ False
+ True
+ True
+
+
+
+ 1
+ 4
+ 1
+ 2
+
+
+
+
+
False
@@ -253,9 +272,9 @@ to the Jabber network.
True
- tab
1
False
+ tab
@@ -273,6 +292,7 @@ to the Jabber network.
False
False
+ 0
@@ -289,15 +309,12 @@ to the Jabber network.
False
False
+ 0
True
-
-
-
-
1
@@ -310,6 +327,20 @@ to the Jabber network.
1
+
+
+ Anon_ymous authentication
+ True
+ True
+ False
+ True
+ True
+
+
+ False
+ 2
+
+
True
@@ -347,11 +378,11 @@ to the Jabber network.
+ Manage...
True
True
- Manage...
+ False
True
- 0
@@ -363,11 +394,11 @@ to the Jabber network.
+ Use custom hostname/port
True
True
- Use custom hostname/port
+ False
True
- 0
True
@@ -394,6 +425,7 @@ to the Jabber network.
False
False
+ 0
@@ -454,7 +486,7 @@ to the Jabber network.
- 2
+ 3
@@ -467,9 +499,9 @@ to the Jabber network.
True
- tab
2
False
+ tab
@@ -484,10 +516,11 @@ to the Jabber network.
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
gtk-dialog-warning
- 5
+ 5
False
+ 0
@@ -502,17 +535,18 @@ to the Jabber network.
False
+ 0
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
Add this certificate to the list of trusted certificates.
SHA1 fingerprint of the certificate:
- 0
+ True
+ True
+ False
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
True
@@ -530,9 +564,9 @@ SHA1 fingerprint of the certificate:
True
- tab
3
False
+ tab
@@ -551,9 +585,9 @@ SHA1 fingerprint of the certificate:
True
- tab
4
False
+ tab
@@ -566,10 +600,11 @@ SHA1 fingerprint of the certificate:
Please wait...
True
- GTK_JUSTIFY_CENTER
+ center
False
+ 0
@@ -593,9 +628,9 @@ Please wait...
True
- tab
5
False
+ tab
@@ -613,6 +648,7 @@ Please wait...
False
False
+ 0
@@ -627,14 +663,17 @@ Please wait...
+
+ 0
+
+ Connect when I press Finish
True
True
- Connect when I press Finish
+ False
True
- 0
True
True
@@ -646,11 +685,11 @@ Please wait...
+ Set my profile when I connect
True
True
- Set my profile when I connect
+ False
True
- 0
True
True
@@ -670,56 +709,68 @@ Please wait...
True
- tab
6
False
+ tab
+
+ 0
+
True
12
- GTK_BUTTONBOX_END
+ end
+ gtk-cancel
True
True
True
- gtk-cancel
+ False
True
- 0
+
+ False
+ False
+ 0
+
+ gtk-go-back
True
False
True
True
- gtk-go-back
+ False
True
- 0
+ False
+ False
1
+ gtk-go-forward
True
True
True
True
- gtk-go-forward
+ False
True
- 0
+ False
+ False
2
@@ -727,8 +778,8 @@ Please wait...
True
True
+ False
True
- 0
@@ -747,6 +798,7 @@ Please wait...
False
False
+ 0
@@ -767,6 +819,8 @@ Please wait...
+ False
+ False
3
@@ -774,8 +828,8 @@ Please wait...
True
True
+ False
True
- 0
@@ -794,6 +848,7 @@ Please wait...
False
False
+ 0
@@ -814,6 +869,8 @@ Please wait...
+ False
+ False
4
diff --git a/data/glade/accounts_window.glade b/data/glade/accounts_window.glade
index f74128ad9..bb5f3cb9a 100644
--- a/data/glade/accounts_window.glade
+++ b/data/glade/accounts_window.glade
@@ -1,14 +1,14 @@
-
+
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
12
Accounts
- 700
-
+ 800
+
True
@@ -165,518 +165,502 @@
-
+
True
- True
-
+
True
- 6
- 5
- 3
- 6
- 6
+ True
+ _Enable
+ True
+ 0
+ True
+
+
+
+ False
+ False
+
+
+
+
+ True
+ True
-
+
True
- 0
- _Jabber ID:
- True
- jid_entry1
-
-
- GTK_FILL
-
-
-
-
-
- True
- 0
- _Password:
- True
- password_entry1
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
-
- True
- False
- True
- False
- True
-
-
-
- 1
- 2
- 1
- 2
- GTK_EXPAND | GTK_SHRINK | GTK_FILL
-
-
-
-
-
- True
- True
- If checked, Gajim will remember the password for this account
- Save pass_word
- True
- False
- 0
- True
-
-
-
- 2
- 3
- 1
- 2
- GTK_FILL
-
-
-
-
-
- True
- 0
- Resour_ce:
- True
- resource_entry1
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
-
- True
- 0
- Priori_ty:
- True
- priority_spinbutton1
-
-
- 3
- 4
- GTK_FILL
-
-
-
-
-
- True
- True
- Priority will change automatically according to your status.
- A_djust to status
- True
- 0
- True
-
-
-
- 1
- 2
- 3
- 4
- GTK_FILL
-
-
-
-
-
- True
- True
- Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events
- 5 0 127 1 5 0
- 1
- True
-
-
-
- 2
- 3
- 3
- 4
- GTK_FILL
-
-
-
-
-
- True
- True
+ 6
+ 5
+ 3
+ 6
+ 6
-
+
True
- 11
- True
-
-
- True
- True
- Click to request authorization to all contacts of another account
- Synchronise contacts
- True
- 0
-
-
-
- False
-
-
-
-
- True
- True
- Click to change account's password
- Chan_ge Password
- True
- 0
-
-
-
- False
- 1
-
-
-
-
-
-
- True
- Administration operations
+ True
+ Anonymous authentication
+ 0
+ True
+
- label_item
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+
+ True
+ True
+ Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)
+ Gajim
+
+
+
+ 1
+ 3
+ 2
+ 3
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL
+
+
+
+
+
+ True
+ True
+ True
+
+
+
+ 1
+ 2
+
+
+
+
+
+ True
+ True
+
+
+ True
+ 11
+ True
+
+
+ True
+ True
+ Click to request authorization to all contacts of another account
+ Synchronise contacts
+ True
+ 0
+
+
+
+ False
+
+
+
+
+ True
+ True
+ Click to change account's password
+ Chan_ge Password
+ True
+ 0
+
+
+
+ False
+ 1
+
+
+
+
+
+
+ True
+ Administration operations
+
+
+ label_item
+
+
+
+
+ 3
+ 4
+ 5
+ GTK_FILL
+ GTK_FILL
+
+
+
+
+ True
+ True
+ Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events
+ 5 0 127 1 5 0
+ 1
+ True
+
+
+
+ 2
+ 3
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+
+ True
+ True
+ Priority will change automatically according to your status.
+ A_djust to status
+ True
+ 0
+ True
+
+
+
+ 1
+ 2
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ Priori_ty:
+ True
+ priority_spinbutton1
+
+
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ Resour_ce:
+ True
+ resource_entry1
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+
+ True
+ True
+ If checked, Gajim will remember the password for this account
+ Save pass_word
+ True
+ False
+ 0
+ True
+
+
+
+ 2
+ 3
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ True
+ False
+ True
+ False
+ True
+
+
+
+ 1
+ 2
+ 1
+ 2
+ GTK_EXPAND | GTK_SHRINK | GTK_FILL
+
+
+
+
+
+ True
+ 0
+ _Password:
+ True
+ password_entry1
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ _Jabber ID:
+ True
+ jid_entry1
+
+
+ GTK_FILL
+
+
+
+
+
+
+
+ True
+ Account
+
+
+ tab
+ False
+
+
+
+
+ True
+ 6
+ 6
+
+
+ True
+ True
+ If checked, Gajim, when launched, will automatically connect to jabber using this account
+ C_onnect on Gajim startup
+ True
+ 0
+ True
+
+
+
+ False
+ False
+
+
+
+
+ True
+ True
+ Auto-reconnect when connection is lost
+ True
+ 0
+ True
+
+
+
+ False
+ False
+ 1
+
+
+
+
+ True
+ True
+ Save conversation _logs for all contacts
+ True
+ 0
+ True
+ True
+
+
+
+ False
+ False
+ 2
+
+
+
+
+ True
+ True
+ If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly
+ Synch_ronize account status with global status
+ True
+ 0
+ True
+
+
+
+ False
+ False
+ 3
+
+
+
+
+ True
+ True
+ If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working.
+ Use file transfer proxies
+ True
+ 0
+ True
+
+
+
+ False
+ False
+ 4
- 3
- 4
- 5
- GTK_FILL
- GTK_FILL
-
-
-
-
- True
- True
- True
-
-
-
- 1
- 3
-
-
-
-
-
- True
- True
- Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)
- Gajim
-
-
-
- 1
- 3
- 2
- 3
- GTK_EXPAND | GTK_SHRINK | GTK_FILL
-
-
-
-
-
-
-
- True
- Account
-
-
- tab
- False
-
-
-
-
- True
- 6
- 6
-
-
- True
- True
- If checked, Gajim, when launched, will automatically connect to jabber using this account
- C_onnect on Gajim startup
- True
- 0
- True
-
-
-
- False
- False
-
-
-
-
- True
- True
- Auto-reconnect when connection is lost
- True
- 0
- True
-
-
-
- False
- False
1
-
+
True
- True
- Save conversation _logs for all contacts
- True
- 0
- True
- True
-
+ General
+ True
- False
- False
- 2
+ tab
+ 1
+ False
-
+
True
- True
- If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly
- Synch_ronize account status with global status
- True
- 0
- True
-
-
-
- False
- False
- 3
-
-
-
-
- True
- True
- If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working.
- Use file transfer proxies
- True
- 0
- True
-
-
-
- False
- False
- 4
-
-
-
-
- 1
-
-
-
-
- True
- General
- True
-
-
- tab
- 1
- False
-
-
-
-
- True
- 6
- 12
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- GTK_SHADOW_NONE
+ 6
+ 12
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 12
+ 0
+ GTK_SHADOW_NONE
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 6
- 6
+ 12
-
+
True
- True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- _use HTTP__PROXY environment variable
- True
- 0
- True
-
-
-
- False
-
-
-
-
- True
+ 6
6
-
- True
- None
-
-
-
-
-
+
True
True
- _Manage...
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ _use HTTP__PROXY environment variable
True
0
-
+ True
+
+
+
+ False
+
+
+
+
+ True
+ 6
+
+
+ True
+ None
+
+
+
+
+
+ True
+ True
+ _Manage...
+ True
+ 0
+
+
+
+ False
+ False
+ 1
+
+
False
- False
1
-
- False
- 1
-
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ <b>Proxy</b>
+ True
+
+
+ label_item
+
+
-
+
True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- <b>Proxy</b>
- True
-
-
- label_item
-
-
-
-
-
-
- True
- 0
- GTK_SHADOW_NONE
-
-
- True
- 12
+ 0
+ GTK_SHADOW_NONE
-
+
True
- 6
- 6
+ 12
-
+
True
- True
- Check this so Gajim will ask you before sending your password over an insecure connection.
- _Warn before using an insecure connection
- True
- 0
- True
-
-
-
- False
- False
-
-
-
-
- True
- True
- If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection
- Send _keep-alive packets
- True
- 0
- True
- True
-
-
-
- False
- False
- 1
-
-
-
-
- True
- True
- Use cust_om hostname/port
- True
- 0
- True
-
-
-
- False
- False
- 2
-
-
-
-
- True
- False
+ 6
6
-
+
True
- _Hostname:
+ True
+ Check this so Gajim will ask you before sending your password over an insecure connection.
+ _Warn before using an insecure connection
True
+ 0
+ True
+
False
@@ -684,20 +668,32 @@
-
+
True
True
-
+ If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection
+ Send _keep-alive packets
+ True
+ 0
+ True
+ True
+
+ False
+ False
1
-
+
True
- _Port:
+ True
+ Use cust_om hostname/port
True
+ 0
+ True
+
False
@@ -706,214 +702,257 @@
-
+
True
- True
- 6
- 5222
-
+ False
+ 6
+
+
+ True
+ _Hostname:
+ True
+
+
+ False
+ False
+
+
+
+
+ True
+ True
+
+
+
+ 1
+
+
+
+
+ True
+ _Port:
+ True
+
+
+ False
+ False
+ 2
+
+
+
+
+ True
+ True
+ 6
+ 5222
+
+
+
+ False
+ 3
+
+
- False
3
-
- 3
-
-
-
-
-
- True
- <b>Miscellaneous</b>
- True
+
+
+ True
+ <b>Miscellaneous</b>
+ True
+
+
+ label_item
+
+
- label_item
+ False
+ 1
- False
- 1
+ 2
-
-
- 2
-
-
-
-
- True
- Connection
-
-
- tab
- 2
- False
-
-
-
-
- True
- 5
- 6
-
+
True
- 0
- GTK_SHADOW_NONE
+ Connection
+
+
+ tab
+ 2
+ False
+
+
+
+
+ True
+ 5
+ 6
-
+
True
- 12
+ 0
+ GTK_SHADOW_NONE
-
+
True
- 6
- 6
+ 12
-
+
True
+ 6
6
-
+
True
+ 6
+
+
+ True
+ True
+ No key selected
+ True
+
+
+ False
+ False
+
+
+
+
+ True
+ True
+ True
+
+
+ 1
+
+
+
+
+ True
+ True
+ Choose _Key...
+ True
+ 0
+
+
+
+ False
+ False
+ 2
+
+
+
+
+ False
+
+
+
+
+ True
+ False
True
- No key selected
- True
+ If checked, Gajim will get the password from a GPG agent like seahorse
+ Use G_PG Agent
+ True
+ 0
+ True
+
False
False
-
-
-
-
- True
- True
- True
-
-
1
-
-
- True
- True
- Choose _Key...
- True
- 0
-
-
-
- False
- False
- 2
-
-
-
- False
-
-
-
-
- True
- False
- True
- If checked, Gajim will get the password from a GPG agent like seahorse
- Use G_PG Agent
- True
- 0
- True
-
-
-
- False
- False
- 1
-
-
-
-
-
- True
- <b>OpenPGP</b>
- True
+
+
+ True
+ <b>OpenPGP</b>
+ True
+
+
+ label_item
+
+
- label_item
+ False
+
+
+
+
+ True
+ 0
+ GTK_SHADOW_NONE
+
+
+ True
+ 6
+ 12
+
+
+ True
+ True
+ Information about you, as stored in the server
+ _Edit Personal Information...
+ True
+ 0
+
+
+
+
+
+
+
+ True
+ <b>Personal Information</b>
+ True
+
+
+ label_item
+
+
+
+
+ False
+ 1
- False
+ 3
-
+
True
- 0
- GTK_SHADOW_NONE
-
-
- True
- 6
- 12
-
-
- True
- True
- Information about you, as stored in the server
- _Edit Personal Information...
- True
- 0
-
-
-
-
-
-
-
- True
- <b>Personal Information</b>
- True
-
-
- label_item
-
-
+ Personal Information
- False
- 1
+ tab
+ 3
+ False
- 3
-
-
-
-
- True
- Personal Information
-
-
- tab
- 3
- False
+ 1
@@ -931,6 +970,7 @@
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 1
True
@@ -1337,6 +1377,10 @@ You might consider to change possible firewall settings.
0
+
+ False
+ False
+
diff --git a/data/glade/chat_control_popup_menu.glade b/data/glade/chat_control_popup_menu.glade
deleted file mode 100644
index 1c923adbd..000000000
--- a/data/glade/chat_control_popup_menu.glade
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
-
-
-
diff --git a/data/glade/roster_contact_context_menu.glade b/data/glade/contact_context_menu.glade
similarity index 70%
rename from data/glade/roster_contact_context_menu.glade
rename to data/glade/contact_context_menu.glade
index 0629a8029..59989970d 100644
--- a/data/glade/roster_contact_context_menu.glade
+++ b/data/glade/contact_context_menu.glade
@@ -1,102 +1,150 @@
-
-
-
+
-
-
@@ -347,11 +407,12 @@
diff --git a/data/glade/gc_occupants_menu.glade b/data/glade/gc_occupants_menu.glade
index a8b4afbbc..99c7e1648 100644
--- a/data/glade/gc_occupants_menu.glade
+++ b/data/glade/gc_occupants_menu.glade
@@ -121,7 +121,35 @@
-
+
+
+
+
+
diff --git a/data/glade/input_dialog.glade b/data/glade/input_dialog.glade
index 12912060c..c71dd4337 100644
--- a/data/glade/input_dialog.glade
+++ b/data/glade/input_dialog.glade
@@ -1,160 +1,113 @@
-
-
-
+
-
-
- 6
-
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- True
- False
- False
-
-
-
-
- True
- False
- 6
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
- -6
-
-
-
-
-
- True
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
-
-
- 6
- True
- False
- 6
-
-
-
- True
- False
- 12
-
-
-
- True
- gtk-dialog-question
- 6
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- True
-
-
-
-
-
- True
-
- False
- True
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- True
- True
-
-
-
-
- 0
- False
- True
-
-
-
-
-
- True
- True
- True
- True
- 0
-
- True
- True
-
-
- 0
- False
- False
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
+
+
+
+ 6
+ dialog
+ False
+
+
+
+ True
+ 6
+
+
+ True
+ 6
+ 6
+
+
+ True
+ 12
+
+
+ True
+ gtk-dialog-question
+ 6
+
+
+ False
+ 0
+
+
+
+
+ True
+ True
+
+
+ 1
+
+
+
+
+ False
+ 0
+
+
+
+
+ True
+ True
+ True
+
+
+ False
+ False
+ 1
+
+
+
+
+ 1
+
+
+
+
+ True
+ end
+
+
+ gtk-cancel
+ -6
+ True
+ True
+ True
+ False
+ True
+
+
+ False
+ False
+ 0
+
+
+
+
+ gtk-ok
+ -5
+ True
+ True
+ True
+ True
+ False
+ True
+
+
+ False
+ False
+ 1
+
+
+
+
+ False
+ end
+ 0
+
+
+
+
+
diff --git a/data/glade/join_groupchat_window.glade b/data/glade/join_groupchat_window.glade
index 4c13f84fc..2a3d63c34 100644
--- a/data/glade/join_groupchat_window.glade
+++ b/data/glade/join_groupchat_window.glade
@@ -1,365 +1,272 @@
-
-
-
+
+
+
-
-
- 6
- Join Group Chat
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_NORMAL
- GDK_GRAVITY_NORTH_WEST
- True
- False
-
-
-
-
-
- True
- False
- 12
-
-
-
- True
- 5
- 2
- False
- 6
- 12
-
-
-
- True
- True
- True
- True
- True
- 0
-
- True
- True
-
-
-
- 1
- 2
- 2
- 3
-
-
-
-
-
-
- True
- True
- True
- True
- 0
-
- True
- True
-
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
-
- True
- Room:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 2
- 3
- fill
-
-
-
-
-
-
- True
- Nickname:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 1
- 2
- fill
-
-
-
-
-
-
- True
- Recently:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 0
- 1
- fill
-
-
-
-
-
-
- True
- False
- True
-
-
-
- 1
- 2
- 0
- 1
- fill
- fill
-
-
-
-
-
- True
- Password:
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- 1
- 3
- 4
- fill
-
-
-
-
-
-
- True
- True
- True
- False
- 0
-
- True
- True
-
-
- 1
- 2
- 3
- 4
-
-
-
-
-
-
- True
- True
- Join this room automatically when I connect
- True
- GTK_RELIEF_NORMAL
- True
- False
- False
- True
-
-
- 0
- 2
- 4
- 5
- fill
-
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
- GTK_BUTTONBOX_END
- 12
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
-
-
- True
- True
- True
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
- True
- 0.5
- 0.5
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
- True
- False
- 2
-
-
-
- True
- gtk-apply
- 4
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- _Join
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
- PANGO_ELLIPSIZE_NONE
- -1
- False
- 0
-
-
- 0
- False
- False
-
-
-
-
-
-
-
-
-
-
- 0
- False
- True
-
-
-
-
-
-
+
+ 6
+ Join Group Chat
+
+
+
+
+ True
+ 12
+
+
+ True
+ 7
+ 2
+ 12
+ 6
+
+
+ True
+ True
+ True
+ True
+
+
+
+ 1
+ 2
+ 3
+ 4
+
+
+
+
+
+ True
+ True
+ True
+
+
+
+ 1
+ 2
+ 2
+ 3
+
+
+
+
+
+ True
+ 0
+ Room:
+
+
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ Nickname:
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ Recently:
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ True
+
+
+
+ 1
+ 2
+ 1
+ 2
+ GTK_FILL
+ GTK_FILL
+
+
+
+
+ True
+ 0
+ Password:
+
+
+ 4
+ 5
+ GTK_FILL
+
+
+
+
+
+ True
+ True
+ False
+ True
+
+
+ 1
+ 2
+ 4
+ 5
+
+
+
+
+
+ True
+ False
+ True
+ Join this room automatically when I connect
+ True
+ 0
+ True
+
+
+ 2
+ 6
+ 7
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ Account
+
+
+ GTK_FILL
+
+
+
+
+
+ True
+
+
+
+ 1
+ 2
+ GTK_FILL
+ GTK_FILL
+
+
+
+
+ True
+ True
+ Bookmark this room
+ 0
+ True
+
+
+
+ 2
+ 5
+ 6
+ GTK_FILL
+
+
+
+
+
+
+
+ True
+ 12
+ GTK_BUTTONBOX_END
+
+
+ True
+ True
+ True
+ gtk-cancel
+ True
+ 0
+
+
+
+ False
+ False
+
+
+
+
+ True
+ True
+ True
+ True
+ 0
+
+
+
+ True
+ 0
+ 0
+
+
+ True
+ 2
+
+
+ True
+ gtk-apply
+
+
+ False
+ False
+
+
+
+
+ True
+ _Join
+ True
+
+
+ False
+ False
+ 1
+
+
+
+
+
+
+
+
+ False
+ False
+ 1
+
+
+
+
+ False
+ 1
+
+
+
+
+
diff --git a/data/glade/manage_proxies_window.glade b/data/glade/manage_proxies_window.glade
index 81e5b6799..7a0029d2f 100644
--- a/data/glade/manage_proxies_window.glade
+++ b/data/glade/manage_proxies_window.glade
@@ -1,7 +1,7 @@
-
-
-
+
+
+
12
Manage Proxy Profiles
@@ -22,9 +22,9 @@
True
True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
+ automatic
+ automatic
+ in
True
@@ -35,34 +35,44 @@
+
+ 0
+
True
6
- GTK_BUTTONBOX_END
+ end
+ gtk-add
True
True
True
- gtk-add
+ False
True
- 0
+
+ False
+ False
+ 0
+
+ gtk-remove
True
True
True
- gtk-remove
+ False
True
- 0
+ False
+ False
1
@@ -73,6 +83,9 @@
+
+ 0
+
@@ -81,7 +94,7 @@
True
0
- GTK_SHADOW_NONE
+ none
True
@@ -165,13 +178,16 @@ BOSH
+
+ 0
+
True
6
0
- GTK_SHADOW_NONE
+ none
True
@@ -180,53 +196,24 @@ BOSH
True
False
- 8
+ 7
2
12
6
-
-
- True
- True
-
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
- True
- 0
- B_OSH Port:
- True
- boshport_entry
-
-
- 1
- 2
- GTK_FILL
-
-
-
+ Use HTTP prox_y
True
True
- Use HTTP prox_y
+ False
True
- 0
True
2
- 2
- 3
+ 1
+ 2
GTK_FILL
@@ -258,18 +245,18 @@ BOSH
+ Use proxy auth_entication
True
True
- Use proxy auth_entication
+ False
True
- 0
True
2
- 5
- 6
+ 4
+ 5
GTK_FILL
@@ -283,8 +270,8 @@ BOSH
1
2
- 6
- 7
+ 5
+ 6
@@ -298,8 +285,8 @@ BOSH
1
2
- 7
- 8
+ 6
+ 7
@@ -312,8 +299,8 @@ BOSH
proxyuser_entry
- 6
- 7
+ 5
+ 6
GTK_FILL
@@ -327,8 +314,8 @@ BOSH
proxypass_entry
- 7
- 8
+ 6
+ 7
GTK_FILL
@@ -342,8 +329,8 @@ BOSH
proxyhost_entry
- 3
- 4
+ 2
+ 3
GTK_FILL
@@ -357,8 +344,8 @@ BOSH
1
2
- 4
- 5
+ 3
+ 4
@@ -371,8 +358,8 @@ BOSH
1
2
- 3
- 4
+ 2
+ 3
@@ -385,8 +372,8 @@ BOSH
proxyport_entry
- 4
- 5
+ 3
+ 4
GTK_FILL
@@ -416,23 +403,31 @@ BOSH
+
+ 0
+
True
7
12
- GTK_BUTTONBOX_END
+ end
+ gtk-close
True
True
True
- gtk-close
+ False
True
- 0
+
+ False
+ False
+ 0
+
diff --git a/data/glade/message_window.glade b/data/glade/message_window.glade
index b3e2c3cc3..1532b5b3a 100644
--- a/data/glade/message_window.glade
+++ b/data/glade/message_window.glade
@@ -1,7 +1,7 @@
-
-
-
+
+
+
480
440
@@ -40,6 +40,7 @@
False
False
5
+ 0
@@ -54,6 +55,9 @@
<span weight="heavy" size="large">Contact name</span>
True
+
+ 0
+
@@ -71,14 +75,17 @@
True
None
- 1
+ 1
+
+ 0
+
True
None
- 1
+ 1
1
@@ -87,13 +94,33 @@
True
- ../emoticons/static/music.png
- 1
+ ../emoticons/static/music.png
+ 1
2
+
+
+ True
+ None
+ 1
+
+
+ 3
+
+
+
+
+ True
+ None
+ 1
+
+
+ 4
+
+
11
@@ -103,7 +130,7 @@
- 3
+ 5
@@ -138,6 +165,7 @@
False
False
+ 0
@@ -148,35 +176,40 @@
60
True
3
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
+ automatic
+ automatic
+ in
+
+ 0
+
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ False
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
True
- GTK_RELIEF_NONE
+ none
False
- 0
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
gtk-dialog-authentication
- 1
+ 1
False
+ 0
@@ -184,9 +217,9 @@
True
True
3
- GTK_POLICY_NEVER
- GTK_POLICY_NEVER
- GTK_SHADOW_IN
+ never
+ never
+ in
@@ -212,37 +245,40 @@
True
+ False
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
Show a list of emoticons (Alt+M)
- GTK_RELIEF_NONE
+ none
False
- 0
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
gtk-missing-image
- 1
+ 1
False
+ 0
True
+ False
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
Show a list of formattings
- GTK_RELIEF_NONE
+ none
False
- 0
True
gtk-bold
- 1
+ 1
@@ -268,14 +304,13 @@
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
True
Add this contact to roster (Ctrl+D)
- GTK_RELIEF_NONE
- 0
+ none
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
gtk-add
- 1
+ 1
@@ -288,16 +323,17 @@
True
+ False
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
Send a file (Ctrl+F)
- GTK_RELIEF_NONE
+ none
False
- 0
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 1
+ 1
@@ -307,19 +343,16 @@
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Invite contacts to the conversation (Ctrl+G)
- GTK_RELIEF_NONE
- False
- 0
+
+ True
+ True
+ Toggle audio session
+ none
-
+
True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
gtk-missing-image
- 1
+ 1
@@ -329,19 +362,16 @@
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Show the contact's profile (Ctrl+I)
- GTK_RELIEF_NONE
- False
- 0
+
+ True
+ True
+ Toggle video session
+ none
-
+
True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- gtk-info
- 2
+ gtk-missing-image
+ 1
@@ -351,19 +381,20 @@
-
+
True
+ False
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Browse the chat history (Ctrl+H)
- GTK_RELIEF_NONE
+ Invite contacts to the conversation (Ctrl+G)
+ none
False
- 0
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- gtk-justify-fill
- 1
+ gtk-missing-image
+ 1
@@ -373,9 +404,22 @@
-
+
True
+ False
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Show the contact's profile (Ctrl+I)
+ none
+ False
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ gtk-info
+ 2
+
+
False
@@ -383,19 +427,20 @@
-
+
True
+ False
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Show a menu of advanced functions (Alt+A)
- GTK_RELIEF_NONE
+ Browse the chat history (Ctrl+H)
+ none
False
- 0
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- gtk-execute
- 1
+ gtk-justify-fill
+ 1
@@ -404,6 +449,39 @@
9
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+
+
+ False
+ 10
+
+
+
+
+ True
+ False
+ False
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Show a menu of advanced functions (Alt+D)
+ none
+ False
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ gtk-execute
+ 1
+
+
+
+
+ False
+ 11
+
+
True
@@ -413,14 +491,14 @@
- 10
+ 12
True
True
- 0
+ False
True
@@ -438,6 +516,7 @@
False
False
+ 0
@@ -459,7 +538,7 @@
False
- 11
+ 13
@@ -486,6 +565,7 @@
False
False
+ 0
@@ -493,7 +573,7 @@
True
0
True
- PANGO_ELLIPSIZE_END
+ end
1
@@ -505,14 +585,14 @@
20
True
True
- GTK_RELIEF_NONE
- 0
+ False
+ none
True
6
gtk-close
- 1
+ 1
@@ -526,8 +606,8 @@
- tab
False
+ tab
@@ -555,6 +635,7 @@
False
False
5
+ 0
@@ -569,6 +650,9 @@
<span weight="heavy" size="large">room jid</span>
True
+
+ 0
+
@@ -586,6 +670,7 @@
False
False
+ 0
@@ -609,21 +694,24 @@
60
True
True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
+ automatic
+ automatic
+ in
+
+ 0
+
True
True
- GTK_POLICY_NEVER
- GTK_POLICY_NEVER
- GTK_SHADOW_IN
+ never
+ never
+ in
@@ -634,6 +722,9 @@
+
+ 0
+
@@ -646,9 +737,9 @@
100
True
False
- GTK_POLICY_NEVER
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
+ never
+ automatic
+ in
True
@@ -677,41 +768,45 @@
True
+ False
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
Show a list of emoticons (Alt+M)
- GTK_RELIEF_NONE
- 0
+ none
True
gtk-missing-image
- 1
+ 1
False
False
+ 0
False
+ 0
True
+ False
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
Show a list of formattings
- GTK_RELIEF_NONE
+ none
False
- 0
True
gtk-bold
- 1
+ 1
@@ -733,16 +828,17 @@
True
+ False
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
Change your nickname (Ctrl+N)
- GTK_RELIEF_NONE
- 0
+ none
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
gtk-edit
- 1
+ 1
@@ -755,16 +851,17 @@
True
+ False
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
Change the room's subject (Alt+T)
- GTK_RELIEF_NONE
- 0
+ none
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
gtk-properties
- 1
+ 1
@@ -777,17 +874,18 @@
True
- True
+ False
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ True
Bookmark this room (Ctrl+B)
- GTK_RELIEF_NONE
- 0
+ none
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
gtk-add
- 1
+ 1
@@ -800,16 +898,17 @@
True
+ False
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
Browse the chat history (Ctrl+H)
- GTK_RELIEF_NONE
- 0
+ none
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
gtk-justify-fill
- 1
+ 1
@@ -832,11 +931,12 @@
True
+ False
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Show a menu of advanced functions (Alt+A)
- GTK_RELIEF_NONE
+ Show a menu of advanced functions (Alt+D)
+ none
False
- 0
True
@@ -846,7 +946,7 @@
True
gtk-execute
- 1
+ 1
@@ -874,7 +974,7 @@
True
True
- 0
+ False
True
@@ -892,6 +992,7 @@
False
False
+ 0
@@ -944,6 +1045,7 @@
False
False
+ 0
@@ -963,14 +1065,14 @@
20
True
True
- GTK_RELIEF_NONE
- 0
+ False
+ none
True
6
gtk-close
- 1
+ 1
@@ -984,9 +1086,9 @@
- tab
1
False
+ tab
diff --git a/data/glade/preferences_window.glade b/data/glade/preferences_window.glade
index 73bb13a6b..627c5cfe9 100644
--- a/data/glade/preferences_window.glade
+++ b/data/glade/preferences_window.glade
@@ -1,13 +1,13 @@
-
-
-
+
+
+
6
Preferences
preferences
-
+
True
@@ -27,7 +27,7 @@
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
- GTK_SHADOW_NONE
+ none
True
@@ -41,28 +41,29 @@
6
+ Display a_vatars of contacts in roster
True
True
+ False
If checked, Gajim will display avatars of contacts in roster window and in group chats
- Display a_vatars of contacts in roster
True
- 0
True
False
False
+ 0
+ Display status _messages of contacts in roster
True
True
+ False
If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats
- Display status _messages of contacts in roster
True
- 0
True
@@ -74,12 +75,12 @@
+ Display m_ood of contacts in roster
True
True
+ False
If checked, Gajim will display the mood of contacts in the roster window
- Display m_ood of contacts in roster
True
- 0
True
@@ -91,12 +92,12 @@
+ Display _activity of contacts in roster
True
True
+ False
If checked, Gajim will display the activity of contacts in the roster window
- Display _activity of contacts in roster
True
- 0
True
@@ -108,12 +109,12 @@
+ Display _tunes of contacts in roster
True
True
+ False
If checked, Gajim will display the tunes of contacts in the roster window
- Display _tunes of contacts in roster
True
- 0
True
@@ -134,15 +135,16 @@
False
+ 0
+ in _roster
True
True
- in _roster
+ False
True
- 0
True
@@ -153,11 +155,11 @@
+ in _group chats
True
True
- in _group chats
+ False
True
- 0
True
@@ -188,6 +190,7 @@
False
+ 0
@@ -195,7 +198,7 @@
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
- GTK_SHADOW_NONE
+ none
True
@@ -255,11 +258,11 @@
- True
- Hide all buttons in chat windows
Ma_ke message windows compact
+ True
+ False
+ Hide all buttons in chat windows
True
- 0
True
@@ -272,12 +275,12 @@
+ _Ignore rich content in incoming messages
True
True
+ False
Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.
- _Ignore rich content in incoming messages
True
- 0
True
@@ -290,11 +293,11 @@
- True
- If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat.
_Highlight misspelled words
+ True
+ False
+ If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat.
True
- 0
True
@@ -352,8 +355,8 @@ Detached roster with chat grouped by type
General
- tab
False
+ tab
@@ -365,7 +368,7 @@ Detached roster with chat grouped by type
True
0
- GTK_SHADOW_NONE
+ none
True
@@ -389,6 +392,7 @@ Detached roster with chat grouped by type
False
+ 0
@@ -405,15 +409,18 @@ Show only in roster
+
+ 0
+
+ Notify me about contacts that sign _in
True
True
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Notify me about contacts that sign _in
True
- 0
True
@@ -423,12 +430,12 @@ Show only in roster
+ Notify me about contacts that sign _out
True
True
+ False
Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out
- Notify me about contacts that sign _out
True
- 0
True
@@ -440,11 +447,11 @@ Show only in roster
@@ -460,7 +467,7 @@ Show only in roster
False
True
0
- GTK_SHADOW_NONE
+ none
True
@@ -471,28 +478,29 @@ Show only in roster
6
+ Notify on new _GMail email
True
True
+ False
If checked, Gajim will show a notification when a new e-mail is received via GMail
- Notify on new _GMail email
True
- 0
True
False
False
+ 0
@@ -534,6 +542,7 @@ Show only in roster
False
+ 0
@@ -561,17 +570,17 @@ Always
True
+ Advanced...
True
True
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Advanced...
- 0
False
False
+ 0
@@ -599,6 +608,7 @@ Always
False
+ 0
@@ -606,7 +616,7 @@ Always
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
- GTK_SHADOW_NONE
+ none
True
@@ -623,26 +633,26 @@ Always
6
+ Play _sounds
True
True
- Play _sounds
+ False
True
- 0
True
False
+ 0
+ Ma_nage...
True
True
True
- Ma_nage...
True
- 0
@@ -651,14 +661,17 @@ Always
+
+ 0
+
+ Allow sound when I'm _busy
True
True
- Allow sound when I'm _busy
+ False
True
- 0
True
@@ -699,9 +712,9 @@ Always
Notifications
- tab
1
False
+ tab
@@ -714,7 +727,7 @@ Always
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
- GTK_SHADOW_NONE
+ none
True
@@ -811,6 +824,7 @@ Disabled
False
+ 0
@@ -825,9 +839,9 @@ Disabled
Personal Events
- tab
2
False
+ tab
@@ -840,7 +854,7 @@ Disabled
True
True
0
- GTK_SHADOW_NONE
+ none
True
@@ -855,12 +869,12 @@ Disabled
6
+ _Away after:
True
True
+ False
If checked, Gajim will change status to Away when the computer is unused.
- _Away after:
True
- 0
True
@@ -871,12 +885,12 @@ Disabled
+ _Not available after:
True
True
+ False
If checked, Gajim will change status to Not Available when the computer has not been used even longer
- _Not available after:
True
- 0
True
@@ -1013,13 +1027,14 @@ $T will be replaced by auto-not-available timeout
False
False
+ 0
True
0
- GTK_SHADOW_NONE
+ none
True
@@ -1042,34 +1057,36 @@ $T will be replaced by auto-not-available timeout
False
False
+ 0
-
+
True
14
+ Sign _in
True
True
- Sign _in
+ False
True
- 0
True
False
False
+ 0
+ Sign _out
True
True
- Sign _out
+ False
True
- 0
True
@@ -1090,6 +1107,7 @@ $T will be replaced by auto-not-available timeout
False
False
+ 0
@@ -1097,9 +1115,9 @@ $T will be replaced by auto-not-available timeout
True
True
If enabled, Gajim will not ask for a status message. The specified default message will be used instead.
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
+ automatic
+ automatic
+ in
True
@@ -1134,7 +1152,7 @@ $T will be replaced by auto-not-available timeout
True
0
- GTK_SHADOW_NONE
+ none
True
@@ -1148,36 +1166,40 @@ $T will be replaced by auto-not-available timeout
2
6
6
-
-
-
True
5
- GTK_BUTTONBOX_START
+ start
+ gtk-new
True
True
True
- gtk-new
+ False
True
- 0
+
+ False
+ False
+ 0
+
+ gtk-delete
True
True
True
- gtk-delete
+ False
True
- 0
+ False
+ False
1
@@ -1193,9 +1215,9 @@ $T will be replaced by auto-not-available timeout
True
True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
+ automatic
+ automatic
+ in
True
@@ -1211,15 +1233,15 @@ $T will be replaced by auto-not-available timeout
True
True
- GTK_POLICY_NEVER
- GTK_POLICY_NEVER
- GTK_SHADOW_IN
+ never
+ never
+ in
True
True
3
- GTK_WRAP_WORD
+ word
@@ -1229,6 +1251,9 @@ $T will be replaced by auto-not-available timeout
GTK_FILL
+
+
+
@@ -1259,9 +1284,9 @@ $T will be replaced by auto-not-available timeout
Status
- tab
3
False
+ tab
@@ -1273,7 +1298,7 @@ $T will be replaced by auto-not-available timeout
True
0
- GTK_SHADOW_NONE
+ none
True
@@ -1287,14 +1312,11 @@ $T will be replaced by auto-not-available timeout
2
6
6
-
-
-
True
True
- 0
+ False
@@ -1304,11 +1326,11 @@ $T will be replaced by auto-not-available timeout
+ Use system _default
True
True
- Use system _default
+ False
True
- 0
True
@@ -1330,6 +1352,9 @@ $T will be replaced by auto-not-available timeout
GTK_FILL
+
+
+
@@ -1348,6 +1373,7 @@ $T will be replaced by auto-not-available timeout
False
False
+ 0
@@ -1355,7 +1381,7 @@ $T will be replaced by auto-not-available timeout
True
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
- GTK_SHADOW_NONE
+ none
True
@@ -1370,20 +1396,14 @@ $T will be replaced by auto-not-available timeout
3
6
6
-
-
-
-
-
-
+ Use _transports icons
True
True
+ False
If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)
- Use _transports icons
True
- 0
True
@@ -1435,12 +1455,12 @@ $T will be replaced by auto-not-available timeout
+ Ma_nage...
True
True
+ False
Configure color and font of the interface
- Ma_nage...
True
- 0
@@ -1463,6 +1483,12 @@ $T will be replaced by auto-not-available timeout
GTK_FILL
+
+
+
+
+
+
@@ -1488,7 +1514,7 @@ $T will be replaced by auto-not-available timeout
True
0
- GTK_SHADOW_NONE
+ none
True
@@ -1497,7 +1523,7 @@ $T will be replaced by auto-not-available timeout
True
- 3
+ 4
4
12
6
@@ -1505,40 +1531,22 @@ $T will be replaced by auto-not-available timeout
True
0
- _Incoming message:
+ Contact's nickname:
True
- GTK_JUSTIFY_CENTER
- True
- incoming_msg_colorbutton
+ center
GTK_FILL
-
-
- True
- True
- 0
-
-
-
- 1
- 2
-
-
-
-
True
0
- _Outgoing message:
+ Your nickname:
True
- GTK_JUSTIFY_CENTER
- True
- outgoing_msg_colorbutton
+ center
2
@@ -1547,82 +1555,33 @@ $T will be replaced by auto-not-available timeout
-
-
- True
- True
- 0
-
-
-
- 3
- 4
- GTK_FILL
-
-
-
True
0
_Status message:
True
- GTK_JUSTIFY_CENTER
- True
- status_msg_colorbutton
+ center
- 1
- 2
+ 2
+ 3
GTK_FILL
-
-
- True
- True
- 0
-
-
-
- 1
- 2
- 1
- 2
-
-
-
-
True
0
_URL highlight:
True
- url_msg_colorbutton
2
3
- 1
- 2
- GTK_FILL
-
-
-
-
-
- True
- True
- 0
-
-
-
- 3
- 4
- 1
- 2
+ 2
+ 3
GTK_FILL
@@ -1636,14 +1595,15 @@ $T will be replaced by auto-not-available timeout
False
+ 0
True
True
+ False
False
- 0
@@ -1662,6 +1622,7 @@ $T will be replaced by auto-not-available timeout
False
False
+ 0
@@ -1690,9 +1651,237 @@ $T will be replaced by auto-not-available timeout
4
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+ True
+ 0
+ Contact's message:
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ Your message:
+
+
+ 2
+ 3
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ True
+
+
+ True
+ True
+ False
+ True
+
+
+
+ 0
+
+
+
+
+ True
+ True
+ True
+ 0
+ #000000000000
+
+
+
+ False
+ end
+ 1
+
+
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+
+
+ True
+
+
+ True
+ True
+ False
+ True
+
+
+
+ 0
+
+
+
+
+ True
+ True
+ True
+ 0
+ #000000000000
+
+
+
+ False
+ end
+ 1
+
+
+
+
+ 3
+ 4
+ 1
+ 2
+
+
+
+
+
+
+ True
+
+
+
+
+
+ True
+ True
+ True
+ 0
+ #000000000000
+
+
+
+ False
+ end
+ 1
+
+
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ True
+
+
+
+
+
+ True
+ True
+ True
+ 0
+ #000000000000
+
+
+
+ False
+ end
+ 1
+
+
+
+
+ 1
+ 2
2
3
GTK_FILL
+
+
+
+
+
+ True
+
+
+
+
+
+ True
+ True
+ True
+ 0
+ #000000000000
+
+
+
+ False
+ end
+ 1
+
+
+
+
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+
+ True
+
+
+
+
+
+ True
+ True
+ True
+ 0
+ #000000000000
+
+
+
+ False
+ end
+ 1
+
+
+
+
+ 3
+ 4
+ 2
+ 3
+ GTK_FILL
+
@@ -1727,9 +1916,9 @@ $T will be replaced by auto-not-available timeout
Style
- tab
4
False
+ tab
@@ -1741,7 +1930,7 @@ $T will be replaced by auto-not-available timeout
True
0
- GTK_SHADOW_NONE
+ none
True
@@ -1761,11 +1950,14 @@ Always use Xfce default applications
Custom
+
+ 0
+
0
- GTK_SHADOW_NONE
+ none
True
@@ -1898,6 +2090,7 @@ Custom
False
False
+ 0
@@ -1905,7 +2098,7 @@ Custom
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
- GTK_SHADOW_NONE
+ none
True
@@ -1921,12 +2114,12 @@ Custom
6
+ _Ignore events from contacts not in the roster
True
True
+ False
If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster
- _Ignore events from contacts not in the roster
True
- 0
True
@@ -1936,12 +2129,12 @@ Custom
+ Allow _OS information to be sent
True
True
+ False
If checked, Gajim will allow others to detect the operation system you are using
- Allow _OS information to be sent
True
- 0
True
@@ -1952,12 +2145,12 @@ Custom
+ Log _encrypted chat session
True
True
+ False
If checked, Gajim will keep logs for encrypted messages. Please note that when using E2E encryption the remote party has to agree on logging, else the messages will not be logged.
- Log _encrypted chat session
True
- 0
True
@@ -1991,7 +2184,7 @@ Custom
True
0
- GTK_SHADOW_NONE
+ none
True
@@ -2003,26 +2196,27 @@ Custom
6
+ _Log status changes of contacts
True
True
- _Log status changes of contacts
+ False
True
- 0
True
False
False
+ 0
+ Check on startup if Gajim is the _default Jabber client
True
True
- Check on startup if Gajim is the _default Jabber client
+ False
True
- 0
True
@@ -2057,7 +2251,7 @@ Custom
True
0
- GTK_SHADOW_NONE
+ none
True
@@ -2069,7 +2263,7 @@ Custom
True
True
- 0
+ False
@@ -2088,6 +2282,7 @@ Custom
False
False
+ 0
@@ -2138,28 +2333,36 @@ Custom
Advanced
- tab
5
False
+ tab
+
+ 0
+
True
15
- GTK_BUTTONBOX_END
+ end
+ gtk-close
True
True
True
- gtk-close
+ False
True
- 0
+
+ False
+ False
+ 0
+
diff --git a/data/glade/privacy_list_window.glade b/data/glade/privacy_list_window.glade
index d2d527c76..78704da07 100644
--- a/data/glade/privacy_list_window.glade
+++ b/data/glade/privacy_list_window.glade
@@ -165,6 +165,7 @@
True
+ False
5
@@ -422,6 +423,19 @@ to
3
+
+
+ True
+ True
+ All (including subscription)
+ 0
+ True
+
+
+
+ 4
+
+
2
diff --git a/data/glade/roster_item_exchange_window.glade b/data/glade/roster_item_exchange_window.glade
new file mode 100644
index 000000000..0bad50833
--- /dev/null
+++ b/data/glade/roster_item_exchange_window.glade
@@ -0,0 +1,140 @@
+
+
+
+
+
+ Roster Item Exchange
+
+
+ True
+ 6
+ vertical
+ 8
+
+
+ True
+ <b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in your roster.
+ True
+ center
+ True
+
+
+ False
+ 4
+ 0
+
+
+
+
+ True
+ True
+ automatic
+ automatic
+
+
+ True
+ True
+ False
+ center
+ False
+ Message Body <currently unused, so it's hidden by default>
+
+
+
+
+ 1
+
+
+
+
+ True
+ True
+ automatic
+ automatic
+
+
+ True
+ True
+ True
+
+
+
+
+ 2
+
+
+
+
+ True
+ 12
+ end
+
+
+ gtk-cancel
+ True
+ True
+ True
+ True
+
+
+
+ False
+ False
+ 0
+
+
+
+
+ True
+ True
+ True
+
+
+
+ True
+
+
+ True
+ 3
+
+
+ True
+ 1
+ gtk-ok
+
+
+ 0
+
+
+
+
+ True
+ 0
+ _OK
+ True
+
+
+ 1
+
+
+
+
+
+
+
+
+ False
+ False
+ 1
+
+
+
+
+ False
+ 3
+
+
+
+
+
+
diff --git a/data/glade/roster_window.glade b/data/glade/roster_window.glade
index 86884e209..e60b612b9 100644
--- a/data/glade/roster_window.glade
+++ b/data/glade/roster_window.glade
@@ -250,7 +250,7 @@