Merge lp:~logan/ubuntu/raring/syncmaildir/debian-merge into lp:ubuntu/raring/syncmaildir

[Logan Rosen]

[Andrew Starr-Bochicchio (andrewsomething)]

Looks good! Uploading.

review: Approve

=== modified file '.pc/fix-ftbfs-libgthread-link.patch/Makefile'
--- .pc/fix-ftbfs-libgthread-link.patch/Makefile	2011-12-13 07:43:14 +0000
+++ .pc/fix-ftbfs-libgthread-link.patch/Makefile	2012-11-26 22:25:07 +0000
@@ -3,12 +3,12 @@
 # should care about them
 
 PROJECTNAME=syncmaildir
-VERSION=1.2.2
-COPYRIGHT=© 2008-2011 Enrico Tassi <[e-mail]>
+VERSION=1.2.5
+COPYRIGHT=© 2008-2012 Enrico Tassi <[e-mail]>
 BINARIES=mddiff smd-applet
 MANPAGES1=mddiff.1 smd-server.1 smd-client.1 \
 	 smd-pull.1 smd-push.1 smd-loop.1 smd-applet.1 smd-translate.1 \
-	 smd-check-conf.1
+	 smd-check-conf.1 smd-restricted-shell.1 smd-uniform-names.1
 MANPAGES5=smd-config.5
 HTML=index.html design.html hooks.html
 DESTDIR=
@@ -17,17 +17,17 @@
 SF_WEB=htdocs
 TEST_SIZE=100
 TEST_MAILBOX=misc/Mail.TEST.tgz
-TEST_SUITES=mddiff client-server pull-push
+TEST_SUITES=mddiff client-server pull-push migration
 BENCH_SIZE=25000
 BENCH_MAILBOX=misc/Mail.BENCH.tgz
 BENCH_SUITES=benchmarks
 PKG_GTK=gtk+-3.0 
 SMD_APPLET_C=smd-applet.c 
 PKGS_VALA=glib-2.0 $(PKG_GTK) libnotify gconf-2.0 gee-1.0 gio-2.0
-MIN_GLIB_VERSION=2.19.1
-PKGCONFIG_CHECK_GLIB_VERSION=--atleast-version=$(MIN_GLIB_VERSION) glib-2.0
+TARGET_GLIB=2.32
+PKGCONFIG_CHECK_GLIB_VERSION=--atleast-version=$(TARGET_GLIB) glib-2.0
 PKGCONFIG_GLIB_VERSION=--modversion glib-2.0
-VALAC=valac-0.14
+VALAC=valac-0.16
 H=@
 
 # ----------------------------------------------------------------------------
@@ -41,8 +41,7 @@
 SSH=ssh
 LUAV=5.1
 LUA=lua$(LUAV)
-CFLAGS=-O2 -Wall -Wextra -Wcast-align -g -I .
-CFLAGS_VALA=-O2 -w -g -I . 
+CFLAGS=-O2 -Wall -Wextra -Wcast-align -g
 PKG_FLAGS=
 
 # ----------------------------------------------------------------------------
@@ -66,6 +65,7 @@
 	$H if which $(VALAC) >/dev/null; then \
 		echo "VALAC $^"; \
 		$(VALAC) -C $^ --thread --vapidir=./ \
+			--target-glib=$(TARGET_GLIB) \
 			--pkg posix $(patsubst %,--pkg %,$(PKGS_VALA)); \
 	elif [ -e smd-applet.c ]; then \
 		echo "** No $(VALAC), reusing precompiled .c files"; \
@@ -82,18 +82,19 @@
 mddiff: mddiff.c smd-config.h
 	@echo CC $<
 	$H $(CC) $(CFLAGS) $< -o $@ \
-		`pkg-config $(PKG_FLAGS) --cflags --libs glib-2.0` 
+		`pkg-config $(PKG_FLAGS) --cflags --libs glib-2.0` $(LDFLAGS)
 
 smd-applet: $(SMD_APPLET_C) smd-config.h
 	@echo CC $<
-	$H $(CC) $(CFLAGS_VALA) $< -o $@ \
-		`pkg-config $(PKG_FLAGS) --cflags --libs $(PKGS_VALA)`
+	$H $(CC) $(CFLAGS) -w $< -o $@ \
+		`pkg-config $(PKG_FLAGS) --cflags --libs $(PKGS_VALA)` \
+		$(LDFLAGS)
 
 check-build: check-w-gcc check-w-$(VALAC)
 	$H pkg-config $(PKGCONFIG_CHECK_GLIB_VERSION) || \
 		(echo glib version too old: \
 			`pkg-config $(PKGCONFIG_GLIB_VERSION)`; \
-		 echo required version: $(MIN_GLIB_VERSION); \
+		 echo required version: $(TARGET_GLIB); \
 		 false)
 
 check-run: check-w-$(LUA) check-w-bash 
@@ -171,15 +172,17 @@
 	$(call install-replacing,smd-push,bin)
 	$(call install-replacing,smd-translate,bin)
 	$(call install-replacing,smd-check-conf,bin)
+	$(call install-replacing,smd-uniform-names,bin)
+	$(call install-replacing,smd-restricted-shell,bin)
 	$(call install-replacing,smd-loop,bin)
 	$(call install-replacing,smd-common,share/$(PROJECTNAME))
 	$(call install-replacing,syncmaildir.lua,share/lua/$(LUAV))
 
 install-misc: $(MANPAGES1) $(MANPAGES5)
 	mkdir -p $(DESTDIR)/etc/xdg/autostart
-	cp smd-applet.desktop $(DESTDIR)/etc/xdg/autostart
 	$(call mkdir-p,share/applications)
 	$(call install,smd-applet-configure.desktop,share/applications)
+	$(call install,smd-applet.desktop,share/applications)
 	$(call install,smd-applet.ui,share/$(PROJECTNAME)-applet)
 	$(call mkdir-p,share/man/man1)
 	$(call mkdir-p,share/man/man5)
@@ -255,27 +258,31 @@
 	$H $(MAKE) $* \
 		BINARIES="$(subst smd-applet,,$(BINARIES))" \
 		MANPAGES1="$(subst smd-applet.1,,$(MANPAGES1))" \
-		PREFIX="$(PREFIX)" VALAC=ls H=$H
+		PREFIX="$(PREFIX)" VALAC=ls H=$H \
+		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 static/%:
 	$H $(MAKE) $* \
 		CFLAGS="$(CFLAGS) -static " \
 		PKG_FLAGS="$(PKG_FLAGS) --static " \
-		PREFIX="$(PREFIX)" H=$H
+		PREFIX="$(PREFIX)" H=$H LDFLAGS="$(LDFLAGS)"
 
 gnome2/%:
 	$H gunzip -c misc/smd-applet-1.0.0.c.gz > misc/smd-applet-1.0.0.c
 	$H $(MAKE) $* \
-		SMD_APPLET_C=misc/smd-applet-1.0.0.c PKG_GTK=gtk+-2.0
+		SMD_APPLET_C=misc/smd-applet-1.0.0.c PKG_GTK=gtk+-2.0 \
+		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" TARGET_GLIB="2.19.1"
 
 
 osx/%:
-	$H $(MAKE) $* SED=sed PREFIX="$(PREFIX)" H=$H
+	$H $(MAKE) $* SED=sed PREFIX="$(PREFIX)" H=$H \
+		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 abspath/%:
 	$H $(MAKE) $* SED=/bin/sed \
 		XDELTA=/usr/bin/xdelta SSH=/usr/bin/ssh \
-		PREFIX="$(PREFIX)" H=$H
+		PREFIX="$(PREFIX)" H=$H \
+		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 .PHONY : update-smd-config
 # eof

=== modified file 'ChangeLog'
--- ChangeLog	2011-12-01 16:17:28 +0000
+++ ChangeLog	2012-11-26 22:25:07 +0000
@@ -1,3 +1,86 @@
+11/06/2012 - minor fix release - version 1.2.5
+	* mddiff:
+	  - Hashtable from body sha1 to mail now holds a list of
+	    mails so that COPY actions are generated whenever possible.
+	    It used to be the case that on body collisions a COPYBODY
+	    action could have been generated instead.
+	  - Fix: --sha1sum works on empty files too
+	  - Better error messages for malformed db-file (including line number)
+	* syncmaildir.lua:
+	  - During handshake handle the case in which mddiff is unable to
+	    sha1sum the db file
+	  - Code for calling external tools refactored
+	  - Optimize calls to external translator spawning only
+	    one process (translators must be line bufferd now)
+	* smd-uniform-names, smd-client:
+	  - Fix escaping of ~ that was always performed on the local host
+	  - Handle server ERROR messages while computing renamings
+	  - Generate better smd-rename.sh script that calls cp instead
+	    of mv if the source message has to be used later on
+	* smd-client:
+	  - Mode --dry-run prints the list of messages transferred over the
+	    network
+
+28/05/2012 - minor feature improvement - version 1.2.4
+	* smd-uniform-names:
+	  - New tool to ease the migration from offlineimap. 
+	    When the mailboxes have roughly the same content but emails are
+	    named differently this tool generates a shell script that
+	    renames local mails to conform to the remote mailbox
+	* smd-applet:
+	  - XDG compliant autostart, with a button in the options window
+	  - Target GLib 2.32 and Gtk+ 3.0 for the .ui file
+	* smd-push, smd-pull, smd-common, smd-client, smd-server:
+	  - New option -n --nodelete to not propagate deletions
+	  - Support for local synchronizations: -l option to smd-client.
+	    It is now possible to set SERVERNAME=localhost and pass -l
+	    to smd-client (via SMDCLIENTOPTS) to obtain a synchronization
+	    on the same host. (Thanks Miguel Fernandes for the idea
+	    and his time for testing/debugging my prototype implementation).
+	  - Do not use ssh if it is a local synchronization
+	  - Support for SMDCLIENTOPTS and SMDSERVEROPTS in config file
+	  - Code refactoring for external tools invocation
+	  - Put a minimal README in the hooks/ directory to tell the user
+	    what these directories are for
+	  - Fix inconsistency in escaping of the value of TRANSLATOR_LR/RL
+	  - Turn off grep buffered mode for progress reporting (Thanks
+	    Stefano Zacchiroli for enlightening me on the subject)
+	* smd-translate:
+	  - Fix bug in removing trailing / or " or ' from the
+	    MAILBOX_REMOTE/LOCAL value
+	  - New trasnlator mode: 'move'. It just replaces MAILBOX_LOCAL
+	    with MAILBOX_REMOTE and vice versa, useful for local
+	    synchronizations
+	* mddiff:
+	  - New option -n --no-delete to not generate DELETE actions
+	* Makefile:
+	  - Fix templates: C/LDFLAGS are now correctly preserved
+	* README:
+	  - Update copyright dates to include 2012
+	  - Document smd-uniform-names
+
+03/03/2012 - minor feature improvement - version 1.2.3
+	* smd-pull, smd-push:
+	  - print progress report if -v is passed
+	* smd-client:
+	  - generate progress report if verbose mode is on
+	  - generate verbose progress report during first synchronization
+	  - log "translating:" only when meaningful (i.e. not a noop)
+	* smd-common:
+	  - create a new fifo for progress reporters
+	  - standard progress reporter printing on stdout PROGRESS: lines
+	  - use mddiff as mkdir and mkfifo (no more calls to mkfifo and mkdir)
+	* smd-applet:
+	  - ported to vala 0.16
+	* smd-loop:
+	  - fixed cleanup process (Thanks Ralf Schmitt for the patch)
+	* smd-restricted-shell:
+	  - new utility to be used in .ssh/authorized_keys, see the command=
+	    option (Thanks Luca Capello for the idea and the documentation)
+	* syncmaildir.lua:
+	  - When mddiff fails to sha1 a message print the file name (thanks 
+	    Zhengdao Wang for the idea)
+
 01/12/2011 - minor fix - version 1.2.2
 	* smd-config.5:
 	  - fixed typo and use `quotes' to delimit strings

=== modified file 'DESIGN'
--- DESIGN	2011-12-01 16:17:28 +0000
+++ DESIGN	2012-11-26 22:25:07 +0000
@@ -271,7 +271,7 @@
 statistical one respectively. Then a list of improperly called tags is output.
 Their meaning should be easy to guess.
 
-    <M>    ::= "error::" <ET> | "stats::" <ST>
+    <M>    ::= "error::" <ET> | "stats::" <ST> | "stats::" <DR>
     <ET>   ::= "context(" <STR> ")" 
                "probable-cause(" <STR> ")"
                "human-intervention(" <HI> ")"
@@ -283,7 +283,13 @@
     <A>    ::= "run(" <STR> ")" 
             |  "display-mail(" <STR> ")" 
             |  "display-permissions(" <STR> ")"
-    <ET>   ::= "new-mails(" <NUM> ")" <SPC> "del-mails(" <NUM> ")"
+    <ST>   ::= "new-mails(" <NUM> ")" <SPC>
+               "del-mails(" <NUM> ")" <SPC>
+               "bytes-received(" <NUM> ")" <SPC>
+               "xdelta-received(" <NUM> ")" <SPC>
+               "xdelta-received(" <NUM> ")"
+    <DR>   ::= "mail-transferred(" <ML> ")"
+    <ML>   ::= <STR> | <STR> " , " <ML>
     <NUM>  ::= `[0-9]+`
     <SPC>  ::= ` *,? *`
 

=== modified file 'Makefile'
--- Makefile	2011-12-13 07:43:14 +0000
+++ Makefile	2012-11-26 22:25:07 +0000
@@ -3,12 +3,12 @@
 # should care about them
 
 PROJECTNAME=syncmaildir
-VERSION=1.2.2
-COPYRIGHT=© 2008-2011 Enrico Tassi <[e-mail]>
+VERSION=1.2.5
+COPYRIGHT=© 2008-2012 Enrico Tassi <[e-mail]>
 BINARIES=mddiff smd-applet
 MANPAGES1=mddiff.1 smd-server.1 smd-client.1 \
 	 smd-pull.1 smd-push.1 smd-loop.1 smd-applet.1 smd-translate.1 \
-	 smd-check-conf.1
+	 smd-check-conf.1 smd-restricted-shell.1 smd-uniform-names.1
 MANPAGES5=smd-config.5
 HTML=index.html design.html hooks.html
 DESTDIR=
@@ -17,17 +17,17 @@
 SF_WEB=htdocs
 TEST_SIZE=100
 TEST_MAILBOX=misc/Mail.TEST.tgz
-TEST_SUITES=mddiff client-server pull-push
+TEST_SUITES=mddiff client-server pull-push migration
 BENCH_SIZE=25000
 BENCH_MAILBOX=misc/Mail.BENCH.tgz
 BENCH_SUITES=benchmarks
 PKG_GTK=gtk+-3.0 
 SMD_APPLET_C=smd-applet.c 
 PKGS_VALA=glib-2.0 $(PKG_GTK) libnotify gconf-2.0 gee-1.0 gio-2.0 gthread-2.0
-MIN_GLIB_VERSION=2.19.1
-PKGCONFIG_CHECK_GLIB_VERSION=--atleast-version=$(MIN_GLIB_VERSION) glib-2.0
+TARGET_GLIB=2.32
+PKGCONFIG_CHECK_GLIB_VERSION=--atleast-version=$(TARGET_GLIB) glib-2.0
 PKGCONFIG_GLIB_VERSION=--modversion glib-2.0
-VALAC=valac-0.14
+VALAC=valac-0.16
 H=@
 
 # ----------------------------------------------------------------------------
@@ -41,8 +41,7 @@
 SSH=ssh
 LUAV=5.1
 LUA=lua$(LUAV)
-CFLAGS=-O2 -Wall -Wextra -Wcast-align -g -I .
-CFLAGS_VALA=-O2 -w -g -I . 
+CFLAGS=-O2 -Wall -Wextra -Wcast-align -g
 PKG_FLAGS=
 
 # ----------------------------------------------------------------------------
@@ -66,6 +65,7 @@
 	$H if which $(VALAC) >/dev/null; then \
 		echo "VALAC $^"; \
 		$(VALAC) -C $^ --thread --vapidir=./ \
+			--target-glib=$(TARGET_GLIB) \
 			--pkg posix $(patsubst %,--pkg %,$(PKGS_VALA)); \
 	elif [ -e smd-applet.c ]; then \
 		echo "** No $(VALAC), reusing precompiled .c files"; \
@@ -82,18 +82,19 @@
 mddiff: mddiff.c smd-config.h
 	@echo CC $<
 	$H $(CC) $(CFLAGS) $< -o $@ \
-		`pkg-config $(PKG_FLAGS) --cflags --libs glib-2.0` 
+		`pkg-config $(PKG_FLAGS) --cflags --libs glib-2.0` $(LDFLAGS)
 
 smd-applet: $(SMD_APPLET_C) smd-config.h
 	@echo CC $<
-	$H $(CC) $(CFLAGS_VALA) $< -o $@ \
-		`pkg-config $(PKG_FLAGS) --cflags --libs $(PKGS_VALA)`
+	$H $(CC) $(CFLAGS) -w $< -o $@ \
+		`pkg-config $(PKG_FLAGS) --cflags --libs $(PKGS_VALA)` \
+		$(LDFLAGS)
 
 check-build: check-w-gcc check-w-$(VALAC)
 	$H pkg-config $(PKGCONFIG_CHECK_GLIB_VERSION) || \
 		(echo glib version too old: \
 			`pkg-config $(PKGCONFIG_GLIB_VERSION)`; \
-		 echo required version: $(MIN_GLIB_VERSION); \
+		 echo required version: $(TARGET_GLIB); \
 		 false)
 
 check-run: check-w-$(LUA) check-w-bash 
@@ -171,15 +172,17 @@
 	$(call install-replacing,smd-push,bin)
 	$(call install-replacing,smd-translate,bin)
 	$(call install-replacing,smd-check-conf,bin)
+	$(call install-replacing,smd-uniform-names,bin)
+	$(call install-replacing,smd-restricted-shell,bin)
 	$(call install-replacing,smd-loop,bin)
 	$(call install-replacing,smd-common,share/$(PROJECTNAME))
 	$(call install-replacing,syncmaildir.lua,share/lua/$(LUAV))
 
 install-misc: $(MANPAGES1) $(MANPAGES5)
 	mkdir -p $(DESTDIR)/etc/xdg/autostart
-	cp smd-applet.desktop $(DESTDIR)/etc/xdg/autostart
 	$(call mkdir-p,share/applications)
 	$(call install,smd-applet-configure.desktop,share/applications)
+	$(call install,smd-applet.desktop,share/applications)
 	$(call install,smd-applet.ui,share/$(PROJECTNAME)-applet)
 	$(call mkdir-p,share/man/man1)
 	$(call mkdir-p,share/man/man5)
@@ -255,27 +258,31 @@
 	$H $(MAKE) $* \
 		BINARIES="$(subst smd-applet,,$(BINARIES))" \
 		MANPAGES1="$(subst smd-applet.1,,$(MANPAGES1))" \
-		PREFIX="$(PREFIX)" VALAC=ls H=$H
+		PREFIX="$(PREFIX)" VALAC=ls H=$H \
+		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 static/%:
 	$H $(MAKE) $* \
 		CFLAGS="$(CFLAGS) -static " \
 		PKG_FLAGS="$(PKG_FLAGS) --static " \
-		PREFIX="$(PREFIX)" H=$H
+		PREFIX="$(PREFIX)" H=$H LDFLAGS="$(LDFLAGS)"
 
 gnome2/%:
 	$H gunzip -c misc/smd-applet-1.0.0.c.gz > misc/smd-applet-1.0.0.c
 	$H $(MAKE) $* \
-		SMD_APPLET_C=misc/smd-applet-1.0.0.c PKG_GTK=gtk+-2.0
+		SMD_APPLET_C=misc/smd-applet-1.0.0.c PKG_GTK=gtk+-2.0 \
+		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" TARGET_GLIB="2.19.1"
 
 
 osx/%:
-	$H $(MAKE) $* SED=sed PREFIX="$(PREFIX)" H=$H
+	$H $(MAKE) $* SED=sed PREFIX="$(PREFIX)" H=$H \
+		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 abspath/%:
 	$H $(MAKE) $* SED=/bin/sed \
 		XDELTA=/usr/bin/xdelta SSH=/usr/bin/ssh \
-		PREFIX="$(PREFIX)" H=$H
+		PREFIX="$(PREFIX)" H=$H \
+		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 .PHONY : update-smd-config
 # eof

=== modified file 'README'
--- README	2011-12-01 16:17:28 +0000
+++ README	2012-11-26 22:25:07 +0000
@@ -3,7 +3,7 @@
 
 Sync Mail Dir (`smd`) is a set of tools to synchronize a pair of mailboxes
 in Maildir format.  It is Free Software, released under the terms of GPLv3,
-Copyright © 2008-2011 Enrico Tassi.
+Copyright © 2008-2012 Enrico Tassi.
 
 It differs from other solutions in terms of performances and lower
 installation requirements.  The widespread solution IMAP-server plus
@@ -76,6 +76,14 @@
   performs a quick check that a setup, especially when it involves
   some folders renaming, actually works as expected. This tool is meant to
   be manually called by the user to check a given configuration file.
+- [`smd-restricted-shell`](smd-restricted-shell.1.html)
+  only meant to be used in conjunction with an SSH key and specifically in
+  the remote OpenSSH's authorized_keys file to restrict the commands allowed.
+- [`smd-uniform-names`](smd-uniform-names.1.html)
+  meant to be used before the first synchronization, when the content of
+  the local and remote mailboxes is similar, but mails are named differently.
+  This is often the case when migrating from offlineimap, that encodes
+  some metadata in the local file names.
 - [`smd-loop`](smd-loop.1.html) 
   runs runs smd-push and smd-pull at regular intervals as defined
   by the user in a configuration file, in the style of a crontab, but
@@ -198,6 +206,20 @@
 Advanced Usage
 ==============
 
+### restricted remote shell
+
+Version `1.2.3` comes with `smd-restricted-shell` to improve security,
+especially when using password-less SSH keys.  This tool takes
+advantage of the OpenSSH command= option, which permits to restrict
+the command that is allowed to be executed on the remote host when the
+login is performed using a particular SSH key.
+
+Once you have identified in the ~/.ssh/authorized_keys on the remote
+host the SSH key you use together with Sync Mail Dir, prepend the line
+as in the following example:
+
+    command="/usr/bin/smd-restricted-shell" ssh-rsa AAAABBBBCCCC....
+
 ### multiple servers
 
 From verion `0.9.4` multiple configuration files are supported.  This means
@@ -234,7 +256,7 @@
    `smd-push/pull` will return after the hooks terminate
 
 Hooks should not fail, if they do so then `smd-push/pull` will fail too.
-Sample hooks are available in the source tarball under the `sample-hooks/`.
+Sample hooks are available in the source tarball under `sample-hooks/`.
 Some documentation about [available hooks](hooks.html) is also present.
 
 ### folder renaming
@@ -275,7 +297,11 @@
 could be:
 
     #!/bin/sh
-    sed 's/^Maildir\(.*\)$/Mail\1/' | sed 's?/\.?/?'
+    sed --unbuffered -e 's/^Maildir\(.*\)$/Mail\1/' -e 's?/\.?/?'
+
+Note the `--unbuffered`: translators should not work in buffered mode.
+I.e. when given a line in input (terminated by `\n`) they must output a
+line without expecting any additional input.
 
 Translating the way back is trickier, since the leading `.` must be
 added only to sub-folders:
@@ -283,9 +309,9 @@
     #!/bin/sh
     t() {
         if [ "$1" = Mail/cur -o "$1" = Mail/tmp -o "$1" = Mail/new ]; then
-            echo $1 | sed 's?^Mail/\(.*\)?Maildir/\1?'
+            echo $1 | sed --unbuffered 's?^Mail/\(.*\)?Maildir/\1?'
         else
-            echo $1 | sed 's?^Mail/\(.*\)?Maildir/.\1?'
+            echo $1 | sed --unbuffered 's?^Mail/\(.*\)?Maildir/.\1?'
         fi
     }
     while read M; do t "$M"; done
@@ -339,6 +365,46 @@
 the matching succeeds the derectory and all its subdirectories are skipped.
 Thus there is no need to specify a trailing '`/*`' in every expression.
 
+### local synchronization
+
+If the remote and local mailboxes are on the same filesystem, one has
+to specify the `-l` option to `smd-client`. This option can be specified
+adding to the configuration file `SMDCLIENTOPTS=-l` and set 
+`SERVERNAME=localhost`. 
+
+### avoid deletions 
+
+In some cases, usually unidirectional synchronizations, one may want
+to not propagate deletions. E.g. one keeps a slim working mailbox but
+pushes to a backup mailbox to save every email. For that scenario
+smd-pull and smd-push accept a -n, --no-delete, option. 
+To avoid specifying this option every time one can put it in the
+configuration file:
+
+    SMDSERVEROPTS=-n
+
+### migration from offlineimap
+
+Migrating from offlineimap may require an extra step, since the local and
+remote mailboxes may not only differ in their names and sub folders, but also
+in the names of the single mail messages. Indeed offlineimap encodes some
+metadata in the file names local to the client. The `smd-translate` utility
+translates only folder names and not messages names.
+
+To uniform the names used on the client to the ones used on the server you can
+do as follows:
+
+1. Remove `X-OfflineIMAP` from every mail that contains it.
+   Often the same email has that extra header line on the server but not on
+   the client. A not so dirty way of achieving that is the following snippet:
+   `find Mail -type f -exec sed -i '/^X-OfflineIMAP/d' {} \;`
+
+2. Run the `smd-uniform-names` utility.
+   This utility has to be run before the first synchronization, but after smd
+   is configured and `smd-check-conf` has reported no errors.
+   `smd-uniform-names` does not modify the mailbox, but instead it generates a
+   shell script that you can run to perform the renaming.
+
 Installation
 ============
 
@@ -356,7 +422,6 @@
 install text mode only syncmaildir utilities on an MacOSX platform.
 
 Runtime dependencies are: `ssh`, `xdelta`, `lua5.1` and `bash`.
-Moreover some core utilities are also needed: `sha1sum`, `mkfifo` and `mkdir`.
 
 Design
 ======

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-13 07:43:14 +0000
+++ debian/changelog	2012-11-26 22:25:07 +0000
@@ -1,3 +1,34 @@
+syncmaildir (1.2.5-1ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - fix-ftbfs-libgthread-link.patch: Fix FTBFS with libgthread linking.
+  * Refreshed fix-ftbfs-libgthread-link.patch.
+
+ -- Logan Rosen <[e-mail]>  Mon, 26 Nov 2012 17:14:33 -0500
+
+syncmaildir (1.2.5-1) unstable; urgency=low
+
+  * New upstream release 
+
+ -- Enrico Tassi <[e-mail]>  Mon, 11 Jun 2012 12:15:44 +0200
+
+syncmaildir (1.2.4-1) unstable; urgency=low
+
+  * New upstream release
+  * NEWS.Debian announces that smd-applet is able to handle XDG compliant
+    autostrat in user's session (no more system wide)
+
+ -- Enrico Tassi <[e-mail]>  Mon, 28 May 2012 19:39:23 +0200
+
+syncmaildir (1.2.3-1) unstable; urgency=low
+
+  * New upstream release including the new utility smd-restricted-shell to
+    be used in conjunction with .ssh/authorized_keys command option
+  * This version of the software emits progress reports when run in verbose
+    mode (Closes: #659263)
+
+ -- Enrico Tassi <[e-mail]>  Sat, 03 Mar 2012 12:55:55 +0100
+
 syncmaildir (1.2.2-1ubuntu1) precise; urgency=low
 
   * Fix FTBFS with libgthread linking.
@@ -8,7 +39,7 @@
 
   * New upstream release
 
- -- Enrico Tassi <[e-mail]>  Thu, 01 Dec 2011 16:17:28 +0100
+ -- Enrico Tassi <[e-mail]>  Sat, 25 Feb 2012 13:57:47 +0100
 
 syncmaildir (1.2.1-1) unstable; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2011-12-13 07:43:14 +0000
+++ debian/control	2012-11-26 22:25:07 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Enrico Tassi <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~), txt2man, pkg-config, libglib2.0-dev (>= 2.19.1), libgtk-3-dev, libnotify-dev (>= 0.7), libgconf2-dev, libgee-dev, lua5.1, xdelta, moreutils (>= 0.38)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/collab-maint/syncmaildir.git
 Vcs-Browser:  http://git.debian.org/?p=collab-maint/syncmaildir.git
 Homepage: http://syncmaildir.sourceforge.net
@@ -32,7 +32,7 @@
 
 Package: syncmaildir-applet
 Architecture: any
-Depends: syncmaildir (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgnome2-0
+Depends: syncmaildir (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: Sync Mail Dir GNOME applet
  Sync Mail Dir is a set of utilities to synchronize a pair of mail boxes
  in Maildir format, using SSH to transfer data. 

=== modified file 'debian/patches/fix-ftbfs-libgthread-link.patch'
--- debian/patches/fix-ftbfs-libgthread-link.patch	2011-12-13 07:43:14 +0000
+++ debian/patches/fix-ftbfs-libgthread-link.patch	2012-11-26 22:25:07 +0000
@@ -1,13 +1,11 @@
-Index: fix-ftbfs-precise/Makefile
-===================================================================
---- fix-ftbfs-precise.orig/Makefile	2011-12-13 06:02:56.907864000 +0000
-+++ fix-ftbfs-precise/Makefile	2011-12-13 06:05:00.689731641 +0000
+--- a/Makefile
++++ b/Makefile
 @@ -23,7 +23,7 @@
  BENCH_SUITES=benchmarks
  PKG_GTK=gtk+-3.0 
  SMD_APPLET_C=smd-applet.c 
 -PKGS_VALA=glib-2.0 $(PKG_GTK) libnotify gconf-2.0 gee-1.0 gio-2.0
 +PKGS_VALA=glib-2.0 $(PKG_GTK) libnotify gconf-2.0 gee-1.0 gio-2.0 gthread-2.0
- MIN_GLIB_VERSION=2.19.1
- PKGCONFIG_CHECK_GLIB_VERSION=--atleast-version=$(MIN_GLIB_VERSION) glib-2.0
+ TARGET_GLIB=2.32
+ PKGCONFIG_CHECK_GLIB_VERSION=--atleast-version=$(TARGET_GLIB) glib-2.0
  PKGCONFIG_GLIB_VERSION=--modversion glib-2.0

=== modified file 'debian/rules'
--- debian/rules	2011-03-04 10:53:56 +0000
+++ debian/rules	2012-11-26 22:25:07 +0000
@@ -9,7 +9,12 @@
 FLAVOUR=abspath/
 
 override_dh_auto_build:
-	$(MAKE) $(FLAVOUR)all PREFIX=usr H=
+	$(MAKE) $(FLAVOUR)all PREFIX=usr H= \
+		CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" \
+		LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)"
+
+	# Use this after weezy
+	#	$(shell dpkg-buildflags --export=configure)
 	
 override_dh_auto_install:
 	$(MAKE) $(FLAVOUR)install DESTDIR=debian/tmp PREFIX=usr H=
@@ -17,3 +22,6 @@
 override_dh_auto_test:
 	VALGRIND=" " $(MAKE) --no-print-directory $(FLAVOUR)test PREFIX=usr H=
 
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f smd-config.h

=== added file 'debian/syncmaildir-applet.NEWS'
--- debian/syncmaildir-applet.NEWS	1970-01-01 00:00:00 +0000
+++ debian/syncmaildir-applet.NEWS	2012-11-26 22:25:07 +0000
@@ -0,0 +1,13 @@
+syncmaildir (1.2.4-1) unstable; urgency=low
+
+    The syncmaildir-applet package does not ship an autostart file any
+    longer. It used to ship /etc/xdg/autostart/smd-applet.desktop
+    
+    smd-applet is now able to register itself in the set of per-user
+    automatically started applications in ~/.config/autostart/
+
+    To start smd-applet automatically start it by hand and right click
+    on the notification icon to open the options menu. There you will find
+    a "Start automatically" checkbox.
+
+ -- Enrico Tassi <[e-mail]>  Mon, 21 May 2012 17:41:17 +0200

=== modified file 'debian/syncmaildir-applet.install'
--- debian/syncmaildir-applet.install	2009-07-26 18:56:41 +0000
+++ debian/syncmaildir-applet.install	2012-11-26 22:25:07 +0000
@@ -1,4 +1,3 @@
 usr/bin/smd-applet
 usr/share/syncmaildir-applet/smd-applet.ui
-etc/xdg/autostart/smd-applet.desktop
 usr/share/applications/*

=== modified file 'debian/syncmaildir.install'
--- debian/syncmaildir.install	2011-09-07 11:02:36 +0000
+++ debian/syncmaildir.install	2012-11-26 22:25:07 +0000
@@ -6,6 +6,8 @@
 usr/bin/smd-loop
 usr/bin/smd-translate
 usr/bin/smd-check-conf
+usr/bin/smd-restricted-shell
+usr/bin/smd-uniform-names
 usr/share/lua/5.1/syncmaildir.lua
 usr/share/syncmaildir/smd-common
 usr/share/doc/syncmaildir/

=== modified file 'debian/syncmaildir.manpages'
--- debian/syncmaildir.manpages	2011-09-07 11:02:36 +0000
+++ debian/syncmaildir.manpages	2012-11-26 22:25:07 +0000
@@ -7,3 +7,5 @@
 smd-translate.1
 smd-config.5
 smd-check-conf.1
+smd-restricted-shell.1
+smd-uniform-names.1

=== modified file 'mddiff.1.txt'
--- mddiff.1.txt	2011-12-01 16:17:28 +0000
+++ mddiff.1.txt	2012-11-26 22:25:07 +0000
@@ -2,8 +2,8 @@
   mddiff - computes diff for maildirs
 SYNOPSIS
   mddiff [--max-mailno mno] [--db-file dbf] [-l|--list] [-s|--symlink]
-         [--exclude globexpr] [-v|--verbose] [-d|--dry-run] [--help]
-         [--sha1sum] paths
+         [--exclude globexpr] [-v|--verbose] [-d|--dry-run] 
+         [-n|--no-delete] [--help] [--sha1sum] paths
 DESCRIPTION
   mddiff computes the delta from an old status of a maildir (previously
   recorded in a support file, called db file) and the current status, 
@@ -54,6 +54,11 @@
   entered. If the match is successful, the directory and all its 
   subedirectories are skipped.
 
+  The --no-delete option tells mddiff to not output a DELETE action for
+  files that disappear. Note that a DELETE action is anyway generated for
+  files that are moved (i.e. move is COPY plus DELETE). The result is that
+  deletions are not propagated to the other endpoint.
+
 OPTIONS
   --max-mailno mno      Estimation of max mail message number (defaults to the
                         number of messages in the db-file + 1000 or 500000
@@ -69,6 +74,7 @@
   -s --symlink          Create symlinks for paths read on the input fifo
   -v --verbose          Increase program verbosity (printed on stderr)
   -d --dry-run          Do not generate a new db-file
+  -n --no-delete        Do not track deleted files
   --help                This help screen
 
 NOTES

=== modified file 'mddiff.c'
--- mddiff.c	2011-12-01 16:17:28 +0000
+++ mddiff.c	2012-11-26 22:25:07 +0000
@@ -138,6 +138,8 @@
 	return outbuff;
 }
 
+#define PROMOTE(what,from,to) ((what) = ((what) == (from)) ? (to) : (what))
+
 // flags used to mark struct mail so that at the end of the scanning 
 // we output commands lookig that flag
 enum sight {
@@ -188,6 +190,7 @@
 STATIC int only_mkfifo;
 STATIC int n_excludes;
 STATIC char **excludes;
+STATIC int no_delete;
 
 // ============================ helpers =====================================
 
@@ -431,13 +434,14 @@
 STATIC void load_db(const char* dbname){
 	FILE* fd;
 	int fields;
+	int line=0;
 	char new_dbname[PATH_MAX];
 
 	snprintf(new_dbname,PATH_MAX,"%s.mtime",dbname);
 
 	fd = fopen(new_dbname,"r");
 	if (fd == NULL){
-		WARNING(fopen,"unable to load db file '%s'\n",new_dbname);
+		WARNING(fopen,"unable to open db file '%s'\n",new_dbname);
 		lastcheck = 0L;
 	} else {
 		fields = fscanf(fd,"%1$lu",&lastcheck);
@@ -462,6 +466,7 @@
 		fields = fscanf(fd,
 			"%1$40s %2$40s %3$" tostring(MAX_EMAIL_NAME_LEN) "[^\n]\n",
 			tmpbuff_1, tmpbuff_2, next_name());
+		line++;
 
 		if (fields == EOF) {
 			// deallocate mail entry
@@ -471,7 +476,8 @@
 		
 		// sanity checks
 		if (fields != 3)
-			ERROR(fscanf,"malformed db file '%s', please remove it\n",dbname);
+			ERROR(fscanf, "%s: malformed line %d: %d != 3 fields."
+				" Please remove this db file.\n", dbname, line, fields);
 
 		shatxt(tmpbuff_1, mail(m)->hsha);
 		shatxt(tmpbuff_2, mail(m)->bsha);
@@ -483,7 +489,8 @@
 		mail(m)->seen=NOT_SEEN;
 
 		// store it in the hash tables
-		g_hash_table_insert(bsha2mail,GPTR(m),GPTR(m));
+		g_hash_table_insert(bsha2mail,GPTR(m),
+			g_slist_prepend(g_hash_table_lookup(bsha2mail,GPTR(m)),GPTR(m)));
 		g_hash_table_insert(filename2mail,GPTR(m),GPTR(m));
 		
 	} 
@@ -533,9 +540,10 @@
 	unsigned char *addr,*next;
 	int fd;
 	struct stat sb;
-	mail_t alias, bodyalias, m;
+	mail_t alias, m;
 	GChecksum* ctx;
 	gsize ctx_len;
+	GSList *bodyaliases = NULL;
 
 	m = alloc_mail();
 	snprintf(next_name(), MAX_EMAIL_NAME_LEN,"%s/%s",dir,file);
@@ -618,18 +626,25 @@
 		}
 	}
 
-	bodyalias = MAIL(g_hash_table_lookup(bsha2mail,GPTR(m)));
+	bodyaliases = g_hash_table_lookup(bsha2mail,GPTR(m));
 
-	if (bodyalias != 0) {
-		if (hsha_equal(GPTR(bodyalias), GPTR(m))) {
-			COMMAND_COPY(bodyalias,m);
-			mail(m)->seen=SEEN;
-			return;
-		} else {
-			COMMAND_COPYBODY(bodyalias,m);
-			mail(m)->seen=SEEN;
-			return;
+	// some messages with the same body are there
+	if (bodyaliases != NULL) {
+		mail_t firstalias = MAIL(bodyaliases->data);
+		for(; bodyaliases != NULL; bodyaliases = g_slist_next(bodyaliases)) {
+			mail_t bodyalias = MAIL(bodyaliases->data);
+			if (hsha_equal(GPTR(bodyalias), GPTR(m))) {
+				// this one has the same header too
+				COMMAND_COPY(bodyalias,m);
+				PROMOTE(mail(bodyalias)->seen, NOT_SEEN, MOVED);
+				mail(m)->seen=SEEN;
+				return;
+			}
 		}
+		// no full alias, we just recycle the body
+		COMMAND_COPYBODY(firstalias,m);
+		mail(m)->seen=SEEN;
+		return;
 	}
 
 	// we should add that file
@@ -727,7 +742,11 @@
 	size_t m;
 
 	for(m=1; m < mailno; m++){
-		if (mail(m)->seen == NOT_SEEN) 
+		if (!no_delete && (mail(m)->seen == NOT_SEEN || mail(m)->seen == MOVED))
+			// normally moved or removed mails are deleted
+			COMMAND_DELETE(m);
+		else if (no_delete && mail(m)->seen == MOVED)
+			// if --no-delete only moved mails should be deleted
 			COMMAND_DELETE(m);
 		else 
 			VERBOSE(seen,"STATUS OF %s %s %s IS %s\n",
@@ -808,7 +827,14 @@
 	if (fstat(fd, &sb) == -1) ERROR(fstat,"unable to stat file '%s'\n",file);
 
 	addr = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
-	if (addr == MAP_FAILED) ERROR(mmap, "unable to load '%s'\n",file);
+	if (addr == MAP_FAILED){
+		if (sb.st_size == 0) 
+			// empty file
+			;
+		else 
+			// mmap failed
+			ERROR(mmap, "unable to load '%s'\n",file);
+	}
 
 	// calculate sha1
 	fprintf(stdout, "%s  %s\n", 
@@ -816,7 +842,7 @@
 		file);
 	g_free(sha1);
 	
-	munmap(addr, sb.st_size);
+	if (addr != MAP_FAILED) munmap(addr, sb.st_size);
 	close(fd);
 }
 
@@ -841,6 +867,7 @@
 	{"symlink"   , no_argument      , NULL, 's'},
 	{"verbose"   , no_argument      , NULL, 'v'},
 	{"dry-run"   , no_argument      , NULL, 'd'},
+	{"no-delete" , no_argument      , NULL, 'n'},
 	{"help"      , no_argument      , NULL, 'h'},
 	{NULL        , no_argument      , NULL, 0},
 };
@@ -866,6 +893,7 @@
 			"Symbolic Link generation mode (short -s)",
 			"Increase program verbosity (printed on stderr, short -v)",
 			"Do not generate a new db file (short -d)",
+			"Do not track deletions (short -n)",
 			"This help screen",
 			NULL
 };
@@ -919,7 +947,7 @@
 	g_assert(MAIL(GPTR(1)) == 1);
 
 	for(;;) {
-		c = getopt_long(argc, argv, "vhdls", long_options, &option_index);
+		c = getopt_long(argc, argv, "vhndls", long_options, &option_index);
 		if (c == -1) break; // no more args
 		switch (c) {
 			case OPT_MAX_MAILNO:
@@ -948,6 +976,9 @@
 			case 'd':
 				dry_run = 1;
 			break;
+			case 'n':
+				no_delete = 1;
+			break;
 			case 'l':
 				only_list_subfolders = 1;
 			break;

=== modified file 'smd-applet.c'
--- smd-applet.c	2011-12-01 16:17:28 +0000
+++ smd-applet.c	2012-11-26 22:25:07 +0000
@@ -1,4 +1,4 @@
-/* smd-applet.c generated by valac 0.14.0, the Vala compiler
+/* smd-applet.c generated by valac 0.16.0, the Vala compiler
  * generated from smd-applet.vala, do not modify */
 
 /* Released under the terms of GPLv3 or at your option any later version.*/
@@ -21,7 +21,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <sys/wait.h>
-#include <smd-config.h>
+#include "smd-config.h"
 #include <gobject/gvaluecollector.h>
 
 
@@ -62,7 +62,7 @@
 typedef struct _smdApplet smdApplet;
 typedef struct _smdAppletClass smdAppletClass;
 typedef struct _smdAppletPrivate smdAppletPrivate;
-#define _g_mutex_free0(var) ((var == NULL) ? NULL : (var = (g_mutex_free (var), NULL)))
+#define _g_thread_unref0(var) ((var == NULL) ? NULL : (var = (g_thread_unref (var), NULL)))
 #define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 #define _smd_applet_unref0(var) ((var == NULL) ? NULL : (var = (smd_applet_unref (var), NULL)))
@@ -137,7 +137,7 @@
 	GThread* thread;
 	gboolean thread_die;
 	GPid pid;
-	GMutex* events_lock;
+	GMutex events_lock;
 	GeeArrayList* events;
 	gboolean error_mode;
 	gboolean network_error_mode;
@@ -162,6 +162,8 @@
 gchar* SMD_LOOP_CFG = NULL;
 extern gchar* SMD_PP_DEF_CFG;
 gchar* SMD_PP_DEF_CFG = NULL;
+extern gchar* XDG_AUTORUN_FILE;
+gchar* XDG_AUTORUN_FILE = NULL;
 static gpointer smd_applet_parent_class = NULL;
 extern gchar* smd_applet_smd_loop_cmd;
 gchar* smd_applet_smd_loop_cmd = NULL;
@@ -169,6 +171,8 @@
 gchar* smd_applet_smd_applet_ui = NULL;
 extern gchar* smd_applet_smd_push_cmd;
 gchar* smd_applet_smd_push_cmd = NULL;
+extern gchar* smd_applet_smd_applet_desktop;
+gchar* smd_applet_smd_applet_desktop = NULL;
 
 GQuark exit_quark (void);
 void debug (const gchar* message);
@@ -210,6 +214,8 @@
 #define SMD_LOOP "/bin/smd-loop"
 #define SMD_PUSH "/bin/smd-push"
 #define SMD_APPLET_UI "/share/syncmaildir-applet/smd-applet.ui"
+#define SMD_APPLET_DESKTOP "/share/applications/smd-applet.desktop"
+#define GNOME_AUTOSTART_DISABLED "X-GNOME-Autostart-enabled=false"
 gpointer smd_applet_ref (gpointer instance);
 void smd_applet_unref (gpointer instance);
 GParamSpec* param_spec_smd_applet (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -225,48 +231,50 @@
 #define SMD_APPLET_key_newmail "/apps/smd-applet/notify_new_mail"
 smdApplet* smd_applet_new (gboolean hide_status_icon, GError** error);
 smdApplet* smd_applet_construct (GType object_type, gboolean hide_status_icon, GError** error);
-static void ___lambda0_ (smdApplet* self, guint s);
-static void ____lambda0__network_manager_state_changed (NetworkManager* _sender, guint state, gpointer self);
-static void __lambda1_ (smdApplet* self, GtkComboBox* cb);
-static void ___lambda1__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void ___lambda2_ (smdApplet* self, guint s);
+static void ____lambda2__network_manager_state_changed (NetworkManager* _sender, guint state, gpointer self);
+static void __lambda3_ (smdApplet* self, GtkComboBox* cb);
+static void ___lambda3__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
 static void smd_applet_close_logs_action (smdApplet* self, GtkButton* b);
 static void _smd_applet_close_logs_action_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static gboolean smd_applet_close_logs_event (smdApplet* self, GdkEventAny* e);
 static gboolean _smd_applet_close_logs_event_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
 static void smd_applet_close_prefs_action (smdApplet* self, GtkButton* b);
 static void _smd_applet_close_prefs_action_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void __lambda3_ (smdApplet* self, GtkToggleButton* b);
-static void ___lambda3__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
-static void __lambda4_ (smdApplet* self, GtkToggleButton* b);
-static void ___lambda4__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+static void __lambda5_ (smdApplet* self, GtkToggleButton* b);
+static void ___lambda5__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+static void __lambda6_ (smdApplet* self, GtkToggleButton* b);
+static void ___lambda6__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+static void __lambda7_ (smdApplet* self, GtkToggleButton* b);
+static void ___lambda7__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
 static void smd_applet_close_err_action (smdApplet* self, GtkButton* b);
 static void _smd_applet_close_err_action_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void __lambda5_ (smdApplet* self, GtkButton* b);
+static void __lambda8_ (smdApplet* self, GtkButton* b);
 static gboolean smd_applet_is_smd_loop_configured (smdApplet* self);
-static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void __lambda6_ (smdApplet* self, GtkButton* b);
+static void ___lambda8__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void __lambda9_ (smdApplet* self, GtkButton* b);
 static gboolean smd_applet_is_smd_pushpull_configured (smdApplet* self);
-static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void __lambda7_ (smdApplet* self, GtkMenuItem* b);
-static void ___lambda7__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void __lambda8_ (smdApplet* self, GtkCheckMenuItem* b);
+static void ___lambda9__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void __lambda10_ (smdApplet* self, GtkMenuItem* b);
+static void ___lambda10__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void __lambda11_ (smdApplet* self, GtkCheckMenuItem* b);
 static void smd_applet_pause (smdApplet* self);
 static void smd_applet_unpause (smdApplet* self);
-static void ___lambda8__gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
-static void __lambda9_ (smdApplet* self, gint id);
-static void ___lambda9__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
-static void __lambda10_ (smdApplet* self, GtkMenuItem* b);
-static void ___lambda10__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void __lambda11_ (smdApplet* self, GtkMenuItem* b);
-static void ___lambda11__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void __lambda12_ (smdApplet* self, GtkMenuItem* b);
+static void ___lambda11__gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
+static void __lambda12_ (smdApplet* self, gint id);
+static void ___lambda12__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
+static void __lambda13_ (smdApplet* self, GtkMenuItem* b);
+static void ___lambda13__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void __lambda14_ (smdApplet* self, GtkMenuItem* b);
+static void ___lambda14__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void __lambda15_ (smdApplet* self, GtkMenuItem* b);
 static void smd_applet_update_loglist (smdApplet* self);
-static void ___lambda12__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
-static void __lambda13_ (smdApplet* self, guint button, guint time);
+static void ___lambda15__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void __lambda16_ (smdApplet* self, guint button, guint time);
 static void _gtk_status_icon_position_menu_gtk_menu_position_func (GtkMenu* menu, gint* x, gint* y, gboolean* push_in, gpointer self);
-static void ___lambda13__gtk_status_icon_popup_menu (GtkStatusIcon* _sender, guint button, guint activate_time, gpointer self);
-static void __lambda14_ (smdApplet* self, GtkStatusIcon* s);
-static void ___lambda14__gtk_status_icon_activate (GtkStatusIcon* _sender, gpointer self);
+static void ___lambda16__gtk_status_icon_popup_menu (GtkStatusIcon* _sender, guint button, guint activate_time, gpointer self);
+static void __lambda17_ (smdApplet* self, GtkStatusIcon* s);
+static void ___lambda17__gtk_status_icon_activate (GtkStatusIcon* _sender, gpointer self);
 static void _g_object_unref0_ (gpointer var);
 static void _g_free0_ (gpointer var);
 static void* smd_applet_smdThread (smdApplet* self);
@@ -275,13 +283,13 @@
 static gpointer _smd_applet_smdThread_gthread_func (gpointer self);
 static gboolean smd_applet_eval_smd_loop_error_message (smdApplet* self, const gchar* args, const gchar* account, const gchar* host, GError** error);
 static gboolean smd_applet_eval_smd_loop_message (smdApplet* self, const gchar* s);
-static void ___lambda2_ (smdApplet* self);
-static void ____lambda2__gspawn_child_setup_func (gpointer self);
+static void ___lambda4_ (smdApplet* self);
+static void ____lambda4__gspawn_child_setup_func (gpointer self);
 static gboolean smd_applet_eat_event (smdApplet* self);
-static void ______lambda15_ (smdApplet* self, NotifyNotification* not, const gchar* action);
-static void _______lambda15__notify_action_callback (NotifyNotification* notification, const gchar* action, gpointer self);
-static void ______lambda16_ (smdApplet* self, GtkButton* b);
-static void _______lambda16__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void ______lambda18_ (smdApplet* self, NotifyNotification* not, const gchar* action);
+static void _______lambda18__notify_action_callback (NotifyNotification* notification, const gchar* action, gpointer self);
+static void ______lambda19_ (smdApplet* self, GtkButton* b);
+static void _______lambda19__gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void smd_applet_reset_to_regular_run (smdApplet* self, gboolean force);
 static gboolean smd_applet_close_err_event (smdApplet* self, GdkEventAny* e);
 static void smd_applet_close_prefs (smdApplet* self);
@@ -923,7 +931,7 @@
 }
 
 
-static void ___lambda0_ (smdApplet* self, guint s) {
+static void ___lambda2_ (smdApplet* self, guint s) {
 	guint _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	_tmp0_ = s;
@@ -940,12 +948,12 @@
 }
 
 
-static void ____lambda0__network_manager_state_changed (NetworkManager* _sender, guint state, gpointer self) {
-	___lambda0_ (self, state);
+static void ____lambda2__network_manager_state_changed (NetworkManager* _sender, guint state, gpointer self) {
+	___lambda2_ (self, state);
 }
 
 
-static void __lambda1_ (smdApplet* self, GtkComboBox* cb) {
+static void __lambda3_ (smdApplet* self, GtkComboBox* cb) {
 	GtkComboBoxText* _tmp0_;
 	gint _tmp1_ = 0;
 	gint selected;
@@ -1094,8 +1102,8 @@
 }
 
 
-static void ___lambda1__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-	__lambda1_ (self, _sender);
+static void ___lambda3__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+	__lambda3_ (self, _sender);
 }
 
 
@@ -1116,7 +1124,7 @@
 }
 
 
-static void __lambda3_ (smdApplet* self, GtkToggleButton* b) {
+static void __lambda5_ (smdApplet* self, GtkToggleButton* b) {
 	GError * _inner_error_ = NULL;
 	g_return_if_fail (b != NULL);
 	{
@@ -1169,12 +1177,12 @@
 }
 
 
-static void ___lambda3__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-	__lambda3_ (self, _sender);
+static void ___lambda5__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+	__lambda5_ (self, _sender);
 }
 
 
-static void __lambda4_ (smdApplet* self, GtkToggleButton* b) {
+static void __lambda6_ (smdApplet* self, GtkToggleButton* b) {
 	GError * _inner_error_ = NULL;
 	g_return_if_fail (b != NULL);
 	{
@@ -1215,8 +1223,86 @@
 }
 
 
-static void ___lambda4__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-	__lambda4_ (self, _sender);
+static void ___lambda6__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+	__lambda6_ (self, _sender);
+}
+
+
+static void __lambda7_ (smdApplet* self, GtkToggleButton* b) {
+	GtkToggleButton* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
+	GError * _inner_error_ = NULL;
+	g_return_if_fail (b != NULL);
+	_tmp0_ = b;
+	_tmp1_ = gtk_toggle_button_get_active (_tmp0_);
+	_tmp2_ = _tmp1_;
+	if (_tmp2_) {
+		gchar* content = NULL;
+		{
+			const gchar* _tmp3_;
+			gchar* _tmp4_ = NULL;
+			const gchar* _tmp5_;
+			const gchar* _tmp6_;
+			_tmp3_ = smd_applet_smd_applet_desktop;
+			g_file_get_contents (_tmp3_, &_tmp4_, NULL, &_inner_error_);
+			_g_free0 (content);
+			content = _tmp4_;
+			if (_inner_error_ != NULL) {
+				if (_inner_error_->domain == G_FILE_ERROR) {
+					goto __catch8_g_file_error;
+				}
+				_g_free0 (content);
+				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+				g_clear_error (&_inner_error_);
+				return;
+			}
+			_tmp5_ = XDG_AUTORUN_FILE;
+			_tmp6_ = content;
+			g_file_set_contents (_tmp5_, _tmp6_, (gssize) (-1), &_inner_error_);
+			if (_inner_error_ != NULL) {
+				if (_inner_error_->domain == G_FILE_ERROR) {
+					goto __catch8_g_file_error;
+				}
+				_g_free0 (content);
+				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+				g_clear_error (&_inner_error_);
+				return;
+			}
+		}
+		goto __finally8;
+		__catch8_g_file_error:
+		{
+			GError* e = NULL;
+			FILE* _tmp7_;
+			GError* _tmp8_;
+			const gchar* _tmp9_;
+			e = _inner_error_;
+			_inner_error_ = NULL;
+			_tmp7_ = stderr;
+			_tmp8_ = e;
+			_tmp9_ = _tmp8_->message;
+			fprintf (_tmp7_, "%s\n", _tmp9_);
+			_g_error_free0 (e);
+		}
+		__finally8:
+		if (_inner_error_ != NULL) {
+			_g_free0 (content);
+			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+			g_clear_error (&_inner_error_);
+			return;
+		}
+		_g_free0 (content);
+	} else {
+		const gchar* _tmp10_;
+		_tmp10_ = XDG_AUTORUN_FILE;
+		g_remove (_tmp10_);
+	}
+}
+
+
+static void ___lambda7__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+	__lambda7_ (self, _sender);
 }
 
 
@@ -1225,7 +1311,7 @@
 }
 
 
-static void __lambda5_ (smdApplet* self, GtkButton* b) {
+static void __lambda8_ (smdApplet* self, GtkButton* b) {
 	GError * _inner_error_ = NULL;
 	g_return_if_fail (b != NULL);
 	{
@@ -1246,7 +1332,7 @@
 			_g_free0 (_tmp3_);
 			if (_inner_error_ != NULL) {
 				if (_inner_error_->domain == G_SPAWN_ERROR) {
-					goto __catch7_g_spawn_error;
+					goto __catch9_g_spawn_error;
 				}
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 				g_clear_error (&_inner_error_);
@@ -1261,7 +1347,7 @@
 		if (_inner_error_ != NULL) {
 			_g_free0 (cmd);
 			if (_inner_error_->domain == G_SPAWN_ERROR) {
-				goto __catch7_g_spawn_error;
+				goto __catch9_g_spawn_error;
 			}
 			_g_free0 (cmd);
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1271,8 +1357,8 @@
 		smd_applet_is_smd_loop_configured (self);
 		_g_free0 (cmd);
 	}
-	goto __finally7;
-	__catch7_g_spawn_error:
+	goto __finally9;
+	__catch9_g_spawn_error:
 	{
 		GError* e = NULL;
 		FILE* _tmp7_;
@@ -1286,7 +1372,7 @@
 		fprintf (_tmp7_, "%s\n", _tmp9_);
 		_g_error_free0 (e);
 	}
-	__finally7:
+	__finally9:
 	if (_inner_error_ != NULL) {
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 		g_clear_error (&_inner_error_);
@@ -1295,12 +1381,12 @@
 }
 
 
-static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-	__lambda5_ (self, _sender);
+static void ___lambda8__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+	__lambda8_ (self, _sender);
 }
 
 
-static void __lambda6_ (smdApplet* self, GtkButton* b) {
+static void __lambda9_ (smdApplet* self, GtkButton* b) {
 	GError * _inner_error_ = NULL;
 	g_return_if_fail (b != NULL);
 	{
@@ -1321,7 +1407,7 @@
 			_g_free0 (_tmp3_);
 			if (_inner_error_ != NULL) {
 				if (_inner_error_->domain == G_SPAWN_ERROR) {
-					goto __catch8_g_spawn_error;
+					goto __catch10_g_spawn_error;
 				}
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 				g_clear_error (&_inner_error_);
@@ -1336,7 +1422,7 @@
 		if (_inner_error_ != NULL) {
 			_g_free0 (cmd);
 			if (_inner_error_->domain == G_SPAWN_ERROR) {
-				goto __catch8_g_spawn_error;
+				goto __catch10_g_spawn_error;
 			}
 			_g_free0 (cmd);
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1346,8 +1432,8 @@
 		smd_applet_is_smd_pushpull_configured (self);
 		_g_free0 (cmd);
 	}
-	goto __finally8;
-	__catch8_g_spawn_error:
+	goto __finally10;
+	__catch10_g_spawn_error:
 	{
 		GError* e = NULL;
 		FILE* _tmp7_;
@@ -1361,7 +1447,7 @@
 		fprintf (_tmp7_, "%s\n", _tmp9_);
 		_g_error_free0 (e);
 	}
-	__finally8:
+	__finally10:
 	if (_inner_error_ != NULL) {
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 		g_clear_error (&_inner_error_);
@@ -1370,12 +1456,12 @@
 }
 
 
-static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-	__lambda6_ (self, _sender);
+static void ___lambda9__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+	__lambda9_ (self, _sender);
 }
 
 
-static void __lambda7_ (smdApplet* self, GtkMenuItem* b) {
+static void __lambda10_ (smdApplet* self, GtkMenuItem* b) {
 	GPid _tmp0_;
 	g_return_if_fail (b != NULL);
 	self->priv->thread_die = TRUE;
@@ -1397,12 +1483,12 @@
 }
 
 
-static void ___lambda7__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-	__lambda7_ (self, _sender);
+static void ___lambda10__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+	__lambda10_ (self, _sender);
 }
 
 
-static void __lambda8_ (smdApplet* self, GtkCheckMenuItem* b) {
+static void __lambda11_ (smdApplet* self, GtkCheckMenuItem* b) {
 	GtkCheckMenuItem* _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	g_return_if_fail (b != NULL);
@@ -1416,24 +1502,24 @@
 }
 
 
-static void ___lambda8__gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-	__lambda8_ (self, _sender);
+static void ___lambda11__gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
+	__lambda11_ (self, _sender);
 }
 
 
-static void __lambda9_ (smdApplet* self, gint id) {
+static void __lambda12_ (smdApplet* self, gint id) {
 	GtkAboutDialog* _tmp0_;
 	_tmp0_ = self->priv->about_win;
 	gtk_widget_hide ((GtkWidget*) _tmp0_);
 }
 
 
-static void ___lambda9__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
-	__lambda9_ (self, response_id);
+static void ___lambda12__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
+	__lambda12_ (self, response_id);
 }
 
 
-static void __lambda10_ (smdApplet* self, GtkMenuItem* b) {
+static void __lambda13_ (smdApplet* self, GtkMenuItem* b) {
 	GtkAboutDialog* _tmp0_;
 	g_return_if_fail (b != NULL);
 	_tmp0_ = self->priv->about_win;
@@ -1441,12 +1527,12 @@
 }
 
 
-static void ___lambda10__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-	__lambda10_ (self, _sender);
+static void ___lambda13__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+	__lambda13_ (self, _sender);
 }
 
 
-static void __lambda11_ (smdApplet* self, GtkMenuItem* b) {
+static void __lambda14_ (smdApplet* self, GtkMenuItem* b) {
 	GtkWindow* _tmp0_;
 	g_return_if_fail (b != NULL);
 	_tmp0_ = self->priv->win;
@@ -1454,12 +1540,12 @@
 }
 
 
-static void ___lambda11__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-	__lambda11_ (self, _sender);
+static void ___lambda14__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+	__lambda14_ (self, _sender);
 }
 
 
-static void __lambda12_ (smdApplet* self, GtkMenuItem* b) {
+static void __lambda15_ (smdApplet* self, GtkMenuItem* b) {
 	GtkWindow* _tmp0_;
 	g_return_if_fail (b != NULL);
 	smd_applet_update_loglist (self);
@@ -1468,8 +1554,8 @@
 }
 
 
-static void ___lambda12__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-	__lambda12_ (self, _sender);
+static void ___lambda15__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+	__lambda15_ (self, _sender);
 }
 
 
@@ -1478,7 +1564,7 @@
 }
 
 
-static void __lambda13_ (smdApplet* self, guint button, guint time) {
+static void __lambda16_ (smdApplet* self, guint button, guint time) {
 	GtkMenu* _tmp0_;
 	GtkStatusIcon* _tmp1_;
 	guint32 _tmp2_ = 0U;
@@ -1489,12 +1575,12 @@
 }
 
 
-static void ___lambda13__gtk_status_icon_popup_menu (GtkStatusIcon* _sender, guint button, guint activate_time, gpointer self) {
-	__lambda13_ (self, button, activate_time);
+static void ___lambda16__gtk_status_icon_popup_menu (GtkStatusIcon* _sender, guint button, guint activate_time, gpointer self) {
+	__lambda16_ (self, button, activate_time);
 }
 
 
-static void __lambda14_ (smdApplet* self, GtkStatusIcon* s) {
+static void __lambda17_ (smdApplet* self, GtkStatusIcon* s) {
 	gboolean _tmp0_;
 	g_return_if_fail (s != NULL);
 	_tmp0_ = self->priv->error_mode;
@@ -1522,8 +1608,8 @@
 }
 
 
-static void ___lambda14__gtk_status_icon_activate (GtkStatusIcon* _sender, gpointer self) {
-	__lambda14_ (self, _sender);
+static void ___lambda17__gtk_status_icon_activate (GtkStatusIcon* _sender, gpointer self) {
+	__lambda17_ (self, _sender);
 }
 
 
@@ -1541,102 +1627,105 @@
 	smdApplet* self = NULL;
 	GtkBuilder* _tmp0_;
 	GeeArrayList* _tmp7_;
-	GMutex* _tmp8_;
-	GConfClient* _tmp9_ = NULL;
-	GConfClient* _tmp10_;
-	GtkBuilder* _tmp17_;
-	GObject* _tmp18_ = NULL;
-	GtkWindow* _tmp19_;
-	GtkBuilder* _tmp20_;
-	GObject* _tmp21_ = NULL;
-	GtkWindow* _tmp22_;
-	GtkBuilder* _tmp23_;
-	GObject* _tmp24_ = NULL;
+	GConfClient* _tmp8_ = NULL;
+	GConfClient* _tmp9_;
+	GtkBuilder* _tmp16_;
+	GObject* _tmp17_ = NULL;
+	GtkWindow* _tmp18_;
+	GtkBuilder* _tmp19_;
+	GObject* _tmp20_ = NULL;
+	GtkWindow* _tmp21_;
+	GtkBuilder* _tmp22_;
+	GObject* _tmp23_ = NULL;
+	GtkAboutDialog* _tmp24_;
 	GtkAboutDialog* _tmp25_;
-	GtkAboutDialog* _tmp26_;
-	GtkBuilder* _tmp27_;
-	GObject* _tmp28_ = NULL;
-	GtkWindow* _tmp29_;
-	GtkBuilder* _tmp30_;
-	GObject* _tmp31_ = NULL;
-	GtkVBox* _tmp32_;
+	GtkBuilder* _tmp26_;
+	GObject* _tmp27_ = NULL;
+	GtkWindow* _tmp28_;
+	GtkBuilder* _tmp29_;
+	GObject* _tmp30_ = NULL;
+	GtkVBox* _tmp31_;
 	GtkVBox* logs_vb;
+	GtkComboBoxText* _tmp32_;
 	GtkComboBoxText* _tmp33_;
-	GtkComboBoxText* _tmp34_;
-	GeeArrayList* _tmp35_;
+	GeeArrayList* _tmp34_;
+	GtkComboBoxText* _tmp35_;
 	GtkComboBoxText* _tmp36_;
 	GtkComboBoxText* _tmp37_;
 	GtkComboBoxText* _tmp38_;
-	GtkComboBoxText* _tmp39_;
-	GtkBuilder* _tmp40_;
-	GObject* _tmp41_ = NULL;
-	GtkButton* _tmp42_;
+	GtkBuilder* _tmp39_;
+	GObject* _tmp40_ = NULL;
+	GtkButton* _tmp41_;
 	GtkButton* close_log;
-	GtkWindow* _tmp43_;
-	GtkBuilder* _tmp44_;
-	GObject* _tmp45_ = NULL;
-	GtkButton* _tmp46_;
+	GtkWindow* _tmp42_;
+	GtkBuilder* _tmp43_;
+	GObject* _tmp44_ = NULL;
+	GtkButton* _tmp45_;
 	GtkButton* close;
-	GtkBuilder* _tmp47_;
-	GObject* _tmp48_ = NULL;
-	GtkCheckButton* _tmp49_;
+	GtkBuilder* _tmp46_;
+	GObject* _tmp47_ = NULL;
+	GtkCheckButton* _tmp48_;
 	GtkCheckButton* bicon;
-	GtkBuilder* _tmp56_;
-	GObject* _tmp57_ = NULL;
-	GtkCheckButton* _tmp58_;
+	GtkBuilder* _tmp55_;
+	GObject* _tmp56_ = NULL;
+	GtkCheckButton* _tmp57_;
 	GtkCheckButton* bnotify;
-	GtkBuilder* _tmp65_;
-	GObject* _tmp66_ = NULL;
-	GtkButton* _tmp67_;
+	GtkBuilder* _tmp64_;
+	GObject* _tmp65_ = NULL;
+	GtkCheckButton* _tmp66_;
+	GtkCheckButton* bautostart;
+	GtkBuilder* _tmp75_;
+	GObject* _tmp76_ = NULL;
+	GtkButton* _tmp77_;
 	GtkButton* bc;
-	GtkBuilder* _tmp68_;
-	GObject* _tmp69_ = NULL;
-	GtkButton* _tmp70_;
+	GtkBuilder* _tmp78_;
+	GObject* _tmp79_ = NULL;
+	GtkButton* _tmp80_;
 	GtkButton* bel;
-	GtkBuilder* _tmp71_;
-	GObject* _tmp72_ = NULL;
-	GtkButton* _tmp73_;
+	GtkBuilder* _tmp81_;
+	GObject* _tmp82_ = NULL;
+	GtkButton* _tmp83_;
 	GtkButton* bepp;
-	GtkBuilder* _tmp74_;
-	GObject* _tmp75_ = NULL;
-	GtkMenu* _tmp76_;
-	GtkBuilder* _tmp77_;
-	GObject* _tmp78_ = NULL;
-	GtkMenu* _tmp79_;
-	GtkBuilder* _tmp80_;
-	GObject* _tmp81_ = NULL;
-	GtkMenuItem* _tmp82_;
-	GtkMenuItem* quit;
-	GtkBuilder* _tmp83_;
-	GObject* _tmp84_ = NULL;
-	GtkCheckMenuItem* _tmp85_;
-	GtkCheckMenuItem* _tmp86_;
+	GtkBuilder* _tmp84_;
+	GObject* _tmp85_ = NULL;
+	GtkMenu* _tmp86_;
 	GtkBuilder* _tmp87_;
 	GObject* _tmp88_ = NULL;
-	GtkMenuItem* _tmp89_;
+	GtkMenu* _tmp89_;
+	GtkBuilder* _tmp90_;
+	GObject* _tmp91_ = NULL;
+	GtkMenuItem* _tmp92_;
+	GtkMenuItem* quit;
+	GtkBuilder* _tmp93_;
+	GObject* _tmp94_ = NULL;
+	GtkCheckMenuItem* _tmp95_;
+	GtkCheckMenuItem* _tmp96_;
+	GtkBuilder* _tmp97_;
+	GObject* _tmp98_ = NULL;
+	GtkMenuItem* _tmp99_;
 	GtkMenuItem* about;
-	GtkAboutDialog* _tmp90_;
-	GtkAboutDialog* _tmp91_;
-	GtkBuilder* _tmp92_;
-	GObject* _tmp93_ = NULL;
-	GtkMenuItem* _tmp94_;
+	GtkAboutDialog* _tmp100_;
+	GtkAboutDialog* _tmp101_;
+	GtkBuilder* _tmp102_;
+	GObject* _tmp103_ = NULL;
+	GtkMenuItem* _tmp104_;
 	GtkMenuItem* prefs;
-	GtkBuilder* _tmp95_;
-	GObject* _tmp96_ = NULL;
-	GtkMenuItem* _tmp97_;
+	GtkBuilder* _tmp105_;
+	GObject* _tmp106_ = NULL;
+	GtkMenuItem* _tmp107_;
 	GtkMenuItem* logs;
-	GtkStatusIcon* _tmp98_;
-	GtkStatusIcon* _tmp99_;
-	gboolean _tmp100_;
-	GtkStatusIcon* _tmp101_;
-	GtkStatusIcon* _tmp102_;
-	GtkStatusIcon* _tmp103_;
-	GList* _tmp104_ = NULL;
+	GtkStatusIcon* _tmp108_;
+	GtkStatusIcon* _tmp109_;
+	gboolean _tmp110_;
+	GtkStatusIcon* _tmp111_;
+	GtkStatusIcon* _tmp112_;
+	GtkStatusIcon* _tmp113_;
+	GList* _tmp114_ = NULL;
 	GList* l;
-	gint _tmp105_ = 0;
-	GHashFunc _tmp106_;
-	GEqualFunc _tmp107_;
-	GHashTable* _tmp108_;
+	gint _tmp115_ = 0;
+	GHashFunc _tmp116_;
+	GEqualFunc _tmp117_;
+	GHashTable* _tmp118_;
 	GError * _inner_error_ = NULL;
 	self = (smdApplet*) g_type_create_instance (object_type);
 	_tmp0_ = gtk_builder_new ();
@@ -1686,40 +1775,37 @@
 	_tmp7_ = gee_array_list_new (TYPE_EVENT, (GBoxedCopyFunc) event_ref, event_unref, NULL);
 	_g_object_unref0 (self->priv->events);
 	self->priv->events = _tmp7_;
-	_tmp8_ = g_mutex_new ();
-	_g_mutex_free0 (self->priv->events_lock);
-	self->priv->events_lock = _tmp8_;
-	_tmp9_ = gconf_client_get_default ();
-	_tmp10_ = _g_object_ref0 (_tmp9_);
+	_tmp8_ = gconf_client_get_default ();
+	_tmp9_ = _g_object_ref0 (_tmp8_);
 	_g_object_unref0 (self->priv->gconf);
-	self->priv->gconf = _tmp10_;
+	self->priv->gconf = _tmp9_;
 	{
-		NetworkManager* _tmp11_ = NULL;
+		NetworkManager* _tmp10_ = NULL;
+		NetworkManager* _tmp11_;
 		NetworkManager* _tmp12_;
-		NetworkManager* _tmp13_;
-		_tmp11_ = g_initable_new (TYPE_NETWORK_MANAGER_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", NM_SERVICE, "g-bus-type", G_BUS_TYPE_SYSTEM, "g-object-path", NM_PATH, "g-interface-name", "org.freedesktop.NetworkManager", NULL);
-		_tmp12_ = (NetworkManager*) _tmp11_;
+		_tmp10_ = g_initable_new (TYPE_NETWORK_MANAGER_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", NM_SERVICE, "g-bus-type", G_BUS_TYPE_SYSTEM, "g-object-path", NM_PATH, "g-interface-name", "org.freedesktop.NetworkManager", NULL);
+		_tmp11_ = (NetworkManager*) _tmp10_;
 		if (_inner_error_ != NULL) {
 			goto __catch1_g_error;
 		}
 		_g_object_unref0 (self->priv->net_manager);
-		self->priv->net_manager = _tmp12_;
-		_tmp13_ = self->priv->net_manager;
-		g_signal_connect (_tmp13_, "state-changed", (GCallback) ____lambda0__network_manager_state_changed, self);
+		self->priv->net_manager = _tmp11_;
+		_tmp12_ = self->priv->net_manager;
+		g_signal_connect (_tmp12_, "state-changed", (GCallback) ____lambda2__network_manager_state_changed, self);
 	}
 	goto __finally1;
 	__catch1_g_error:
 	{
 		GError* e = NULL;
-		FILE* _tmp14_;
-		GError* _tmp15_;
-		const gchar* _tmp16_;
+		FILE* _tmp13_;
+		GError* _tmp14_;
+		const gchar* _tmp15_;
 		e = _inner_error_;
 		_inner_error_ = NULL;
-		_tmp14_ = stderr;
-		_tmp15_ = e;
-		_tmp16_ = _tmp15_->message;
-		fprintf (_tmp14_, "%s\n", _tmp16_);
+		_tmp13_ = stderr;
+		_tmp14_ = e;
+		_tmp15_ = _tmp14_->message;
+		fprintf (_tmp13_, "%s\n", _tmp15_);
 		_g_object_unref0 (self->priv->net_manager);
 		self->priv->net_manager = NULL;
 		_g_error_free0 (e);
@@ -1736,88 +1822,88 @@
 			return NULL;
 		}
 	}
-	_tmp17_ = self->priv->builder;
-	_tmp18_ = gtk_builder_get_object (_tmp17_, "wPrefs");
-	_tmp19_ = _g_object_ref0 (GTK_IS_WINDOW (_tmp18_) ? ((GtkWindow*) _tmp18_) : NULL);
+	_tmp16_ = self->priv->builder;
+	_tmp17_ = gtk_builder_get_object (_tmp16_, "wPrefs");
+	_tmp18_ = _g_object_ref0 (GTK_IS_WINDOW (_tmp17_) ? ((GtkWindow*) _tmp17_) : NULL);
 	_g_object_unref0 (self->priv->win);
-	self->priv->win = _tmp19_;
-	_tmp20_ = self->priv->builder;
-	_tmp21_ = gtk_builder_get_object (_tmp20_, "wError");
-	_tmp22_ = _g_object_ref0 (GTK_IS_WINDOW (_tmp21_) ? ((GtkWindow*) _tmp21_) : NULL);
+	self->priv->win = _tmp18_;
+	_tmp19_ = self->priv->builder;
+	_tmp20_ = gtk_builder_get_object (_tmp19_, "wError");
+	_tmp21_ = _g_object_ref0 (GTK_IS_WINDOW (_tmp20_) ? ((GtkWindow*) _tmp20_) : NULL);
 	_g_object_unref0 (self->priv->err_win);
-	self->priv->err_win = _tmp22_;
-	_tmp23_ = self->priv->builder;
-	_tmp24_ = gtk_builder_get_object (_tmp23_, "wAbout");
-	_tmp25_ = _g_object_ref0 (GTK_IS_ABOUT_DIALOG (_tmp24_) ? ((GtkAboutDialog*) _tmp24_) : NULL);
+	self->priv->err_win = _tmp21_;
+	_tmp22_ = self->priv->builder;
+	_tmp23_ = gtk_builder_get_object (_tmp22_, "wAbout");
+	_tmp24_ = _g_object_ref0 (GTK_IS_ABOUT_DIALOG (_tmp23_) ? ((GtkAboutDialog*) _tmp23_) : NULL);
 	_g_object_unref0 (self->priv->about_win);
-	self->priv->about_win = _tmp25_;
-	_tmp26_ = self->priv->about_win;
-	gtk_about_dialog_set_copyright (_tmp26_, "Copyright " SMD_CONF_COPYRIGHT);
-	_tmp27_ = self->priv->builder;
-	_tmp28_ = gtk_builder_get_object (_tmp27_, "wLog");
-	_tmp29_ = _g_object_ref0 (GTK_IS_WINDOW (_tmp28_) ? ((GtkWindow*) _tmp28_) : NULL);
+	self->priv->about_win = _tmp24_;
+	_tmp25_ = self->priv->about_win;
+	gtk_about_dialog_set_copyright (_tmp25_, "Copyright " SMD_CONF_COPYRIGHT);
+	_tmp26_ = self->priv->builder;
+	_tmp27_ = gtk_builder_get_object (_tmp26_, "wLog");
+	_tmp28_ = _g_object_ref0 (GTK_IS_WINDOW (_tmp27_) ? ((GtkWindow*) _tmp27_) : NULL);
 	_g_object_unref0 (self->priv->log_win);
-	self->priv->log_win = _tmp29_;
-	_tmp30_ = self->priv->builder;
-	_tmp31_ = gtk_builder_get_object (_tmp30_, "vbLog");
-	_tmp32_ = _g_object_ref0 (GTK_IS_VBOX (_tmp31_) ? ((GtkVBox*) _tmp31_) : NULL);
-	logs_vb = _tmp32_;
-	_tmp33_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-	_tmp34_ = g_object_ref_sink (_tmp33_);
+	self->priv->log_win = _tmp28_;
+	_tmp29_ = self->priv->builder;
+	_tmp30_ = gtk_builder_get_object (_tmp29_, "vbLog");
+	_tmp31_ = _g_object_ref0 (GTK_IS_VBOX (_tmp30_) ? ((GtkVBox*) _tmp30_) : NULL);
+	logs_vb = _tmp31_;
+	_tmp32_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+	_tmp33_ = g_object_ref_sink (_tmp32_);
 	_g_object_unref0 (self->priv->cblogs);
-	self->priv->cblogs = _tmp34_;
-	_tmp35_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL);
+	self->priv->cblogs = _tmp33_;
+	_tmp34_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL);
 	_g_object_unref0 (self->priv->lognames);
-	self->priv->lognames = _tmp35_;
+	self->priv->lognames = _tmp34_;
+	_tmp35_ = self->priv->cblogs;
+	gtk_box_pack_start ((GtkBox*) logs_vb, (GtkWidget*) _tmp35_, FALSE, TRUE, (guint) 0);
 	_tmp36_ = self->priv->cblogs;
-	gtk_box_pack_start ((GtkBox*) logs_vb, (GtkWidget*) _tmp36_, FALSE, TRUE, (guint) 0);
+	gtk_box_reorder_child ((GtkBox*) logs_vb, (GtkWidget*) _tmp36_, 0);
 	_tmp37_ = self->priv->cblogs;
-	gtk_box_reorder_child ((GtkBox*) logs_vb, (GtkWidget*) _tmp37_, 0);
+	gtk_widget_show ((GtkWidget*) _tmp37_);
 	_tmp38_ = self->priv->cblogs;
-	gtk_widget_show ((GtkWidget*) _tmp38_);
-	_tmp39_ = self->priv->cblogs;
-	g_signal_connect ((GtkComboBox*) _tmp39_, "changed", (GCallback) ___lambda1__gtk_combo_box_changed, self);
-	_tmp40_ = self->priv->builder;
-	_tmp41_ = gtk_builder_get_object (_tmp40_, "bLogClose");
-	_tmp42_ = _g_object_ref0 (GTK_IS_BUTTON (_tmp41_) ? ((GtkButton*) _tmp41_) : NULL);
-	close_log = _tmp42_;
+	g_signal_connect ((GtkComboBox*) _tmp38_, "changed", (GCallback) ___lambda3__gtk_combo_box_changed, self);
+	_tmp39_ = self->priv->builder;
+	_tmp40_ = gtk_builder_get_object (_tmp39_, "bLogClose");
+	_tmp41_ = _g_object_ref0 (GTK_IS_BUTTON (_tmp40_) ? ((GtkButton*) _tmp40_) : NULL);
+	close_log = _tmp41_;
 	g_signal_connect (close_log, "clicked", (GCallback) _smd_applet_close_logs_action_gtk_button_clicked, self);
-	_tmp43_ = self->priv->log_win;
-	g_signal_connect ((GtkWidget*) _tmp43_, "delete-event", (GCallback) _smd_applet_close_logs_event_gtk_widget_delete_event, self);
-	_tmp44_ = self->priv->builder;
-	_tmp45_ = gtk_builder_get_object (_tmp44_, "bClosePrefs");
-	_tmp46_ = _g_object_ref0 (GTK_IS_BUTTON (_tmp45_) ? ((GtkButton*) _tmp45_) : NULL);
-	close = _tmp46_;
+	_tmp42_ = self->priv->log_win;
+	g_signal_connect ((GtkWidget*) _tmp42_, "delete-event", (GCallback) _smd_applet_close_logs_event_gtk_widget_delete_event, self);
+	_tmp43_ = self->priv->builder;
+	_tmp44_ = gtk_builder_get_object (_tmp43_, "bClosePrefs");
+	_tmp45_ = _g_object_ref0 (GTK_IS_BUTTON (_tmp44_) ? ((GtkButton*) _tmp44_) : NULL);
+	close = _tmp45_;
 	g_signal_connect (close, "clicked", (GCallback) _smd_applet_close_prefs_action_gtk_button_clicked, self);
-	_tmp47_ = self->priv->builder;
-	_tmp48_ = gtk_builder_get_object (_tmp47_, "cbIcon");
-	_tmp49_ = _g_object_ref0 (GTK_IS_CHECK_BUTTON (_tmp48_) ? ((GtkCheckButton*) _tmp48_) : NULL);
-	bicon = _tmp49_;
+	_tmp46_ = self->priv->builder;
+	_tmp47_ = gtk_builder_get_object (_tmp46_, "cbIcon");
+	_tmp48_ = _g_object_ref0 (GTK_IS_CHECK_BUTTON (_tmp47_) ? ((GtkCheckButton*) _tmp47_) : NULL);
+	bicon = _tmp48_;
 	{
-		GConfClient* _tmp50_;
-		gboolean _tmp51_ = FALSE;
-		gboolean _tmp52_;
-		_tmp50_ = self->priv->gconf;
-		_tmp51_ = gconf_client_get_bool (_tmp50_, SMD_APPLET_key_icon, &_inner_error_);
-		_tmp52_ = _tmp51_;
+		GConfClient* _tmp49_;
+		gboolean _tmp50_ = FALSE;
+		gboolean _tmp51_;
+		_tmp49_ = self->priv->gconf;
+		_tmp50_ = gconf_client_get_bool (_tmp49_, SMD_APPLET_key_icon, &_inner_error_);
+		_tmp51_ = _tmp50_;
 		if (_inner_error_ != NULL) {
 			goto __catch3_g_error;
 		}
-		gtk_toggle_button_set_active ((GtkToggleButton*) bicon, _tmp52_);
+		gtk_toggle_button_set_active ((GtkToggleButton*) bicon, _tmp51_);
 	}
 	goto __finally3;
 	__catch3_g_error:
 	{
 		GError* e = NULL;
-		FILE* _tmp53_;
-		GError* _tmp54_;
-		const gchar* _tmp55_;
+		FILE* _tmp52_;
+		GError* _tmp53_;
+		const gchar* _tmp54_;
 		e = _inner_error_;
 		_inner_error_ = NULL;
-		_tmp53_ = stderr;
-		_tmp54_ = e;
-		_tmp55_ = _tmp54_->message;
-		fprintf (_tmp53_, "%s\n", _tmp55_);
+		_tmp52_ = stderr;
+		_tmp53_ = e;
+		_tmp54_ = _tmp53_->message;
+		fprintf (_tmp52_, "%s\n", _tmp54_);
 		_g_error_free0 (e);
 	}
 	__finally3:
@@ -1840,36 +1926,36 @@
 			return NULL;
 		}
 	}
-	g_signal_connect ((GtkToggleButton*) bicon, "toggled", (GCallback) ___lambda3__gtk_toggle_button_toggled, self);
-	_tmp56_ = self->priv->builder;
-	_tmp57_ = gtk_builder_get_object (_tmp56_, "cbNotify");
-	_tmp58_ = _g_object_ref0 (GTK_IS_CHECK_BUTTON (_tmp57_) ? ((GtkCheckButton*) _tmp57_) : NULL);
-	bnotify = _tmp58_;
+	g_signal_connect ((GtkToggleButton*) bicon, "toggled", (GCallback) ___lambda5__gtk_toggle_button_toggled, self);
+	_tmp55_ = self->priv->builder;
+	_tmp56_ = gtk_builder_get_object (_tmp55_, "cbNotify");
+	_tmp57_ = _g_object_ref0 (GTK_IS_CHECK_BUTTON (_tmp56_) ? ((GtkCheckButton*) _tmp56_) : NULL);
+	bnotify = _tmp57_;
 	{
-		GConfClient* _tmp59_;
-		gboolean _tmp60_ = FALSE;
-		gboolean _tmp61_;
-		_tmp59_ = self->priv->gconf;
-		_tmp60_ = gconf_client_get_bool (_tmp59_, SMD_APPLET_key_newmail, &_inner_error_);
-		_tmp61_ = _tmp60_;
+		GConfClient* _tmp58_;
+		gboolean _tmp59_ = FALSE;
+		gboolean _tmp60_;
+		_tmp58_ = self->priv->gconf;
+		_tmp59_ = gconf_client_get_bool (_tmp58_, SMD_APPLET_key_newmail, &_inner_error_);
+		_tmp60_ = _tmp59_;
 		if (_inner_error_ != NULL) {
 			goto __catch5_g_error;
 		}
-		gtk_toggle_button_set_active ((GtkToggleButton*) bnotify, _tmp61_);
+		gtk_toggle_button_set_active ((GtkToggleButton*) bnotify, _tmp60_);
 	}
 	goto __finally5;
 	__catch5_g_error:
 	{
 		GError* e = NULL;
-		FILE* _tmp62_;
-		GError* _tmp63_;
-		const gchar* _tmp64_;
+		FILE* _tmp61_;
+		GError* _tmp62_;
+		const gchar* _tmp63_;
 		e = _inner_error_;
 		_inner_error_ = NULL;
-		_tmp62_ = stderr;
-		_tmp63_ = e;
-		_tmp64_ = _tmp63_->message;
-		fprintf (_tmp62_, "%s\n", _tmp64_);
+		_tmp61_ = stderr;
+		_tmp62_ = e;
+		_tmp63_ = _tmp62_->message;
+		fprintf (_tmp61_, "%s\n", _tmp63_);
 		_g_error_free0 (e);
 	}
 	__finally5:
@@ -1894,84 +1980,168 @@
 			return NULL;
 		}
 	}
-	g_signal_connect ((GtkToggleButton*) bnotify, "toggled", (GCallback) ___lambda4__gtk_toggle_button_toggled, self);
-	_tmp65_ = self->priv->builder;
-	_tmp66_ = gtk_builder_get_object (_tmp65_, "bClose");
-	_tmp67_ = _g_object_ref0 (GTK_IS_BUTTON (_tmp66_) ? ((GtkButton*) _tmp66_) : NULL);
-	bc = _tmp67_;
+	g_signal_connect ((GtkToggleButton*) bnotify, "toggled", (GCallback) ___lambda6__gtk_toggle_button_toggled, self);
+	_tmp64_ = self->priv->builder;
+	_tmp65_ = gtk_builder_get_object (_tmp64_, "cbAutostart");
+	_tmp66_ = _g_object_ref0 (GTK_IS_CHECK_BUTTON (_tmp65_) ? ((GtkCheckButton*) _tmp65_) : NULL);
+	bautostart = _tmp66_;
+	{
+		gchar* content = NULL;
+		const gchar* _tmp67_;
+		gchar* _tmp68_ = NULL;
+		gboolean _tmp69_ = FALSE;
+		gboolean _tmp70_;
+		_tmp67_ = XDG_AUTORUN_FILE;
+		_tmp69_ = g_file_get_contents (_tmp67_, &_tmp68_, NULL, &_inner_error_);
+		_g_free0 (content);
+		content = _tmp68_;
+		_tmp70_ = _tmp69_;
+		if (_inner_error_ != NULL) {
+			_g_free0 (content);
+			if (_inner_error_->domain == G_FILE_ERROR) {
+				goto __catch7_g_file_error;
+			}
+			_g_free0 (content);
+			_g_object_unref0 (bautostart);
+			_g_object_unref0 (bnotify);
+			_g_object_unref0 (bicon);
+			_g_object_unref0 (close);
+			_g_object_unref0 (close_log);
+			_g_object_unref0 (logs_vb);
+			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+			g_clear_error (&_inner_error_);
+			return NULL;
+		}
+		if (_tmp70_) {
+			gboolean _tmp71_ = FALSE;
+			_tmp71_ = g_regex_match_simple (GNOME_AUTOSTART_DISABLED, content, 0, 0);
+			if (_tmp71_) {
+				gtk_toggle_button_set_active ((GtkToggleButton*) bautostart, FALSE);
+			} else {
+				gtk_toggle_button_set_active ((GtkToggleButton*) bautostart, TRUE);
+			}
+		} else {
+			gtk_toggle_button_set_active ((GtkToggleButton*) bautostart, FALSE);
+		}
+		_g_free0 (content);
+	}
+	goto __finally7;
+	__catch7_g_file_error:
+	{
+		GError* e = NULL;
+		FILE* _tmp72_;
+		GError* _tmp73_;
+		const gchar* _tmp74_;
+		e = _inner_error_;
+		_inner_error_ = NULL;
+		_tmp72_ = stderr;
+		_tmp73_ = e;
+		_tmp74_ = _tmp73_->message;
+		fprintf (_tmp72_, "%s\n", _tmp74_);
+		_g_error_free0 (e);
+	}
+	__finally7:
+	if (_inner_error_ != NULL) {
+		if (_inner_error_->domain == EXIT) {
+			g_propagate_error (error, _inner_error_);
+			_g_object_unref0 (bautostart);
+			_g_object_unref0 (bnotify);
+			_g_object_unref0 (bicon);
+			_g_object_unref0 (close);
+			_g_object_unref0 (close_log);
+			_g_object_unref0 (logs_vb);
+			_smd_applet_unref0 (self);
+			return NULL;
+		} else {
+			_g_object_unref0 (bautostart);
+			_g_object_unref0 (bnotify);
+			_g_object_unref0 (bicon);
+			_g_object_unref0 (close);
+			_g_object_unref0 (close_log);
+			_g_object_unref0 (logs_vb);
+			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+			g_clear_error (&_inner_error_);
+			return NULL;
+		}
+	}
+	g_signal_connect ((GtkToggleButton*) bautostart, "toggled", (GCallback) ___lambda7__gtk_toggle_button_toggled, self);
+	_tmp75_ = self->priv->builder;
+	_tmp76_ = gtk_builder_get_object (_tmp75_, "bClose");
+	_tmp77_ = _g_object_ref0 (GTK_IS_BUTTON (_tmp76_) ? ((GtkButton*) _tmp76_) : NULL);
+	bc = _tmp77_;
 	g_signal_connect (bc, "clicked", (GCallback) _smd_applet_close_err_action_gtk_button_clicked, self);
-	_tmp68_ = self->priv->builder;
-	_tmp69_ = gtk_builder_get_object (_tmp68_, "bEditLoopCfg");
-	_tmp70_ = _g_object_ref0 (GTK_IS_BUTTON (_tmp69_) ? ((GtkButton*) _tmp69_) : NULL);
-	bel = _tmp70_;
-	g_signal_connect (bel, "clicked", (GCallback) ___lambda5__gtk_button_clicked, self);
-	_tmp71_ = self->priv->builder;
-	_tmp72_ = gtk_builder_get_object (_tmp71_, "bEditPushPullCfg");
-	_tmp73_ = _g_object_ref0 (GTK_IS_BUTTON (_tmp72_) ? ((GtkButton*) _tmp72_) : NULL);
-	bepp = _tmp73_;
-	g_signal_connect (bepp, "clicked", (GCallback) ___lambda6__gtk_button_clicked, self);
-	_tmp74_ = self->priv->builder;
-	_tmp75_ = gtk_builder_get_object (_tmp74_, "mLeft");
-	_tmp76_ = _g_object_ref0 (GTK_IS_MENU (_tmp75_) ? ((GtkMenu*) _tmp75_) : NULL);
+	_tmp78_ = self->priv->builder;
+	_tmp79_ = gtk_builder_get_object (_tmp78_, "bEditLoopCfg");
+	_tmp80_ = _g_object_ref0 (GTK_IS_BUTTON (_tmp79_) ? ((GtkButton*) _tmp79_) : NULL);
+	bel = _tmp80_;
+	g_signal_connect (bel, "clicked", (GCallback) ___lambda8__gtk_button_clicked, self);
+	_tmp81_ = self->priv->builder;
+	_tmp82_ = gtk_builder_get_object (_tmp81_, "bEditPushPullCfg");
+	_tmp83_ = _g_object_ref0 (GTK_IS_BUTTON (_tmp82_) ? ((GtkButton*) _tmp82_) : NULL);
+	bepp = _tmp83_;
+	g_signal_connect (bepp, "clicked", (GCallback) ___lambda9__gtk_button_clicked, self);
+	_tmp84_ = self->priv->builder;
+	_tmp85_ = gtk_builder_get_object (_tmp84_, "mLeft");
+	_tmp86_ = _g_object_ref0 (GTK_IS_MENU (_tmp85_) ? ((GtkMenu*) _tmp85_) : NULL);
 	_g_object_unref0 (self->priv->menuL);
-	self->priv->menuL = _tmp76_;
-	_tmp77_ = self->priv->builder;
-	_tmp78_ = gtk_builder_get_object (_tmp77_, "mRight");
-	_tmp79_ = _g_object_ref0 (GTK_IS_MENU (_tmp78_) ? ((GtkMenu*) _tmp78_) : NULL);
-	_g_object_unref0 (self->priv->menuR);
-	self->priv->menuR = _tmp79_;
-	_tmp80_ = self->priv->builder;
-	_tmp81_ = gtk_builder_get_object (_tmp80_, "miQuit");
-	_tmp82_ = _g_object_ref0 (GTK_IS_MENU_ITEM (_tmp81_) ? ((GtkMenuItem*) _tmp81_) : NULL);
-	quit = _tmp82_;
-	g_signal_connect (quit, "activate", (GCallback) ___lambda7__gtk_menu_item_activate, self);
-	_tmp83_ = self->priv->builder;
-	_tmp84_ = gtk_builder_get_object (_tmp83_, "miPause");
-	_tmp85_ = _g_object_ref0 (GTK_IS_CHECK_MENU_ITEM (_tmp84_) ? ((GtkCheckMenuItem*) _tmp84_) : NULL);
-	_g_object_unref0 (self->priv->miPause);
-	self->priv->miPause = _tmp85_;
-	_tmp86_ = self->priv->miPause;
-	g_signal_connect (_tmp86_, "toggled", (GCallback) ___lambda8__gtk_check_menu_item_toggled, self);
+	self->priv->menuL = _tmp86_;
 	_tmp87_ = self->priv->builder;
-	_tmp88_ = gtk_builder_get_object (_tmp87_, "miAbout");
-	_tmp89_ = _g_object_ref0 (GTK_IS_MENU_ITEM (_tmp88_) ? ((GtkMenuItem*) _tmp88_) : NULL);
-	about = _tmp89_;
-	_tmp90_ = self->priv->about_win;
-	g_signal_connect ((GtkDialog*) _tmp90_, "response", (GCallback) ___lambda9__gtk_dialog_response, self);
-	g_signal_connect (about, "activate", (GCallback) ___lambda10__gtk_menu_item_activate, self);
-	_tmp91_ = self->priv->about_win;
-	gtk_about_dialog_set_comments (_tmp91_, "GNOME applet for syncmaildir version " SMD_CONF_VERSION);
-	_tmp92_ = self->priv->builder;
-	_tmp93_ = gtk_builder_get_object (_tmp92_, "miPrefs");
-	_tmp94_ = _g_object_ref0 (GTK_IS_MENU_ITEM (_tmp93_) ? ((GtkMenuItem*) _tmp93_) : NULL);
-	prefs = _tmp94_;
-	g_signal_connect (prefs, "activate", (GCallback) ___lambda11__gtk_menu_item_activate, self);
-	_tmp95_ = self->priv->builder;
-	_tmp96_ = gtk_builder_get_object (_tmp95_, "miLog");
-	_tmp97_ = _g_object_ref0 (GTK_IS_MENU_ITEM (_tmp96_) ? ((GtkMenuItem*) _tmp96_) : NULL);
-	logs = _tmp97_;
-	g_signal_connect (logs, "activate", (GCallback) ___lambda12__gtk_menu_item_activate, self);
-	_tmp98_ = gtk_status_icon_new_from_icon_name ("mail-send-receive");
+	_tmp88_ = gtk_builder_get_object (_tmp87_, "mRight");
+	_tmp89_ = _g_object_ref0 (GTK_IS_MENU (_tmp88_) ? ((GtkMenu*) _tmp88_) : NULL);
+	_g_object_unref0 (self->priv->menuR);
+	self->priv->menuR = _tmp89_;
+	_tmp90_ = self->priv->builder;
+	_tmp91_ = gtk_builder_get_object (_tmp90_, "miQuit");
+	_tmp92_ = _g_object_ref0 (GTK_IS_MENU_ITEM (_tmp91_) ? ((GtkMenuItem*) _tmp91_) : NULL);
+	quit = _tmp92_;
+	g_signal_connect (quit, "activate", (GCallback) ___lambda10__gtk_menu_item_activate, self);
+	_tmp93_ = self->priv->builder;
+	_tmp94_ = gtk_builder_get_object (_tmp93_, "miPause");
+	_tmp95_ = _g_object_ref0 (GTK_IS_CHECK_MENU_ITEM (_tmp94_) ? ((GtkCheckMenuItem*) _tmp94_) : NULL);
+	_g_object_unref0 (self->priv->miPause);
+	self->priv->miPause = _tmp95_;
+	_tmp96_ = self->priv->miPause;
+	g_signal_connect (_tmp96_, "toggled", (GCallback) ___lambda11__gtk_check_menu_item_toggled, self);
+	_tmp97_ = self->priv->builder;
+	_tmp98_ = gtk_builder_get_object (_tmp97_, "miAbout");
+	_tmp99_ = _g_object_ref0 (GTK_IS_MENU_ITEM (_tmp98_) ? ((GtkMenuItem*) _tmp98_) : NULL);
+	about = _tmp99_;
+	_tmp100_ = self->priv->about_win;
+	g_signal_connect ((GtkDialog*) _tmp100_, "response", (GCallback) ___lambda12__gtk_dialog_response, self);
+	g_signal_connect (about, "activate", (GCallback) ___lambda13__gtk_menu_item_activate, self);
+	_tmp101_ = self->priv->about_win;
+	gtk_about_dialog_set_comments (_tmp101_, "GNOME applet for syncmaildir version " SMD_CONF_VERSION);
+	_tmp102_ = self->priv->builder;
+	_tmp103_ = gtk_builder_get_object (_tmp102_, "miPrefs");
+	_tmp104_ = _g_object_ref0 (GTK_IS_MENU_ITEM (_tmp103_) ? ((GtkMenuItem*) _tmp103_) : NULL);
+	prefs = _tmp104_;
+	g_signal_connect (prefs, "activate", (GCallback) ___lambda14__gtk_menu_item_activate, self);
+	_tmp105_ = self->priv->builder;
+	_tmp106_ = gtk_builder_get_object (_tmp105_, "miLog");
+	_tmp107_ = _g_object_ref0 (GTK_IS_MENU_ITEM (_tmp106_) ? ((GtkMenuItem*) _tmp106_) : NULL);
+	logs = _tmp107_;
+	g_signal_connect (logs, "activate", (GCallback) ___lambda15__gtk_menu_item_activate, self);
+	_tmp108_ = gtk_status_icon_new_from_icon_name ("mail-send-receive");
 	_g_object_unref0 (self->priv->si);
-	self->priv->si = _tmp98_;
-	_tmp99_ = self->priv->si;
-	_tmp100_ = hide_status_icon;
-	gtk_status_icon_set_visible (_tmp99_, !_tmp100_);
-	_tmp101_ = self->priv->si;
-	gtk_status_icon_set_tooltip_text (_tmp101_, "smd-applet is running");
-	_tmp102_ = self->priv->si;
-	g_signal_connect (_tmp102_, "popup-menu", (GCallback) ___lambda13__gtk_status_icon_popup_menu, self);
-	_tmp103_ = self->priv->si;
-	g_signal_connect (_tmp103_, "activate", (GCallback) ___lambda14__gtk_status_icon_activate, self);
-	_tmp104_ = notify_get_server_caps ();
-	l = _tmp104_;
-	_tmp105_ = g_list_index (l, "persistence");
-	self->priv->notification_server_has_persistence = 0 <= _tmp105_;
-	_tmp106_ = g_direct_hash;
-	_tmp107_ = g_str_equal;
-	_tmp108_ = g_hash_table_new_full (_tmp106_, _tmp107_, _g_object_unref0_, _g_free0_);
+	self->priv->si = _tmp108_;
+	_tmp109_ = self->priv->si;
+	_tmp110_ = hide_status_icon;
+	gtk_status_icon_set_visible (_tmp109_, !_tmp110_);
+	_tmp111_ = self->priv->si;
+	gtk_status_icon_set_tooltip_text (_tmp111_, "smd-applet is running");
+	_tmp112_ = self->priv->si;
+	g_signal_connect (_tmp112_, "popup-menu", (GCallback) ___lambda16__gtk_status_icon_popup_menu, self);
+	_tmp113_ = self->priv->si;
+	g_signal_connect (_tmp113_, "activate", (GCallback) ___lambda17__gtk_status_icon_activate, self);
+	_tmp114_ = notify_get_server_caps ();
+	l = _tmp114_;
+	_tmp115_ = g_list_index (l, "persistence");
+	self->priv->notification_server_has_persistence = 0 <= _tmp115_;
+	_tmp116_ = g_direct_hash;
+	_tmp117_ = g_str_equal;
+	_tmp118_ = g_hash_table_new_full (_tmp116_, _tmp117_, _g_object_unref0_, _g_free0_);
 	_g_hash_table_unref0 (self->priv->command_hash);
-	self->priv->command_hash = _tmp108_;
+	self->priv->command_hash = _tmp118_;
 	_g_object_unref0 (logs);
 	_g_object_unref0 (prefs);
 	_g_object_unref0 (about);
@@ -1979,6 +2149,7 @@
 	_g_object_unref0 (bepp);
 	_g_object_unref0 (bel);
 	_g_object_unref0 (bc);
+	_g_object_unref0 (bautostart);
 	_g_object_unref0 (bnotify);
 	_g_object_unref0 (bicon);
 	_g_object_unref0 (close);
@@ -2023,7 +2194,7 @@
 			_tmp5_ = _tmp4_;
 			if (_inner_error_ != NULL) {
 				if (_inner_error_->domain == EXIT) {
-					goto __catch9_exit;
+					goto __catch11_exit;
 				}
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 				g_clear_error (&_inner_error_);
@@ -2031,8 +2202,8 @@
 			}
 			rc = _tmp5_;
 		}
-		goto __finally9;
-		__catch9_exit:
+		goto __finally11;
+		__catch11_exit:
 		{
 			GError* e = NULL;
 			e = _inner_error_;
@@ -2040,7 +2211,7 @@
 			rc = FALSE;
 			_g_error_free0 (e);
 		}
-		__finally9:
+		__finally11:
 		if (_inner_error_ != NULL) {
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 			g_clear_error (&_inner_error_);
@@ -2065,7 +2236,6 @@
 	gboolean _tmp2_;
 	gboolean _tmp4_;
 	gboolean _tmp9_;
-	GError * _inner_error_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp2_ = force;
 	if (!_tmp2_) {
@@ -2095,39 +2265,10 @@
 		_tmp10_ = self->priv->miPause;
 		gtk_check_menu_item_set_active (_tmp10_, TRUE);
 	} else {
-		{
-			GThread* _tmp11_ = NULL;
-			GThread* _tmp12_;
-			_tmp11_ = g_thread_create (_smd_applet_smdThread_gthread_func, self, TRUE, &_inner_error_);
-			_tmp12_ = _tmp11_;
-			if (_inner_error_ != NULL) {
-				if (_inner_error_->domain == G_THREAD_ERROR) {
-					goto __catch10_g_thread_error;
-				}
-				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-				g_clear_error (&_inner_error_);
-				return;
-			}
-			self->priv->thread = _tmp12_;
-		}
-		goto __finally10;
-		__catch10_g_thread_error:
-		{
-			GError* e = NULL;
-			FILE* _tmp13_;
-			e = _inner_error_;
-			_inner_error_ = NULL;
-			_tmp13_ = stderr;
-			fprintf (_tmp13_, "Unable to start a thread\n");
-			gtk_main_quit ();
-			_g_error_free0 (e);
-		}
-		__finally10:
-		if (_inner_error_ != NULL) {
-			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-			g_clear_error (&_inner_error_);
-			return;
-		}
+		GThread* _tmp11_;
+		_tmp11_ = g_thread_new (NULL, _smd_applet_smdThread_gthread_func, self);
+		_g_thread_unref0 (self->priv->thread);
+		self->priv->thread = _tmp11_;
 	}
 }
 
@@ -2273,36 +2414,34 @@
 	gchar* _tmp29_;
 	gboolean _tmp30_;
 	gboolean _tmp34_;
-	GMatchInfo* _tmp43_;
-	gchar* _tmp44_ = NULL;
-	gchar* _tmp45_;
-	gboolean _tmp46_;
+	GMatchInfo* _tmp41_;
+	gchar* _tmp42_ = NULL;
+	gchar* _tmp43_;
+	gboolean _tmp44_;
 	gchar* permissions;
 	gchar* mail_name;
 	gchar* mail_body;
-	GeeArrayList* _tmp60_;
+	GeeArrayList* _tmp56_;
 	GeeArrayList* commands;
-	gboolean _tmp61_;
-	GMutex* _tmp134_;
-	GeeArrayList* _tmp135_;
-	GeeArrayList* _tmp136_;
-	gint _tmp137_;
-	gint _tmp138_;
-	const gchar* _tmp139_;
-	const gchar* _tmp140_;
-	GMatchInfo* _tmp141_;
-	gchar* _tmp142_ = NULL;
-	gchar* _tmp143_;
-	GMatchInfo* _tmp144_;
-	gchar* _tmp145_ = NULL;
-	gchar* _tmp146_;
-	const gchar* _tmp147_;
-	const gchar* _tmp148_;
-	const gchar* _tmp149_;
-	GeeArrayList* _tmp150_;
-	Event* _tmp151_ = NULL;
-	Event* _tmp152_;
-	GMutex* _tmp153_;
+	gboolean _tmp57_;
+	GeeArrayList* _tmp130_;
+	GeeArrayList* _tmp131_;
+	gint _tmp132_;
+	gint _tmp133_;
+	const gchar* _tmp134_;
+	const gchar* _tmp135_;
+	GMatchInfo* _tmp136_;
+	gchar* _tmp137_ = NULL;
+	gchar* _tmp138_;
+	GMatchInfo* _tmp139_;
+	gchar* _tmp140_ = NULL;
+	gchar* _tmp141_;
+	const gchar* _tmp142_;
+	const gchar* _tmp143_;
+	const gchar* _tmp144_;
+	GeeArrayList* _tmp145_;
+	Event* _tmp146_ = NULL;
+	Event* _tmp147_;
 	GError * _inner_error_ = NULL;
 	g_return_val_if_fail (self != NULL, FALSE);
 	g_return_val_if_fail (args != NULL, FALSE);
@@ -2463,26 +2602,22 @@
 	}
 	_tmp34_ = _tmp26_;
 	if (_tmp34_) {
-		GMutex* _tmp35_;
+		GeeArrayList* _tmp35_;
 		GeeArrayList* _tmp36_;
-		GeeArrayList* _tmp37_;
+		gint _tmp37_;
 		gint _tmp38_;
-		gint _tmp39_;
-		Event* _tmp40_ = NULL;
-		Event* _tmp41_;
-		GMutex* _tmp42_;
-		_tmp35_ = self->priv->events_lock;
-		g_mutex_lock (_tmp35_);
+		Event* _tmp39_ = NULL;
+		Event* _tmp40_;
+		g_mutex_lock (&self->priv->events_lock);
+		_tmp35_ = self->priv->events;
 		_tmp36_ = self->priv->events;
-		_tmp37_ = self->priv->events;
-		_tmp38_ = gee_collection_get_size ((GeeCollection*) _tmp37_);
-		_tmp39_ = _tmp38_;
-		_tmp40_ = event_network_error ();
-		_tmp41_ = _tmp40_;
-		gee_abstract_list_insert ((GeeAbstractList*) _tmp36_, _tmp39_, _tmp41_);
-		_event_unref0 (_tmp41_);
-		_tmp42_ = self->priv->events_lock;
-		g_mutex_unlock (_tmp42_);
+		_tmp37_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp36_);
+		_tmp38_ = _tmp37_;
+		_tmp39_ = event_network_error ();
+		_tmp40_ = _tmp39_;
+		gee_abstract_list_insert ((GeeAbstractList*) _tmp35_, _tmp38_, _tmp40_);
+		_event_unref0 (_tmp40_);
+		g_mutex_unlock (&self->priv->events_lock);
 		result = TRUE;
 		_g_match_info_free0 (i_act);
 		_g_match_info_free0 (i_human);
@@ -2494,44 +2629,40 @@
 		_g_regex_unref0 (context);
 		return result;
 	}
-	_tmp43_ = i_human;
-	_tmp44_ = g_match_info_fetch (_tmp43_, 1);
-	_tmp45_ = _tmp44_;
-	_tmp46_ = g_strcmp0 (_tmp45_, "necessary") != 0;
-	_g_free0 (_tmp45_);
-	if (_tmp46_) {
-		FILE* _tmp47_;
-		const gchar* _tmp48_;
-		GMutex* _tmp49_;
-		GeeArrayList* _tmp50_;
-		GeeArrayList* _tmp51_;
-		gint _tmp52_;
-		gint _tmp53_;
-		GMatchInfo* _tmp54_;
-		gchar* _tmp55_ = NULL;
-		gchar* _tmp56_;
-		Event* _tmp57_ = NULL;
-		Event* _tmp58_;
-		GMutex* _tmp59_;
-		_tmp47_ = stderr;
-		_tmp48_ = args;
-		fprintf (_tmp47_, "smd-loop giving an avoidable error: %s\n", _tmp48_);
-		_tmp49_ = self->priv->events_lock;
-		g_mutex_lock (_tmp49_);
-		_tmp50_ = self->priv->events;
-		_tmp51_ = self->priv->events;
-		_tmp52_ = gee_collection_get_size ((GeeCollection*) _tmp51_);
+	_tmp41_ = i_human;
+	_tmp42_ = g_match_info_fetch (_tmp41_, 1);
+	_tmp43_ = _tmp42_;
+	_tmp44_ = g_strcmp0 (_tmp43_, "necessary") != 0;
+	_g_free0 (_tmp43_);
+	if (_tmp44_) {
+		FILE* _tmp45_;
+		const gchar* _tmp46_;
+		GeeArrayList* _tmp47_;
+		GeeArrayList* _tmp48_;
+		gint _tmp49_;
+		gint _tmp50_;
+		GMatchInfo* _tmp51_;
+		gchar* _tmp52_ = NULL;
+		gchar* _tmp53_;
+		Event* _tmp54_ = NULL;
+		Event* _tmp55_;
+		_tmp45_ = stderr;
+		_tmp46_ = args;
+		fprintf (_tmp45_, "smd-loop giving an avoidable error: %s\n", _tmp46_);
+		g_mutex_lock (&self->priv->events_lock);
+		_tmp47_ = self->priv->events;
+		_tmp48_ = self->priv->events;
+		_tmp49_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp48_);
+		_tmp50_ = _tmp49_;
+		_tmp51_ = i_cause;
+		_tmp52_ = g_match_info_fetch (_tmp51_, 1);
 		_tmp53_ = _tmp52_;
-		_tmp54_ = i_cause;
-		_tmp55_ = g_match_info_fetch (_tmp54_, 1);
-		_tmp56_ = _tmp55_;
-		_tmp57_ = event_generic_error (_tmp56_);
-		_tmp58_ = _tmp57_;
-		gee_abstract_list_insert ((GeeAbstractList*) _tmp50_, _tmp53_, _tmp58_);
-		_event_unref0 (_tmp58_);
-		_g_free0 (_tmp56_);
-		_tmp59_ = self->priv->events_lock;
-		g_mutex_unlock (_tmp59_);
+		_tmp54_ = event_generic_error (_tmp53_);
+		_tmp55_ = _tmp54_;
+		gee_abstract_list_insert ((GeeAbstractList*) _tmp47_, _tmp50_, _tmp55_);
+		_event_unref0 (_tmp55_);
+		_g_free0 (_tmp53_);
+		g_mutex_unlock (&self->priv->events_lock);
 		result = TRUE;
 		_g_match_info_free0 (i_act);
 		_g_match_info_free0 (i_human);
@@ -2546,103 +2677,103 @@
 	permissions = NULL;
 	mail_name = NULL;
 	mail_body = NULL;
-	_tmp60_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL);
-	commands = _tmp60_;
-	_tmp61_ = has_actions;
-	if (_tmp61_) {
-		GMatchInfo* _tmp62_;
-		gchar* _tmp63_ = NULL;
+	_tmp56_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL);
+	commands = _tmp56_;
+	_tmp57_ = has_actions;
+	if (_tmp57_) {
+		GMatchInfo* _tmp58_;
+		gchar* _tmp59_ = NULL;
 		gchar* acts;
-		GRegex* _tmp64_;
+		GRegex* _tmp60_;
 		GRegex* r_perm;
-		GRegex* _tmp65_;
+		GRegex* _tmp61_;
 		GRegex* r_mail;
-		GRegex* _tmp66_;
+		GRegex* _tmp62_;
 		GRegex* r_cmd;
 		gint from;
-		_tmp62_ = i_act;
-		_tmp63_ = g_match_info_fetch (_tmp62_, 1);
-		acts = _tmp63_;
-		_tmp64_ = g_regex_new ("display-permissions\\(([^\\)]+)\\)", 0, 0, &_inner_error_);
-		r_perm = _tmp64_;
-		if (_inner_error_ != NULL) {
-			if (_inner_error_->domain == G_REGEX_ERROR) {
-				g_propagate_error (error, _inner_error_);
-				_g_free0 (acts);
-				_g_object_unref0 (commands);
-				_g_free0 (mail_body);
-				_g_free0 (mail_name);
-				_g_free0 (permissions);
-				_g_match_info_free0 (i_act);
-				_g_match_info_free0 (i_human);
-				_g_match_info_free0 (i_cause);
-				_g_match_info_free0 (i_ctx);
-				_g_regex_unref0 (actions);
-				_g_regex_unref0 (human);
-				_g_regex_unref0 (cause);
-				_g_regex_unref0 (context);
-				return FALSE;
-			} else {
-				_g_free0 (acts);
-				_g_object_unref0 (commands);
-				_g_free0 (mail_body);
-				_g_free0 (mail_name);
-				_g_free0 (permissions);
-				_g_match_info_free0 (i_act);
-				_g_match_info_free0 (i_human);
-				_g_match_info_free0 (i_cause);
-				_g_match_info_free0 (i_ctx);
-				_g_regex_unref0 (actions);
-				_g_regex_unref0 (human);
-				_g_regex_unref0 (cause);
-				_g_regex_unref0 (context);
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-				g_clear_error (&_inner_error_);
-				return FALSE;
-			}
-		}
-		_tmp65_ = g_regex_new ("display-mail\\(([^\\)]+)\\)", 0, 0, &_inner_error_);
-		r_mail = _tmp65_;
-		if (_inner_error_ != NULL) {
-			if (_inner_error_->domain == G_REGEX_ERROR) {
-				g_propagate_error (error, _inner_error_);
-				_g_regex_unref0 (r_perm);
-				_g_free0 (acts);
-				_g_object_unref0 (commands);
-				_g_free0 (mail_body);
-				_g_free0 (mail_name);
-				_g_free0 (permissions);
-				_g_match_info_free0 (i_act);
-				_g_match_info_free0 (i_human);
-				_g_match_info_free0 (i_cause);
-				_g_match_info_free0 (i_ctx);
-				_g_regex_unref0 (actions);
-				_g_regex_unref0 (human);
-				_g_regex_unref0 (cause);
-				_g_regex_unref0 (context);
-				return FALSE;
-			} else {
-				_g_regex_unref0 (r_perm);
-				_g_free0 (acts);
-				_g_object_unref0 (commands);
-				_g_free0 (mail_body);
-				_g_free0 (mail_name);
-				_g_free0 (permissions);
-				_g_match_info_free0 (i_act);
-				_g_match_info_free0 (i_human);
-				_g_match_info_free0 (i_cause);
-				_g_match_info_free0 (i_ctx);
-				_g_regex_unref0 (actions);
-				_g_regex_unref0 (human);
-				_g_regex_unref0 (cause);
-				_g_regex_unref0 (context);
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-				g_clear_error (&_inner_error_);
-				return FALSE;
-			}
-		}
-		_tmp66_ = g_regex_new ("run\\(([^\\)]+)\\)", 0, 0, &_inner_error_);
-		r_cmd = _tmp66_;
+		_tmp58_ = i_act;
+		_tmp59_ = g_match_info_fetch (_tmp58_, 1);
+		acts = _tmp59_;
+		_tmp60_ = g_regex_new ("display-permissions\\(([^\\)]+)\\)", 0, 0, &_inner_error_);
+		r_perm = _tmp60_;
+		if (_inner_error_ != NULL) {
+			if (_inner_error_->domain == G_REGEX_ERROR) {
+				g_propagate_error (error, _inner_error_);
+				_g_free0 (acts);
+				_g_object_unref0 (commands);
+				_g_free0 (mail_body);
+				_g_free0 (mail_name);
+				_g_free0 (permissions);
+				_g_match_info_free0 (i_act);
+				_g_match_info_free0 (i_human);
+				_g_match_info_free0 (i_cause);
+				_g_match_info_free0 (i_ctx);
+				_g_regex_unref0 (actions);
+				_g_regex_unref0 (human);
+				_g_regex_unref0 (cause);
+				_g_regex_unref0 (context);
+				return FALSE;
+			} else {
+				_g_free0 (acts);
+				_g_object_unref0 (commands);
+				_g_free0 (mail_body);
+				_g_free0 (mail_name);
+				_g_free0 (permissions);
+				_g_match_info_free0 (i_act);
+				_g_match_info_free0 (i_human);
+				_g_match_info_free0 (i_cause);
+				_g_match_info_free0 (i_ctx);
+				_g_regex_unref0 (actions);
+				_g_regex_unref0 (human);
+				_g_regex_unref0 (cause);
+				_g_regex_unref0 (context);
+				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+				g_clear_error (&_inner_error_);
+				return FALSE;
+			}
+		}
+		_tmp61_ = g_regex_new ("display-mail\\(([^\\)]+)\\)", 0, 0, &_inner_error_);
+		r_mail = _tmp61_;
+		if (_inner_error_ != NULL) {
+			if (_inner_error_->domain == G_REGEX_ERROR) {
+				g_propagate_error (error, _inner_error_);
+				_g_regex_unref0 (r_perm);
+				_g_free0 (acts);
+				_g_object_unref0 (commands);
+				_g_free0 (mail_body);
+				_g_free0 (mail_name);
+				_g_free0 (permissions);
+				_g_match_info_free0 (i_act);
+				_g_match_info_free0 (i_human);
+				_g_match_info_free0 (i_cause);
+				_g_match_info_free0 (i_ctx);
+				_g_regex_unref0 (actions);
+				_g_regex_unref0 (human);
+				_g_regex_unref0 (cause);
+				_g_regex_unref0 (context);
+				return FALSE;
+			} else {
+				_g_regex_unref0 (r_perm);
+				_g_free0 (acts);
+				_g_object_unref0 (commands);
+				_g_free0 (mail_body);
+				_g_free0 (mail_name);
+				_g_free0 (permissions);
+				_g_match_info_free0 (i_act);
+				_g_match_info_free0 (i_human);
+				_g_match_info_free0 (i_cause);
+				_g_match_info_free0 (i_ctx);
+				_g_regex_unref0 (actions);
+				_g_regex_unref0 (human);
+				_g_regex_unref0 (cause);
+				_g_regex_unref0 (context);
+				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+				g_clear_error (&_inner_error_);
+				return FALSE;
+			}
+		}
+		_tmp62_ = g_regex_new ("run\\(([^\\)]+)\\)", 0, 0, &_inner_error_);
+		r_cmd = _tmp62_;
 		if (_inner_error_ != NULL) {
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 				g_propagate_error (error, _inner_error_);
@@ -2685,84 +2816,84 @@
 		}
 		from = 0;
 		{
-			gboolean _tmp67_;
-			_tmp67_ = TRUE;
+			gboolean _tmp63_;
+			_tmp63_ = TRUE;
 			while (TRUE) {
-				gboolean _tmp68_;
-				gboolean _tmp69_ = FALSE;
-				const gchar* _tmp70_;
-				gboolean _tmp74_;
+				gboolean _tmp64_;
+				gboolean _tmp65_ = FALSE;
+				const gchar* _tmp66_;
+				gboolean _tmp70_;
 				GMatchInfo* i_cmd;
-				GRegex* _tmp75_;
-				const gchar* _tmp76_;
-				GMatchInfo* _tmp77_ = NULL;
-				gboolean _tmp78_ = FALSE;
-				const gchar* _tmp131_;
-				gint _tmp132_;
-				gchar* _tmp133_ = NULL;
-				_tmp68_ = _tmp67_;
-				if (!_tmp68_) {
+				GRegex* _tmp71_;
+				const gchar* _tmp72_;
+				GMatchInfo* _tmp73_ = NULL;
+				gboolean _tmp74_ = FALSE;
+				const gchar* _tmp127_;
+				gint _tmp128_;
+				gchar* _tmp129_ = NULL;
+				_tmp64_ = _tmp63_;
+				if (!_tmp64_) {
 				}
-				_tmp67_ = FALSE;
-				_tmp70_ = acts;
-				if (_tmp70_ != NULL) {
-					const gchar* _tmp71_;
-					gint _tmp72_;
-					gint _tmp73_;
-					_tmp71_ = acts;
-					_tmp72_ = strlen (_tmp71_);
-					_tmp73_ = _tmp72_;
-					_tmp69_ = _tmp73_ > 0;
+				_tmp63_ = FALSE;
+				_tmp66_ = acts;
+				if (_tmp66_ != NULL) {
+					const gchar* _tmp67_;
+					gint _tmp68_;
+					gint _tmp69_;
+					_tmp67_ = acts;
+					_tmp68_ = strlen (_tmp67_);
+					_tmp69_ = _tmp68_;
+					_tmp65_ = _tmp69_ > 0;
 				} else {
-					_tmp69_ = FALSE;
+					_tmp65_ = FALSE;
 				}
-				_tmp74_ = _tmp69_;
-				if (!_tmp74_) {
+				_tmp70_ = _tmp65_;
+				if (!_tmp70_) {
 					break;
 				}
 				i_cmd = NULL;
-				_tmp75_ = r_perm;
-				_tmp76_ = acts;
-				_tmp78_ = g_regex_match (_tmp75_, _tmp76_, 0, &_tmp77_);
+				_tmp71_ = r_perm;
+				_tmp72_ = acts;
+				_tmp74_ = g_regex_match (_tmp71_, _tmp72_, 0, &_tmp73_);
 				_g_match_info_free0 (i_cmd);
-				i_cmd = _tmp77_;
-				if (_tmp78_) {
-					GMatchInfo* _tmp79_;
-					gint _tmp80_ = 0;
-					GMatchInfo* _tmp81_;
-					gchar* _tmp82_ = NULL;
+				i_cmd = _tmp73_;
+				if (_tmp74_) {
+					GMatchInfo* _tmp75_;
+					gint _tmp76_ = 0;
+					GMatchInfo* _tmp77_;
+					gchar* _tmp78_ = NULL;
 					gchar* file;
 					gchar* output;
 					gchar* err;
-					_tmp79_ = i_cmd;
-					g_match_info_fetch_pos (_tmp79_, 0, NULL, &_tmp80_);
-					from = _tmp80_;
-					_tmp81_ = i_cmd;
-					_tmp82_ = g_match_info_fetch (_tmp81_, 1);
-					file = _tmp82_;
+					_tmp75_ = i_cmd;
+					g_match_info_fetch_pos (_tmp75_, 0, NULL, &_tmp76_);
+					from = _tmp76_;
+					_tmp77_ = i_cmd;
+					_tmp78_ = g_match_info_fetch (_tmp77_, 1);
+					file = _tmp78_;
 					output = NULL;
 					err = NULL;
 					{
-						const gchar* _tmp83_;
-						gchar* _tmp84_;
-						gchar* _tmp85_;
-						gchar* _tmp86_ = NULL;
-						gchar* _tmp87_ = NULL;
-						const gchar* _tmp88_;
-						const gchar* _tmp89_;
-						gchar* _tmp90_;
-						_tmp83_ = file;
-						_tmp84_ = g_strconcat ("ls -ld ", _tmp83_, NULL);
-						_tmp85_ = _tmp84_;
-						g_spawn_command_line_sync (_tmp85_, &_tmp86_, &_tmp87_, NULL, &_inner_error_);
+						const gchar* _tmp79_;
+						gchar* _tmp80_;
+						gchar* _tmp81_;
+						gchar* _tmp82_ = NULL;
+						gchar* _tmp83_ = NULL;
+						const gchar* _tmp84_;
+						const gchar* _tmp85_;
+						gchar* _tmp86_;
+						_tmp79_ = file;
+						_tmp80_ = g_strconcat ("ls -ld ", _tmp79_, NULL);
+						_tmp81_ = _tmp80_;
+						g_spawn_command_line_sync (_tmp81_, &_tmp82_, &_tmp83_, NULL, &_inner_error_);
 						_g_free0 (output);
-						output = _tmp86_;
+						output = _tmp82_;
 						_g_free0 (err);
-						err = _tmp87_;
-						_g_free0 (_tmp85_);
+						err = _tmp83_;
+						_g_free0 (_tmp81_);
 						if (_inner_error_ != NULL) {
 							if (_inner_error_->domain == G_SPAWN_ERROR) {
-								goto __catch11_g_spawn_error;
+								goto __catch12_g_spawn_error;
 							}
 							_g_free0 (err);
 							_g_free0 (output);
@@ -2788,28 +2919,28 @@
 							g_clear_error (&_inner_error_);
 							return FALSE;
 						}
-						_tmp88_ = output;
-						_tmp89_ = err;
-						_tmp90_ = g_strconcat (_tmp88_, _tmp89_, NULL);
+						_tmp84_ = output;
+						_tmp85_ = err;
+						_tmp86_ = g_strconcat (_tmp84_, _tmp85_, NULL);
 						_g_free0 (permissions);
-						permissions = _tmp90_;
+						permissions = _tmp86_;
 					}
-					goto __finally11;
-					__catch11_g_spawn_error:
+					goto __finally12;
+					__catch12_g_spawn_error:
 					{
 						GError* e = NULL;
-						FILE* _tmp91_;
-						GError* _tmp92_;
-						const gchar* _tmp93_;
+						FILE* _tmp87_;
+						GError* _tmp88_;
+						const gchar* _tmp89_;
 						e = _inner_error_;
 						_inner_error_ = NULL;
-						_tmp91_ = stderr;
-						_tmp92_ = e;
-						_tmp93_ = _tmp92_->message;
-						fprintf (_tmp91_, "Spawning ls: %s\n", _tmp93_);
+						_tmp87_ = stderr;
+						_tmp88_ = e;
+						_tmp89_ = _tmp88_->message;
+						fprintf (_tmp87_, "Spawning ls: %s\n", _tmp89_);
 						_g_error_free0 (e);
 					}
-					__finally11:
+					__finally12:
 					if (_inner_error_ != NULL) {
 						if (_inner_error_->domain == G_REGEX_ERROR) {
 							g_propagate_error (error, _inner_error_);
@@ -2864,60 +2995,60 @@
 					_g_free0 (output);
 					_g_free0 (file);
 				} else {
-					GRegex* _tmp94_;
-					const gchar* _tmp95_;
-					GMatchInfo* _tmp96_ = NULL;
-					gboolean _tmp97_ = FALSE;
-					_tmp94_ = r_mail;
-					_tmp95_ = acts;
-					_tmp97_ = g_regex_match (_tmp94_, _tmp95_, 0, &_tmp96_);
+					GRegex* _tmp90_;
+					const gchar* _tmp91_;
+					GMatchInfo* _tmp92_ = NULL;
+					gboolean _tmp93_ = FALSE;
+					_tmp90_ = r_mail;
+					_tmp91_ = acts;
+					_tmp93_ = g_regex_match (_tmp90_, _tmp91_, 0, &_tmp92_);
 					_g_match_info_free0 (i_cmd);
-					i_cmd = _tmp96_;
-					if (_tmp97_) {
-						GMatchInfo* _tmp98_;
-						gint _tmp99_ = 0;
-						GMatchInfo* _tmp100_;
-						gchar* _tmp101_ = NULL;
+					i_cmd = _tmp92_;
+					if (_tmp93_) {
+						GMatchInfo* _tmp94_;
+						gint _tmp95_ = 0;
+						GMatchInfo* _tmp96_;
+						gchar* _tmp97_ = NULL;
 						gchar* file;
-						gchar* _tmp102_;
+						gchar* _tmp98_;
 						gchar* output;
 						gchar* err;
-						_tmp98_ = i_cmd;
-						g_match_info_fetch_pos (_tmp98_, 0, NULL, &_tmp99_);
-						from = _tmp99_;
-						_tmp100_ = i_cmd;
-						_tmp101_ = g_match_info_fetch (_tmp100_, 1);
-						file = _tmp101_;
-						_tmp102_ = g_strdup ("");
-						output = _tmp102_;
+						_tmp94_ = i_cmd;
+						g_match_info_fetch_pos (_tmp94_, 0, NULL, &_tmp95_);
+						from = _tmp95_;
+						_tmp96_ = i_cmd;
+						_tmp97_ = g_match_info_fetch (_tmp96_, 1);
+						file = _tmp97_;
+						_tmp98_ = g_strdup ("");
+						output = _tmp98_;
 						err = NULL;
 						{
-							const gchar* _tmp103_;
-							gchar* _tmp104_;
-							const gchar* _tmp105_;
-							gchar* _tmp106_;
-							gchar* _tmp107_;
-							gchar* _tmp108_ = NULL;
-							gchar* _tmp109_ = NULL;
-							const gchar* _tmp110_;
-							const gchar* _tmp111_;
-							gchar* _tmp112_;
-							_tmp103_ = file;
-							_tmp104_ = g_strdup (_tmp103_);
+							const gchar* _tmp99_;
+							gchar* _tmp100_;
+							const gchar* _tmp101_;
+							gchar* _tmp102_;
+							gchar* _tmp103_;
+							gchar* _tmp104_ = NULL;
+							gchar* _tmp105_ = NULL;
+							const gchar* _tmp106_;
+							const gchar* _tmp107_;
+							gchar* _tmp108_;
+							_tmp99_ = file;
+							_tmp100_ = g_strdup (_tmp99_);
 							_g_free0 (mail_name);
-							mail_name = _tmp104_;
-							_tmp105_ = file;
-							_tmp106_ = g_strconcat ("cat ", _tmp105_, NULL);
-							_tmp107_ = _tmp106_;
-							g_spawn_command_line_sync (_tmp107_, &_tmp108_, &_tmp109_, NULL, &_inner_error_);
+							mail_name = _tmp100_;
+							_tmp101_ = file;
+							_tmp102_ = g_strconcat ("cat ", _tmp101_, NULL);
+							_tmp103_ = _tmp102_;
+							g_spawn_command_line_sync (_tmp103_, &_tmp104_, &_tmp105_, NULL, &_inner_error_);
 							_g_free0 (output);
-							output = _tmp108_;
+							output = _tmp104_;
 							_g_free0 (err);
-							err = _tmp109_;
-							_g_free0 (_tmp107_);
+							err = _tmp105_;
+							_g_free0 (_tmp103_);
 							if (_inner_error_ != NULL) {
 								if (_inner_error_->domain == G_SPAWN_ERROR) {
-									goto __catch12_g_spawn_error;
+									goto __catch13_g_spawn_error;
 								}
 								_g_free0 (err);
 								_g_free0 (output);
@@ -2943,28 +3074,28 @@
 								g_clear_error (&_inner_error_);
 								return FALSE;
 							}
-							_tmp110_ = output;
-							_tmp111_ = err;
-							_tmp112_ = g_strconcat (_tmp110_, _tmp111_, NULL);
+							_tmp106_ = output;
+							_tmp107_ = err;
+							_tmp108_ = g_strconcat (_tmp106_, _tmp107_, NULL);
 							_g_free0 (mail_body);
-							mail_body = _tmp112_;
+							mail_body = _tmp108_;
 						}
-						goto __finally12;
-						__catch12_g_spawn_error:
+						goto __finally13;
+						__catch13_g_spawn_error:
 						{
 							GError* e = NULL;
-							FILE* _tmp113_;
-							GError* _tmp114_;
-							const gchar* _tmp115_;
+							FILE* _tmp109_;
+							GError* _tmp110_;
+							const gchar* _tmp111_;
 							e = _inner_error_;
 							_inner_error_ = NULL;
-							_tmp113_ = stderr;
-							_tmp114_ = e;
-							_tmp115_ = _tmp114_->message;
-							fprintf (_tmp113_, "Spawning ls: %s\n", _tmp115_);
+							_tmp109_ = stderr;
+							_tmp110_ = e;
+							_tmp111_ = _tmp110_->message;
+							fprintf (_tmp109_, "Spawning ls: %s\n", _tmp111_);
 							_g_error_free0 (e);
 						}
-						__finally12:
+						__finally13:
 						if (_inner_error_ != NULL) {
 							if (_inner_error_->domain == G_REGEX_ERROR) {
 								g_propagate_error (error, _inner_error_);
@@ -3019,55 +3150,55 @@
 						_g_free0 (output);
 						_g_free0 (file);
 					} else {
-						GRegex* _tmp116_;
-						const gchar* _tmp117_;
-						GMatchInfo* _tmp118_ = NULL;
-						gboolean _tmp119_ = FALSE;
-						_tmp116_ = r_cmd;
-						_tmp117_ = acts;
-						_tmp119_ = g_regex_match (_tmp116_, _tmp117_, 0, &_tmp118_);
+						GRegex* _tmp112_;
+						const gchar* _tmp113_;
+						GMatchInfo* _tmp114_ = NULL;
+						gboolean _tmp115_ = FALSE;
+						_tmp112_ = r_cmd;
+						_tmp113_ = acts;
+						_tmp115_ = g_regex_match (_tmp112_, _tmp113_, 0, &_tmp114_);
 						_g_match_info_free0 (i_cmd);
-						i_cmd = _tmp118_;
-						if (_tmp119_) {
-							GMatchInfo* _tmp120_;
-							gchar* _tmp121_ = NULL;
+						i_cmd = _tmp114_;
+						if (_tmp115_) {
+							GMatchInfo* _tmp116_;
+							gchar* _tmp117_ = NULL;
 							gchar* command;
-							GMatchInfo* _tmp122_;
-							gint _tmp123_ = 0;
-							GeeArrayList* _tmp124_;
-							GeeArrayList* _tmp125_;
-							gint _tmp126_;
-							gint _tmp127_;
-							const gchar* _tmp128_;
-							_tmp120_ = i_cmd;
-							_tmp121_ = g_match_info_fetch (_tmp120_, 1);
-							command = _tmp121_;
-							_tmp122_ = i_cmd;
-							g_match_info_fetch_pos (_tmp122_, 0, NULL, &_tmp123_);
-							from = _tmp123_;
-							_tmp124_ = commands;
-							_tmp125_ = commands;
-							_tmp126_ = gee_collection_get_size ((GeeCollection*) _tmp125_);
-							_tmp127_ = _tmp126_;
-							_tmp128_ = command;
-							gee_abstract_list_insert ((GeeAbstractList*) _tmp124_, _tmp127_, _tmp128_);
+							GMatchInfo* _tmp118_;
+							gint _tmp119_ = 0;
+							GeeArrayList* _tmp120_;
+							GeeArrayList* _tmp121_;
+							gint _tmp122_;
+							gint _tmp123_;
+							const gchar* _tmp124_;
+							_tmp116_ = i_cmd;
+							_tmp117_ = g_match_info_fetch (_tmp116_, 1);
+							command = _tmp117_;
+							_tmp118_ = i_cmd;
+							g_match_info_fetch_pos (_tmp118_, 0, NULL, &_tmp119_);
+							from = _tmp119_;
+							_tmp120_ = commands;
+							_tmp121_ = commands;
+							_tmp122_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp121_);
+							_tmp123_ = _tmp122_;
+							_tmp124_ = command;
+							gee_abstract_list_insert ((GeeAbstractList*) _tmp120_, _tmp123_, _tmp124_);
 							_g_free0 (command);
 						} else {
-							FILE* _tmp129_;
-							const gchar* _tmp130_;
-							_tmp129_ = stderr;
-							_tmp130_ = acts;
-							fprintf (_tmp129_, "Unrecognized action: %s\n", _tmp130_);
+							FILE* _tmp125_;
+							const gchar* _tmp126_;
+							_tmp125_ = stderr;
+							_tmp126_ = acts;
+							fprintf (_tmp125_, "Unrecognized action: %s\n", _tmp126_);
 							_g_match_info_free0 (i_cmd);
 							break;
 						}
 					}
 				}
-				_tmp131_ = acts;
-				_tmp132_ = from;
-				_tmp133_ = string_substring (_tmp131_, (glong) _tmp132_, (glong) (-1));
+				_tmp127_ = acts;
+				_tmp128_ = from;
+				_tmp129_ = string_substring (_tmp127_, (glong) _tmp128_, (glong) (-1));
 				_g_free0 (acts);
-				acts = _tmp133_;
+				acts = _tmp129_;
 				_g_match_info_free0 (i_cmd);
 			}
 		}
@@ -3076,32 +3207,30 @@
 		_g_regex_unref0 (r_perm);
 		_g_free0 (acts);
 	}
-	_tmp134_ = self->priv->events_lock;
-	g_mutex_lock (_tmp134_);
-	_tmp135_ = self->priv->events;
-	_tmp136_ = self->priv->events;
-	_tmp137_ = gee_collection_get_size ((GeeCollection*) _tmp136_);
+	g_mutex_lock (&self->priv->events_lock);
+	_tmp130_ = self->priv->events;
+	_tmp131_ = self->priv->events;
+	_tmp132_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp131_);
+	_tmp133_ = _tmp132_;
+	_tmp134_ = account;
+	_tmp135_ = host;
+	_tmp136_ = i_ctx;
+	_tmp137_ = g_match_info_fetch (_tmp136_, 1);
 	_tmp138_ = _tmp137_;
-	_tmp139_ = account;
-	_tmp140_ = host;
-	_tmp141_ = i_ctx;
-	_tmp142_ = g_match_info_fetch (_tmp141_, 1);
-	_tmp143_ = _tmp142_;
-	_tmp144_ = i_cause;
-	_tmp145_ = g_match_info_fetch (_tmp144_, 1);
-	_tmp146_ = _tmp145_;
-	_tmp147_ = permissions;
-	_tmp148_ = mail_name;
-	_tmp149_ = mail_body;
-	_tmp150_ = commands;
-	_tmp151_ = event_error (_tmp139_, _tmp140_, _tmp143_, _tmp146_, _tmp147_, _tmp148_, _tmp149_, _tmp150_);
-	_tmp152_ = _tmp151_;
-	gee_abstract_list_insert ((GeeAbstractList*) _tmp135_, _tmp138_, _tmp152_);
-	_event_unref0 (_tmp152_);
-	_g_free0 (_tmp146_);
-	_g_free0 (_tmp143_);
-	_tmp153_ = self->priv->events_lock;
-	g_mutex_unlock (_tmp153_);
+	_tmp139_ = i_cause;
+	_tmp140_ = g_match_info_fetch (_tmp139_, 1);
+	_tmp141_ = _tmp140_;
+	_tmp142_ = permissions;
+	_tmp143_ = mail_name;
+	_tmp144_ = mail_body;
+	_tmp145_ = commands;
+	_tmp146_ = event_error (_tmp134_, _tmp135_, _tmp138_, _tmp141_, _tmp142_, _tmp143_, _tmp144_, _tmp145_);
+	_tmp147_ = _tmp146_;
+	gee_abstract_list_insert ((GeeAbstractList*) _tmp130_, _tmp133_, _tmp147_);
+	_event_unref0 (_tmp147_);
+	_g_free0 (_tmp141_);
+	_g_free0 (_tmp138_);
+	g_mutex_unlock (&self->priv->events_lock);
 	result = FALSE;
 	_g_object_unref0 (commands);
 	_g_free0 (mail_body);
@@ -3162,7 +3291,7 @@
 		if (_inner_error_ != NULL) {
 			_g_match_info_free0 (info);
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-				goto __catch13_g_regex_error;
+				goto __catch14_g_regex_error;
 			}
 			_g_match_info_free0 (info);
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3175,7 +3304,7 @@
 			_g_regex_unref0 (r_tags);
 			_g_match_info_free0 (info);
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-				goto __catch13_g_regex_error;
+				goto __catch14_g_regex_error;
 			}
 			_g_regex_unref0 (r_tags);
 			_g_match_info_free0 (info);
@@ -3234,7 +3363,7 @@
 			_g_regex_unref0 (r_tags);
 			_g_match_info_free0 (info);
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-				goto __catch13_g_regex_error;
+				goto __catch14_g_regex_error;
 			}
 			_g_match_info_free0 (i_args);
 			_g_free0 (tags);
@@ -3259,7 +3388,7 @@
 			_g_regex_unref0 (r_tags);
 			_g_match_info_free0 (info);
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-				goto __catch13_g_regex_error;
+				goto __catch14_g_regex_error;
 			}
 			_g_regex_unref0 (r_stats);
 			_g_match_info_free0 (i_args);
@@ -3318,7 +3447,7 @@
 				_g_regex_unref0 (r_tags);
 				_g_match_info_free0 (info);
 				if (_inner_error_->domain == G_REGEX_ERROR) {
-					goto __catch13_g_regex_error;
+					goto __catch14_g_regex_error;
 				}
 				_g_regex_unref0 (r_error);
 				_g_regex_unref0 (r_stats);
@@ -3347,7 +3476,7 @@
 				_g_regex_unref0 (r_tags);
 				_g_match_info_free0 (info);
 				if (_inner_error_->domain == G_REGEX_ERROR) {
-					goto __catch13_g_regex_error;
+					goto __catch14_g_regex_error;
 				}
 				_g_regex_unref0 (r_neW);
 				_g_regex_unref0 (r_error);
@@ -3428,34 +3557,30 @@
 			}
 			_tmp52_ = _tmp46_;
 			if (_tmp52_) {
-				GMutex* _tmp53_;
+				GeeArrayList* _tmp53_;
 				GeeArrayList* _tmp54_;
-				GeeArrayList* _tmp55_;
+				gint _tmp55_;
 				gint _tmp56_;
-				gint _tmp57_;
+				const gchar* _tmp57_;
 				const gchar* _tmp58_;
-				const gchar* _tmp59_;
+				gint _tmp59_;
 				gint _tmp60_;
-				gint _tmp61_;
-				Event* _tmp62_ = NULL;
-				Event* _tmp63_;
-				GMutex* _tmp64_;
-				_tmp53_ = self->priv->events_lock;
-				g_mutex_lock (_tmp53_);
+				Event* _tmp61_ = NULL;
+				Event* _tmp62_;
+				g_mutex_lock (&self->priv->events_lock);
+				_tmp53_ = self->priv->events;
 				_tmp54_ = self->priv->events;
-				_tmp55_ = self->priv->events;
-				_tmp56_ = gee_collection_get_size ((GeeCollection*) _tmp55_);
-				_tmp57_ = _tmp56_;
-				_tmp58_ = account;
-				_tmp59_ = host;
-				_tmp60_ = new_mails;
-				_tmp61_ = del_mails;
-				_tmp62_ = event_stats (_tmp58_, _tmp59_, _tmp60_, _tmp61_);
-				_tmp63_ = _tmp62_;
-				gee_abstract_list_insert ((GeeAbstractList*) _tmp54_, _tmp57_, _tmp63_);
-				_event_unref0 (_tmp63_);
-				_tmp64_ = self->priv->events_lock;
-				g_mutex_unlock (_tmp64_);
+				_tmp55_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp54_);
+				_tmp56_ = _tmp55_;
+				_tmp57_ = account;
+				_tmp58_ = host;
+				_tmp59_ = new_mails;
+				_tmp60_ = del_mails;
+				_tmp61_ = event_stats (_tmp57_, _tmp58_, _tmp59_, _tmp60_);
+				_tmp62_ = _tmp61_;
+				gee_abstract_list_insert ((GeeAbstractList*) _tmp53_, _tmp56_, _tmp62_);
+				_event_unref0 (_tmp62_);
+				g_mutex_unlock (&self->priv->events_lock);
 			} else {
 			}
 			result = TRUE;
@@ -3475,32 +3600,32 @@
 			_g_match_info_free0 (info);
 			return result;
 		} else {
-			GRegex* _tmp65_;
-			const gchar* _tmp66_;
-			GMatchInfo* _tmp67_ = NULL;
-			gboolean _tmp68_ = FALSE;
-			_tmp65_ = r_error;
-			_tmp66_ = tags;
-			_tmp68_ = g_regex_match (_tmp65_, _tmp66_, 0, &_tmp67_);
+			GRegex* _tmp63_;
+			const gchar* _tmp64_;
+			GMatchInfo* _tmp65_ = NULL;
+			gboolean _tmp66_ = FALSE;
+			_tmp63_ = r_error;
+			_tmp64_ = tags;
+			_tmp66_ = g_regex_match (_tmp63_, _tmp64_, 0, &_tmp65_);
 			_g_match_info_free0 (i_args);
-			i_args = _tmp67_;
-			if (_tmp68_) {
-				GMatchInfo* _tmp69_;
-				gchar* _tmp70_ = NULL;
+			i_args = _tmp65_;
+			if (_tmp66_) {
+				GMatchInfo* _tmp67_;
+				gchar* _tmp68_ = NULL;
 				gchar* args;
+				const gchar* _tmp69_;
+				const gchar* _tmp70_;
 				const gchar* _tmp71_;
-				const gchar* _tmp72_;
-				const gchar* _tmp73_;
-				gboolean _tmp74_ = FALSE;
-				gboolean _tmp75_;
-				_tmp69_ = i_args;
-				_tmp70_ = g_match_info_fetch (_tmp69_, 1);
-				args = _tmp70_;
-				_tmp71_ = args;
-				_tmp72_ = account;
-				_tmp73_ = host;
-				_tmp74_ = smd_applet_eval_smd_loop_error_message (self, _tmp71_, _tmp72_, _tmp73_, &_inner_error_);
-				_tmp75_ = _tmp74_;
+				gboolean _tmp72_ = FALSE;
+				gboolean _tmp73_;
+				_tmp67_ = i_args;
+				_tmp68_ = g_match_info_fetch (_tmp67_, 1);
+				args = _tmp68_;
+				_tmp69_ = args;
+				_tmp70_ = account;
+				_tmp71_ = host;
+				_tmp72_ = smd_applet_eval_smd_loop_error_message (self, _tmp69_, _tmp70_, _tmp71_, &_inner_error_);
+				_tmp73_ = _tmp72_;
 				if (_inner_error_ != NULL) {
 					_g_free0 (args);
 					_g_regex_unref0 (r_error);
@@ -3513,7 +3638,7 @@
 					_g_regex_unref0 (r_tags);
 					_g_match_info_free0 (info);
 					if (_inner_error_->domain == G_REGEX_ERROR) {
-						goto __catch13_g_regex_error;
+						goto __catch14_g_regex_error;
 					}
 					_g_free0 (args);
 					_g_regex_unref0 (r_error);
@@ -3529,7 +3654,7 @@
 					g_clear_error (&_inner_error_);
 					return FALSE;
 				}
-				result = _tmp75_;
+				result = _tmp73_;
 				_g_free0 (args);
 				_g_regex_unref0 (r_error);
 				_g_regex_unref0 (r_stats);
@@ -3542,11 +3667,11 @@
 				_g_match_info_free0 (info);
 				return result;
 			} else {
-				FILE* _tmp76_;
-				const gchar* _tmp77_;
-				_tmp76_ = stderr;
-				_tmp77_ = s;
-				fprintf (_tmp76_, "unhandled smd-loop message: %s\n", _tmp77_);
+				FILE* _tmp74_;
+				const gchar* _tmp75_;
+				_tmp74_ = stderr;
+				_tmp75_ = s;
+				fprintf (_tmp74_, "unhandled smd-loop message: %s\n", _tmp75_);
 				result = TRUE;
 				_g_regex_unref0 (r_error);
 				_g_regex_unref0 (r_stats);
@@ -3570,22 +3695,22 @@
 		_g_regex_unref0 (r_tags);
 		_g_match_info_free0 (info);
 	}
-	goto __finally13;
-	__catch13_g_regex_error:
+	goto __finally14;
+	__catch14_g_regex_error:
 	{
 		GError* e = NULL;
-		FILE* _tmp78_;
-		GError* _tmp79_;
-		const gchar* _tmp80_;
+		FILE* _tmp76_;
+		GError* _tmp77_;
+		const gchar* _tmp78_;
 		e = _inner_error_;
 		_inner_error_ = NULL;
-		_tmp78_ = stderr;
-		_tmp79_ = e;
-		_tmp80_ = _tmp79_->message;
-		fprintf (_tmp78_, "%s\n", _tmp80_);
+		_tmp76_ = stderr;
+		_tmp77_ = e;
+		_tmp78_ = _tmp77_->message;
+		fprintf (_tmp76_, "%s\n", _tmp78_);
 		_g_error_free0 (e);
 	}
-	__finally13:
+	__finally14:
 	if (_inner_error_ != NULL) {
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 		g_clear_error (&_inner_error_);
@@ -3596,13 +3721,13 @@
 }
 
 
-static void ___lambda2_ (smdApplet* self) {
+static void ___lambda4_ (smdApplet* self) {
 	setpgid ((pid_t) 0, (pid_t) 0);
 }
 
 
-static void ____lambda2__gspawn_child_setup_func (gpointer self) {
-	___lambda2_ (self);
+static void ____lambda4__gspawn_child_setup_func (gpointer self) {
+	___lambda4_ (self);
 }
 
 
@@ -3661,19 +3786,19 @@
 		_tmp8_ = cmd;
 		_tmp8__length1 = cmd_length1;
 		_tmp9_ = flags;
-		_tmp14_ = g_spawn_async_with_pipes (NULL, _tmp8_, NULL, _tmp9_, ____lambda2__gspawn_child_setup_func, self, &_tmp10_, &_tmp11_, &_tmp12_, &_tmp13_, &_inner_error_);
+		_tmp14_ = g_spawn_async_with_pipes (NULL, _tmp8_, NULL, _tmp9_, ____lambda4__gspawn_child_setup_func, self, &_tmp10_, &_tmp11_, &_tmp12_, &_tmp13_, &_inner_error_);
 		self->priv->pid = _tmp10_;
 		child_in = _tmp11_;
 		child_out = _tmp12_;
 		child_err = _tmp13_;
 		_tmp15_ = _tmp14_;
 		if (_inner_error_ != NULL) {
-			goto __catch14_g_error;
+			goto __catch15_g_error;
 		}
 		rc = _tmp15_;
 	}
-	goto __finally14;
-	__catch14_g_error:
+	goto __finally15;
+	__catch15_g_error:
 	{
 		GError* e = NULL;
 		FILE* _tmp16_;
@@ -3711,9 +3836,9 @@
 		_tmp28_ = g_error_new_literal (EXIT, EXIT_ABORT, "Unable to run smd-loop");
 		_inner_error_ = _tmp28_;
 		_g_error_free0 (e);
-		goto __finally14;
+		goto __finally15;
 	}
-	__finally14:
+	__finally15:
 	if (_inner_error_ != NULL) {
 		if (_inner_error_->domain == EXIT) {
 			g_propagate_error (error, _inner_error_);
@@ -3878,7 +4003,7 @@
 }
 
 
-static void ______lambda15_ (smdApplet* self, NotifyNotification* not, const gchar* action) {
+static void ______lambda18_ (smdApplet* self, NotifyNotification* not, const gchar* action) {
 	GtkWindow* _tmp0_;
 	g_return_if_fail (not != NULL);
 	g_return_if_fail (action != NULL);
@@ -3887,12 +4012,12 @@
 }
 
 
-static void _______lambda15__notify_action_callback (NotifyNotification* notification, const gchar* action, gpointer self) {
-	______lambda15_ (self, notification, action);
+static void _______lambda18__notify_action_callback (NotifyNotification* notification, const gchar* action, gpointer self) {
+	______lambda18_ (self, notification, action);
 }
 
 
-static void ______lambda16_ (smdApplet* self, GtkButton* b) {
+static void ______lambda19_ (smdApplet* self, GtkButton* b) {
 	gint cmd_status = 0;
 	gchar* output = NULL;
 	gchar* _error_ = NULL;
@@ -3931,7 +4056,7 @@
 		cmd_status = _tmp10_;
 		if (_inner_error_ != NULL) {
 			if (_inner_error_->domain == G_SPAWN_ERROR) {
-				goto __catch19_g_spawn_error;
+				goto __catch20_g_spawn_error;
 			}
 			_g_free0 (_error_);
 			_g_free0 (output);
@@ -3970,8 +4095,8 @@
 			_g_object_unref0 (w);
 		}
 	}
-	goto __finally19;
-	__catch19_g_spawn_error:
+	goto __finally20;
+	__catch20_g_spawn_error:
 	{
 		GError* e = NULL;
 		FILE* _tmp21_;
@@ -3985,7 +4110,7 @@
 		fprintf (_tmp21_, "Spawning: %s\n", _tmp23_);
 		_g_error_free0 (e);
 	}
-	__finally19:
+	__finally20:
 	if (_inner_error_ != NULL) {
 		_g_free0 (_error_);
 		_g_free0 (output);
@@ -3998,8 +4123,8 @@
 }
 
 
-static void _______lambda16__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-	______lambda16_ (self, _sender);
+static void _______lambda19__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+	______lambda19_ (self, _sender);
 }
 
 
@@ -4007,17 +4132,15 @@
 	gboolean result = FALSE;
 	Event* e;
 	gboolean _tmp0_;
-	GMutex* _tmp1_;
-	GeeArrayList* _tmp2_;
+	GeeArrayList* _tmp1_;
+	gint _tmp2_;
 	gint _tmp3_;
-	gint _tmp4_;
-	GMutex* _tmp10_;
-	gboolean _tmp11_ = FALSE;
-	Event* _tmp12_;
-	gboolean _tmp15_;
-	gboolean _tmp65_ = FALSE;
-	Event* _tmp66_;
-	gboolean _tmp69_;
+	gboolean _tmp9_ = FALSE;
+	Event* _tmp10_;
+	gboolean _tmp13_;
+	gboolean _tmp63_ = FALSE;
+	Event* _tmp64_;
+	gboolean _tmp67_;
 	GError * _inner_error_ = NULL;
 	g_return_val_if_fail (self != NULL, FALSE);
 	e = NULL;
@@ -4027,175 +4150,173 @@
 		_event_unref0 (e);
 		return result;
 	}
-	_tmp1_ = self->priv->events_lock;
-	g_mutex_lock (_tmp1_);
-	_tmp2_ = self->priv->events;
-	_tmp3_ = gee_collection_get_size ((GeeCollection*) _tmp2_);
-	_tmp4_ = _tmp3_;
-	if (_tmp4_ > 0) {
-		GeeArrayList* _tmp5_;
-		gpointer _tmp6_ = NULL;
-		GeeArrayList* _tmp7_;
-		gpointer _tmp8_ = NULL;
-		Event* _tmp9_;
-		_tmp5_ = self->priv->events;
-		_tmp6_ = gee_abstract_list_first ((GeeAbstractList*) _tmp5_);
+	g_mutex_lock (&self->priv->events_lock);
+	_tmp1_ = self->priv->events;
+	_tmp2_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp1_);
+	_tmp3_ = _tmp2_;
+	if (_tmp3_ > 0) {
+		GeeArrayList* _tmp4_;
+		gpointer _tmp5_ = NULL;
+		GeeArrayList* _tmp6_;
+		gpointer _tmp7_ = NULL;
+		Event* _tmp8_;
+		_tmp4_ = self->priv->events;
+		_tmp5_ = gee_abstract_list_first ((GeeAbstractList*) _tmp4_);
 		_event_unref0 (e);
-		e = (Event*) _tmp6_;
-		_tmp7_ = self->priv->events;
-		_tmp8_ = gee_abstract_list_remove_at ((GeeAbstractList*) _tmp7_, 0);
-		_tmp9_ = (Event*) _tmp8_;
-		_event_unref0 (_tmp9_);
+		e = (Event*) _tmp5_;
+		_tmp6_ = self->priv->events;
+		_tmp7_ = gee_abstract_list_remove_at ((GeeAbstractList*) _tmp6_, 0);
+		_tmp8_ = (Event*) _tmp7_;
+		_event_unref0 (_tmp8_);
 	}
-	_tmp10_ = self->priv->events_lock;
-	g_mutex_unlock (_tmp10_);
-	_tmp12_ = e;
-	if (_tmp12_ != NULL) {
-		Event* _tmp13_;
-		const gchar* _tmp14_;
-		_tmp13_ = e;
-		_tmp14_ = _tmp13_->message;
-		_tmp11_ = _tmp14_ != NULL;
+	g_mutex_unlock (&self->priv->events_lock);
+	_tmp10_ = e;
+	if (_tmp10_ != NULL) {
+		Event* _tmp11_;
+		const gchar* _tmp12_;
+		_tmp11_ = e;
+		_tmp12_ = _tmp11_->message;
+		_tmp9_ = _tmp12_ != NULL;
 	} else {
-		_tmp11_ = FALSE;
+		_tmp9_ = FALSE;
 	}
-	_tmp15_ = _tmp11_;
-	if (_tmp15_) {
+	_tmp13_ = _tmp9_;
+	if (_tmp13_) {
 		gboolean notify_on_newail;
-		gboolean _tmp22_ = FALSE;
-		Event* _tmp23_;
+		gboolean _tmp20_ = FALSE;
+		Event* _tmp21_;
+		gboolean _tmp22_;
 		gboolean _tmp24_;
-		gboolean _tmp26_;
 		notify_on_newail = FALSE;
 		{
-			GConfClient* _tmp16_;
-			gboolean _tmp17_ = FALSE;
-			gboolean _tmp18_;
-			_tmp16_ = self->priv->gconf;
-			_tmp17_ = gconf_client_get_bool (_tmp16_, SMD_APPLET_key_newmail, &_inner_error_);
-			_tmp18_ = _tmp17_;
+			GConfClient* _tmp14_;
+			gboolean _tmp15_ = FALSE;
+			gboolean _tmp16_;
+			_tmp14_ = self->priv->gconf;
+			_tmp15_ = gconf_client_get_bool (_tmp14_, SMD_APPLET_key_newmail, &_inner_error_);
+			_tmp16_ = _tmp15_;
 			if (_inner_error_ != NULL) {
-				goto __catch15_g_error;
+				goto __catch16_g_error;
 			}
-			notify_on_newail = _tmp18_;
+			notify_on_newail = _tmp16_;
 		}
-		goto __finally15;
-		__catch15_g_error:
+		goto __finally16;
+		__catch16_g_error:
 		{
 			GError* e = NULL;
-			FILE* _tmp19_;
-			GError* _tmp20_;
-			const gchar* _tmp21_;
+			FILE* _tmp17_;
+			GError* _tmp18_;
+			const gchar* _tmp19_;
 			e = _inner_error_;
 			_inner_error_ = NULL;
-			_tmp19_ = stderr;
-			_tmp20_ = e;
-			_tmp21_ = _tmp20_->message;
-			fprintf (_tmp19_, "%s\n", _tmp21_);
+			_tmp17_ = stderr;
+			_tmp18_ = e;
+			_tmp19_ = _tmp18_->message;
+			fprintf (_tmp17_, "%s\n", _tmp19_);
 			_g_error_free0 (e);
 		}
-		__finally15:
+		__finally16:
 		if (_inner_error_ != NULL) {
 			_event_unref0 (e);
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 			g_clear_error (&_inner_error_);
 			return FALSE;
 		}
-		_tmp23_ = e;
-		_tmp24_ = _tmp23_->enter_network_error_mode;
+		_tmp21_ = e;
+		_tmp22_ = _tmp21_->enter_network_error_mode;
+		if (_tmp22_) {
+			gboolean _tmp23_;
+			_tmp23_ = self->priv->network_error_mode;
+			_tmp20_ = _tmp23_;
+		} else {
+			_tmp20_ = FALSE;
+		}
+		_tmp24_ = _tmp20_;
 		if (_tmp24_) {
-			gboolean _tmp25_;
-			_tmp25_ = self->priv->network_error_mode;
-			_tmp22_ = _tmp25_;
-		} else {
-			_tmp22_ = FALSE;
-		}
-		_tmp26_ = _tmp22_;
-		if (_tmp26_) {
-		} else {
-			gboolean _tmp27_ = FALSE;
+		} else {
+			gboolean _tmp25_ = FALSE;
+			gboolean _tmp26_ = FALSE;
+			Event* _tmp27_;
 			gboolean _tmp28_ = FALSE;
-			Event* _tmp29_;
-			gboolean _tmp30_ = FALSE;
-			gboolean _tmp32_;
-			gboolean _tmp39_;
-			_tmp29_ = e;
-			_tmp30_ = event_is_error_event (_tmp29_);
-			if (!_tmp30_) {
-				gboolean _tmp31_;
-				_tmp31_ = notify_on_newail;
-				_tmp28_ = _tmp31_;
+			gboolean _tmp30_;
+			gboolean _tmp37_;
+			_tmp27_ = e;
+			_tmp28_ = event_is_error_event (_tmp27_);
+			if (!_tmp28_) {
+				gboolean _tmp29_;
+				_tmp29_ = notify_on_newail;
+				_tmp26_ = _tmp29_;
 			} else {
-				_tmp28_ = FALSE;
+				_tmp26_ = FALSE;
 			}
-			_tmp32_ = _tmp28_;
-			if (_tmp32_) {
-				_tmp27_ = TRUE;
+			_tmp30_ = _tmp26_;
+			if (_tmp30_) {
+				_tmp25_ = TRUE;
 			} else {
+				gboolean _tmp31_ = FALSE;
+				Event* _tmp32_;
 				gboolean _tmp33_ = FALSE;
-				Event* _tmp34_;
-				gboolean _tmp35_ = FALSE;
-				gboolean _tmp38_;
-				_tmp34_ = e;
-				_tmp35_ = event_is_error_event (_tmp34_);
-				if (_tmp35_) {
-					Event* _tmp36_;
-					gboolean _tmp37_;
-					_tmp36_ = e;
-					_tmp37_ = _tmp36_->enter_network_error_mode;
-					_tmp33_ = _tmp37_;
+				gboolean _tmp36_;
+				_tmp32_ = e;
+				_tmp33_ = event_is_error_event (_tmp32_);
+				if (_tmp33_) {
+					Event* _tmp34_;
+					gboolean _tmp35_;
+					_tmp34_ = e;
+					_tmp35_ = _tmp34_->enter_network_error_mode;
+					_tmp31_ = _tmp35_;
 				} else {
-					_tmp33_ = FALSE;
+					_tmp31_ = FALSE;
 				}
-				_tmp38_ = _tmp33_;
-				_tmp27_ = _tmp38_;
+				_tmp36_ = _tmp31_;
+				_tmp25_ = _tmp36_;
 			}
-			_tmp39_ = _tmp27_;
-			if (_tmp39_) {
+			_tmp37_ = _tmp25_;
+			if (_tmp37_) {
+				Event* _tmp38_;
+				const gchar* _tmp39_;
 				Event* _tmp40_;
 				const gchar* _tmp41_;
-				Event* _tmp42_;
-				const gchar* _tmp43_;
-				NotifyNotification* _tmp44_;
-				NotifyNotification* _tmp45_;
-				GVariant* _tmp46_;
-				GVariant* _tmp47_;
+				NotifyNotification* _tmp42_;
+				NotifyNotification* _tmp43_;
+				GVariant* _tmp44_;
+				GVariant* _tmp45_;
+				_tmp38_ = e;
+				_tmp39_ = _tmp38_->message;
 				_tmp40_ = e;
-				_tmp41_ = _tmp40_->message;
-				_tmp42_ = e;
-				_tmp43_ = _tmp42_->message_icon;
-				_tmp44_ = notify_notification_new ("Syncmaildir", _tmp41_, _tmp43_);
+				_tmp41_ = _tmp40_->message_icon;
+				_tmp42_ = notify_notification_new ("Syncmaildir", _tmp39_, _tmp41_);
 				_g_object_unref0 (self->priv->notification);
-				self->priv->notification = _tmp44_;
-				_tmp45_ = self->priv->notification;
-				_tmp46_ = g_variant_new_boolean (TRUE);
-				_tmp47_ = g_variant_ref_sink (_tmp46_);
-				notify_notification_set_hint (_tmp45_, "transient", _tmp47_);
-				_g_variant_unref0 (_tmp47_);
+				self->priv->notification = _tmp42_;
+				_tmp43_ = self->priv->notification;
+				_tmp44_ = g_variant_new_boolean (TRUE);
+				_tmp45_ = g_variant_ref_sink (_tmp44_);
+				notify_notification_set_hint (_tmp43_, "transient", _tmp45_);
+				_g_variant_unref0 (_tmp45_);
 				{
-					NotifyNotification* _tmp48_;
-					_tmp48_ = self->priv->notification;
-					notify_notification_show (_tmp48_, &_inner_error_);
+					NotifyNotification* _tmp46_;
+					_tmp46_ = self->priv->notification;
+					notify_notification_show (_tmp46_, &_inner_error_);
 					if (_inner_error_ != NULL) {
-						goto __catch16_g_error;
+						goto __catch17_g_error;
 					}
 				}
-				goto __finally16;
-				__catch16_g_error:
+				goto __finally17;
+				__catch17_g_error:
 				{
 					GError* e = NULL;
-					FILE* _tmp49_;
-					GError* _tmp50_;
-					const gchar* _tmp51_;
+					FILE* _tmp47_;
+					GError* _tmp48_;
+					const gchar* _tmp49_;
 					e = _inner_error_;
 					_inner_error_ = NULL;
-					_tmp49_ = stderr;
-					_tmp50_ = e;
-					_tmp51_ = _tmp50_->message;
-					fprintf (_tmp49_, "%s\n", _tmp51_);
+					_tmp47_ = stderr;
+					_tmp48_ = e;
+					_tmp49_ = _tmp48_->message;
+					fprintf (_tmp47_, "%s\n", _tmp49_);
 					_g_error_free0 (e);
 				}
-				__finally16:
+				__finally17:
 				if (_inner_error_ != NULL) {
 					_event_unref0 (e);
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4203,53 +4324,53 @@
 					return FALSE;
 				}
 			} else {
-				Event* _tmp52_;
-				gboolean _tmp53_ = FALSE;
-				_tmp52_ = e;
-				_tmp53_ = event_is_error_event (_tmp52_);
-				if (_tmp53_) {
+				Event* _tmp50_;
+				gboolean _tmp51_ = FALSE;
+				_tmp50_ = e;
+				_tmp51_ = event_is_error_event (_tmp50_);
+				if (_tmp51_) {
+					Event* _tmp52_;
+					const gchar* _tmp53_;
 					Event* _tmp54_;
 					const gchar* _tmp55_;
-					Event* _tmp56_;
-					const gchar* _tmp57_;
+					NotifyNotification* _tmp56_;
+					NotifyNotification* _tmp57_;
 					NotifyNotification* _tmp58_;
-					NotifyNotification* _tmp59_;
-					NotifyNotification* _tmp60_;
+					_tmp52_ = e;
+					_tmp53_ = _tmp52_->message;
 					_tmp54_ = e;
-					_tmp55_ = _tmp54_->message;
-					_tmp56_ = e;
-					_tmp57_ = _tmp56_->message_icon;
-					_tmp58_ = notify_notification_new ("Syncmaildir", _tmp55_, _tmp57_);
+					_tmp55_ = _tmp54_->message_icon;
+					_tmp56_ = notify_notification_new ("Syncmaildir", _tmp53_, _tmp55_);
 					_g_object_unref0 (self->priv->notification);
-					self->priv->notification = _tmp58_;
-					_tmp59_ = self->priv->notification;
-					notify_notification_set_timeout (_tmp59_, 0);
-					_tmp60_ = self->priv->notification;
-					notify_notification_add_action (_tmp60_, "clicked", "Handle error", _______lambda15__notify_action_callback, smd_applet_ref (self), smd_applet_unref);
+					self->priv->notification = _tmp56_;
+					_tmp57_ = self->priv->notification;
+					notify_notification_set_timeout (_tmp57_, 0);
+					_tmp58_ = self->priv->notification;
+					notify_notification_add_action (_tmp58_, "clicked", "Handle error", _______lambda18__notify_action_callback, smd_applet_ref (self), smd_applet_unref);
 					{
-						NotifyNotification* _tmp61_;
-						_tmp61_ = self->priv->notification;
-						notify_notification_show (_tmp61_, &_inner_error_);
+						NotifyNotification* _tmp59_;
+						_tmp59_ = self->priv->notification;
+						notify_notification_show (_tmp59_, &_inner_error_);
 						if (_inner_error_ != NULL) {
-							goto __catch17_g_error;
+							goto __catch18_g_error;
 						}
 					}
-					goto __finally17;
-					__catch17_g_error:
+					goto __finally18;
+					__catch18_g_error:
 					{
 						GError* e = NULL;
-						FILE* _tmp62_;
-						GError* _tmp63_;
-						const gchar* _tmp64_;
+						FILE* _tmp60_;
+						GError* _tmp61_;
+						const gchar* _tmp62_;
 						e = _inner_error_;
 						_inner_error_ = NULL;
-						_tmp62_ = stderr;
-						_tmp63_ = e;
-						_tmp64_ = _tmp63_->message;
-						fprintf (_tmp62_, "%s\n", _tmp64_);
+						_tmp60_ = stderr;
+						_tmp61_ = e;
+						_tmp62_ = _tmp61_->message;
+						fprintf (_tmp60_, "%s\n", _tmp62_);
 						_g_error_free0 (e);
 					}
-					__finally17:
+					__finally18:
 					if (_inner_error_ != NULL) {
 						_event_unref0 (e);
 						g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4260,306 +4381,306 @@
 			}
 		}
 	}
-	_tmp66_ = e;
-	if (_tmp66_ != NULL) {
-		Event* _tmp67_;
-		gboolean _tmp68_;
-		_tmp67_ = e;
-		_tmp68_ = _tmp67_->enter_error_mode;
-		_tmp65_ = _tmp68_;
+	_tmp64_ = e;
+	if (_tmp64_ != NULL) {
+		Event* _tmp65_;
+		gboolean _tmp66_;
+		_tmp65_ = e;
+		_tmp66_ = _tmp65_->enter_error_mode;
+		_tmp63_ = _tmp66_;
 	} else {
-		_tmp65_ = FALSE;
+		_tmp63_ = FALSE;
 	}
-	_tmp69_ = _tmp65_;
-	if (_tmp69_) {
-		GtkStatusIcon* _tmp70_;
-		GtkStatusIcon* _tmp71_;
-		gboolean _tmp72_;
-		GtkBuilder* _tmp74_;
-		GObject* _tmp75_ = NULL;
-		GtkLabel* _tmp76_;
+	_tmp67_ = _tmp63_;
+	if (_tmp67_) {
+		GtkStatusIcon* _tmp68_;
+		GtkStatusIcon* _tmp69_;
+		gboolean _tmp70_;
+		GtkBuilder* _tmp72_;
+		GObject* _tmp73_ = NULL;
+		GtkLabel* _tmp74_;
 		GtkLabel* l_ctx;
-		GtkBuilder* _tmp77_;
-		GObject* _tmp78_ = NULL;
-		GtkLabel* _tmp79_;
+		GtkBuilder* _tmp75_;
+		GObject* _tmp76_ = NULL;
+		GtkLabel* _tmp77_;
 		GtkLabel* l_cause;
-		GtkLabel* _tmp80_;
-		Event* _tmp81_;
-		const gchar* _tmp82_;
-		GtkLabel* _tmp83_;
-		Event* _tmp84_;
-		const gchar* _tmp85_;
-		GHashTable* _tmp86_;
-		GtkBuilder* _tmp87_;
-		GObject* _tmp88_ = NULL;
-		GtkVBox* _tmp89_;
+		GtkLabel* _tmp78_;
+		Event* _tmp79_;
+		const gchar* _tmp80_;
+		GtkLabel* _tmp81_;
+		Event* _tmp82_;
+		const gchar* _tmp83_;
+		GHashTable* _tmp84_;
+		GtkBuilder* _tmp85_;
+		GObject* _tmp86_ = NULL;
+		GtkVBox* _tmp87_;
 		GtkVBox* vb;
-		GtkVBox* _tmp90_;
-		GList* _tmp91_ = NULL;
-		Event* _tmp95_;
-		const gchar* _tmp96_;
-		Event* _tmp103_;
-		const gchar* _tmp104_;
-		Event* _tmp132_;
-		GeeArrayList* _tmp133_;
-		GtkBuilder* _tmp182_;
-		GObject* _tmp183_ = NULL;
-		GtkWidget* _tmp184_;
+		GtkVBox* _tmp88_;
+		GList* _tmp89_ = NULL;
+		Event* _tmp93_;
+		const gchar* _tmp94_;
+		Event* _tmp101_;
+		const gchar* _tmp102_;
+		Event* _tmp130_;
+		GeeArrayList* _tmp131_;
+		GtkBuilder* _tmp180_;
+		GObject* _tmp181_ = NULL;
+		GtkWidget* _tmp182_;
 		GtkWidget* x;
-		GtkWidget* _tmp185_;
-		Event* _tmp186_;
-		const gchar* _tmp187_;
-		GtkBuilder* _tmp188_;
-		GObject* _tmp189_ = NULL;
-		GtkWidget* _tmp190_;
-		GtkWidget* _tmp191_;
-		Event* _tmp192_;
-		const gchar* _tmp193_;
-		GtkBuilder* _tmp194_;
-		GObject* _tmp195_ = NULL;
-		GtkWidget* _tmp196_;
-		GtkWidget* _tmp197_;
-		Event* _tmp198_;
-		GeeArrayList* _tmp199_;
-		gint _tmp200_;
-		gint _tmp201_;
-		_tmp70_ = self->priv->si;
-		gtk_status_icon_set_from_icon_name (_tmp70_, "error");
-		_tmp71_ = self->priv->si;
-		gtk_status_icon_set_tooltip_text (_tmp71_, "smd-applet encountered an error");
+		GtkWidget* _tmp183_;
+		Event* _tmp184_;
+		const gchar* _tmp185_;
+		GtkBuilder* _tmp186_;
+		GObject* _tmp187_ = NULL;
+		GtkWidget* _tmp188_;
+		GtkWidget* _tmp189_;
+		Event* _tmp190_;
+		const gchar* _tmp191_;
+		GtkBuilder* _tmp192_;
+		GObject* _tmp193_ = NULL;
+		GtkWidget* _tmp194_;
+		GtkWidget* _tmp195_;
+		Event* _tmp196_;
+		GeeArrayList* _tmp197_;
+		gint _tmp198_;
+		gint _tmp199_;
+		_tmp68_ = self->priv->si;
+		gtk_status_icon_set_from_icon_name (_tmp68_, "error");
+		_tmp69_ = self->priv->si;
+		gtk_status_icon_set_tooltip_text (_tmp69_, "smd-applet encountered an error");
 		self->priv->error_mode = TRUE;
-		_tmp72_ = self->priv->notification_server_has_persistence;
-		if (!_tmp72_) {
-			GtkStatusIcon* _tmp73_;
-			_tmp73_ = self->priv->si;
-			gtk_status_icon_set_visible (_tmp73_, TRUE);
+		_tmp70_ = self->priv->notification_server_has_persistence;
+		if (!_tmp70_) {
+			GtkStatusIcon* _tmp71_;
+			_tmp71_ = self->priv->si;
+			gtk_status_icon_set_visible (_tmp71_, TRUE);
 		}
-		_tmp74_ = self->priv->builder;
-		_tmp75_ = gtk_builder_get_object (_tmp74_, "lContext");
-		_tmp76_ = _g_object_ref0 (GTK_IS_LABEL (_tmp75_) ? ((GtkLabel*) _tmp75_) : NULL);
-		l_ctx = _tmp76_;
-		_tmp77_ = self->priv->builder;
-		_tmp78_ = gtk_builder_get_object (_tmp77_, "lCause");
-		_tmp79_ = _g_object_ref0 (GTK_IS_LABEL (_tmp78_) ? ((GtkLabel*) _tmp78_) : NULL);
-		l_cause = _tmp79_;
-		_tmp80_ = l_ctx;
-		_tmp81_ = e;
-		_tmp82_ = _tmp81_->context;
-		gtk_label_set_text (_tmp80_, _tmp82_);
-		_tmp83_ = l_cause;
-		_tmp84_ = e;
-		_tmp85_ = _tmp84_->cause;
-		gtk_label_set_text (_tmp83_, _tmp85_);
-		_tmp86_ = self->priv->command_hash;
-		g_hash_table_remove_all (_tmp86_);
-		_tmp87_ = self->priv->builder;
-		_tmp88_ = gtk_builder_get_object (_tmp87_, "vbRun");
-		_tmp89_ = _g_object_ref0 (GTK_IS_VBOX (_tmp88_) ? ((GtkVBox*) _tmp88_) : NULL);
-		vb = _tmp89_;
-		_tmp90_ = vb;
-		_tmp91_ = gtk_container_get_children ((GtkContainer*) _tmp90_);
+		_tmp72_ = self->priv->builder;
+		_tmp73_ = gtk_builder_get_object (_tmp72_, "lContext");
+		_tmp74_ = _g_object_ref0 (GTK_IS_LABEL (_tmp73_) ? ((GtkLabel*) _tmp73_) : NULL);
+		l_ctx = _tmp74_;
+		_tmp75_ = self->priv->builder;
+		_tmp76_ = gtk_builder_get_object (_tmp75_, "lCause");
+		_tmp77_ = _g_object_ref0 (GTK_IS_LABEL (_tmp76_) ? ((GtkLabel*) _tmp76_) : NULL);
+		l_cause = _tmp77_;
+		_tmp78_ = l_ctx;
+		_tmp79_ = e;
+		_tmp80_ = _tmp79_->context;
+		gtk_label_set_text (_tmp78_, _tmp80_);
+		_tmp81_ = l_cause;
+		_tmp82_ = e;
+		_tmp83_ = _tmp82_->cause;
+		gtk_label_set_text (_tmp81_, _tmp83_);
+		_tmp84_ = self->priv->command_hash;
+		g_hash_table_remove_all (_tmp84_);
+		_tmp85_ = self->priv->builder;
+		_tmp86_ = gtk_builder_get_object (_tmp85_, "vbRun");
+		_tmp87_ = _g_object_ref0 (GTK_IS_VBOX (_tmp86_) ? ((GtkVBox*) _tmp86_) : NULL);
+		vb = _tmp87_;
+		_tmp88_ = vb;
+		_tmp89_ = gtk_container_get_children ((GtkContainer*) _tmp88_);
 		{
 			GList* w_collection = NULL;
 			GList* w_it = NULL;
-			w_collection = _tmp91_;
+			w_collection = _tmp89_;
 			for (w_it = w_collection; w_it != NULL; w_it = w_it->next) {
-				GtkWidget* _tmp92_;
+				GtkWidget* _tmp90_;
 				GtkWidget* w = NULL;
-				_tmp92_ = _g_object_ref0 ((GtkWidget*) w_it->data);
-				w = _tmp92_;
+				_tmp90_ = _g_object_ref0 ((GtkWidget*) w_it->data);
+				w = _tmp90_;
 				{
-					GtkVBox* _tmp93_;
-					GtkWidget* _tmp94_;
-					_tmp93_ = vb;
-					_tmp94_ = w;
-					gtk_container_remove ((GtkContainer*) _tmp93_, _tmp94_);
+					GtkVBox* _tmp91_;
+					GtkWidget* _tmp92_;
+					_tmp91_ = vb;
+					_tmp92_ = w;
+					gtk_container_remove ((GtkContainer*) _tmp91_, _tmp92_);
 					_g_object_unref0 (w);
 				}
 			}
 			_g_list_free0 (w_collection);
 		}
-		_tmp95_ = e;
-		_tmp96_ = _tmp95_->permissions;
-		if (_tmp96_ != NULL) {
-			GtkBuilder* _tmp97_;
-			GObject* _tmp98_ = NULL;
-			GtkLabel* _tmp99_;
+		_tmp93_ = e;
+		_tmp94_ = _tmp93_->permissions;
+		if (_tmp94_ != NULL) {
+			GtkBuilder* _tmp95_;
+			GObject* _tmp96_ = NULL;
+			GtkLabel* _tmp97_;
 			GtkLabel* l;
-			GtkLabel* _tmp100_;
-			Event* _tmp101_;
-			const gchar* _tmp102_;
-			_tmp97_ = self->priv->builder;
-			_tmp98_ = gtk_builder_get_object (_tmp97_, "lPermissions");
-			_tmp99_ = _g_object_ref0 (GTK_IS_LABEL (_tmp98_) ? ((GtkLabel*) _tmp98_) : NULL);
-			l = _tmp99_;
-			_tmp100_ = l;
-			_tmp101_ = e;
-			_tmp102_ = _tmp101_->permissions;
-			gtk_label_set_text (_tmp100_, _tmp102_);
+			GtkLabel* _tmp98_;
+			Event* _tmp99_;
+			const gchar* _tmp100_;
+			_tmp95_ = self->priv->builder;
+			_tmp96_ = gtk_builder_get_object (_tmp95_, "lPermissions");
+			_tmp97_ = _g_object_ref0 (GTK_IS_LABEL (_tmp96_) ? ((GtkLabel*) _tmp96_) : NULL);
+			l = _tmp97_;
+			_tmp98_ = l;
+			_tmp99_ = e;
+			_tmp100_ = _tmp99_->permissions;
+			gtk_label_set_text (_tmp98_, _tmp100_);
 			_g_object_unref0 (l);
 		}
-		_tmp103_ = e;
-		_tmp104_ = _tmp103_->mail_name;
-		if (_tmp104_ != NULL) {
-			GtkBuilder* _tmp105_;
-			GObject* _tmp106_ = NULL;
-			GtkEntry* _tmp107_;
+		_tmp101_ = e;
+		_tmp102_ = _tmp101_->mail_name;
+		if (_tmp102_ != NULL) {
+			GtkBuilder* _tmp103_;
+			GObject* _tmp104_ = NULL;
+			GtkEntry* _tmp105_;
 			GtkEntry* fn;
-			GtkEntry* _tmp108_;
-			Event* _tmp109_;
-			const gchar* _tmp110_;
-			GtkBuilder* _tmp111_;
-			GObject* _tmp112_ = NULL;
-			GtkTextView* _tmp113_;
+			GtkEntry* _tmp106_;
+			Event* _tmp107_;
+			const gchar* _tmp108_;
+			GtkBuilder* _tmp109_;
+			GObject* _tmp110_ = NULL;
+			GtkTextView* _tmp111_;
 			GtkTextView* l;
-			GtkTextView* _tmp114_;
-			GtkTextBuffer* _tmp115_ = NULL;
-			GtkTextBuffer* _tmp116_;
+			GtkTextView* _tmp112_;
+			GtkTextBuffer* _tmp113_ = NULL;
+			GtkTextBuffer* _tmp114_;
 			GtkTextBuffer* b;
-			GtkTextBuffer* _tmp117_;
-			Event* _tmp118_;
-			const gchar* _tmp119_;
+			GtkTextBuffer* _tmp115_;
+			Event* _tmp116_;
+			const gchar* _tmp117_;
 			GtkTextIter it = {0};
 			GtkTextIter subj = {0};
-			GtkTextBuffer* _tmp120_;
-			GtkTextIter _tmp121_ = {0};
-			GtkTextIter _tmp122_ = {0};
-			gboolean _tmp123_ = FALSE;
-			_tmp105_ = self->priv->builder;
-			_tmp106_ = gtk_builder_get_object (_tmp105_, "eMailName");
-			_tmp107_ = _g_object_ref0 (GTK_IS_ENTRY (_tmp106_) ? ((GtkEntry*) _tmp106_) : NULL);
-			fn = _tmp107_;
-			_tmp108_ = fn;
-			_tmp109_ = e;
-			_tmp110_ = _tmp109_->mail_name;
-			gtk_entry_set_text (_tmp108_, _tmp110_);
-			_tmp111_ = self->priv->builder;
-			_tmp112_ = gtk_builder_get_object (_tmp111_, "tvMail");
-			_tmp113_ = _g_object_ref0 (GTK_IS_TEXT_VIEW (_tmp112_) ? ((GtkTextView*) _tmp112_) : NULL);
-			l = _tmp113_;
-			_tmp114_ = l;
-			_tmp115_ = gtk_text_view_get_buffer (_tmp114_);
-			_tmp116_ = _g_object_ref0 (_tmp115_);
-			b = _tmp116_;
-			_tmp117_ = b;
-			_tmp118_ = e;
-			_tmp119_ = _tmp118_->mail_body;
-			gtk_text_buffer_set_text (_tmp117_, _tmp119_, -1);
-			_tmp120_ = b;
-			gtk_text_buffer_get_start_iter (_tmp120_, &_tmp121_);
-			it = _tmp121_;
-			_tmp123_ = gtk_text_iter_forward_search (&it, "Subject:", GTK_TEXT_SEARCH_TEXT_ONLY, &_tmp122_, NULL, NULL);
-			subj = _tmp122_;
-			if (_tmp123_) {
-				GtkTextBuffer* _tmp124_;
-				GtkTextMark* _tmp125_ = NULL;
-				GtkTextMark* _tmp126_;
+			GtkTextBuffer* _tmp118_;
+			GtkTextIter _tmp119_ = {0};
+			GtkTextIter _tmp120_ = {0};
+			gboolean _tmp121_ = FALSE;
+			_tmp103_ = self->priv->builder;
+			_tmp104_ = gtk_builder_get_object (_tmp103_, "eMailName");
+			_tmp105_ = _g_object_ref0 (GTK_IS_ENTRY (_tmp104_) ? ((GtkEntry*) _tmp104_) : NULL);
+			fn = _tmp105_;
+			_tmp106_ = fn;
+			_tmp107_ = e;
+			_tmp108_ = _tmp107_->mail_name;
+			gtk_entry_set_text (_tmp106_, _tmp108_);
+			_tmp109_ = self->priv->builder;
+			_tmp110_ = gtk_builder_get_object (_tmp109_, "tvMail");
+			_tmp111_ = _g_object_ref0 (GTK_IS_TEXT_VIEW (_tmp110_) ? ((GtkTextView*) _tmp110_) : NULL);
+			l = _tmp111_;
+			_tmp112_ = l;
+			_tmp113_ = gtk_text_view_get_buffer (_tmp112_);
+			_tmp114_ = _g_object_ref0 (_tmp113_);
+			b = _tmp114_;
+			_tmp115_ = b;
+			_tmp116_ = e;
+			_tmp117_ = _tmp116_->mail_body;
+			gtk_text_buffer_set_text (_tmp115_, _tmp117_, -1);
+			_tmp118_ = b;
+			gtk_text_buffer_get_start_iter (_tmp118_, &_tmp119_);
+			it = _tmp119_;
+			_tmp121_ = gtk_text_iter_forward_search (&it, "Subject:", GTK_TEXT_SEARCH_TEXT_ONLY, &_tmp120_, NULL, NULL);
+			subj = _tmp120_;
+			if (_tmp121_) {
+				GtkTextBuffer* _tmp122_;
+				GtkTextMark* _tmp123_ = NULL;
+				GtkTextMark* _tmp124_;
 				GtkTextMark* insert;
-				GtkTextBuffer* _tmp127_;
-				GtkTextIter _tmp128_;
-				GtkTextIter _tmp129_;
-				GtkTextView* _tmp130_;
-				GtkTextMark* _tmp131_;
-				_tmp124_ = b;
-				_tmp125_ = gtk_text_buffer_get_insert (_tmp124_);
-				_tmp126_ = _g_object_ref0 (_tmp125_);
-				insert = _tmp126_;
-				_tmp127_ = b;
-				_tmp128_ = subj;
-				_tmp129_ = subj;
-				gtk_text_buffer_select_range (_tmp127_, &_tmp128_, &_tmp129_);
-				_tmp130_ = l;
-				_tmp131_ = insert;
-				gtk_text_view_scroll_to_mark (_tmp130_, _tmp131_, 0.0, TRUE, 0.0, 0.0);
+				GtkTextBuffer* _tmp125_;
+				GtkTextIter _tmp126_;
+				GtkTextIter _tmp127_;
+				GtkTextView* _tmp128_;
+				GtkTextMark* _tmp129_;
+				_tmp122_ = b;
+				_tmp123_ = gtk_text_buffer_get_insert (_tmp122_);
+				_tmp124_ = _g_object_ref0 (_tmp123_);
+				insert = _tmp124_;
+				_tmp125_ = b;
+				_tmp126_ = subj;
+				_tmp127_ = subj;
+				gtk_text_buffer_select_range (_tmp125_, &_tmp126_, &_tmp127_);
+				_tmp128_ = l;
+				_tmp129_ = insert;
+				gtk_text_view_scroll_to_mark (_tmp128_, _tmp129_, 0.0, TRUE, 0.0, 0.0);
 				_g_object_unref0 (insert);
 			}
 			_g_object_unref0 (b);
 			_g_object_unref0 (l);
 			_g_object_unref0 (fn);
 		}
-		_tmp132_ = e;
-		_tmp133_ = _tmp132_->commands;
-		if (_tmp133_ != NULL) {
+		_tmp130_ = e;
+		_tmp131_ = _tmp130_->commands;
+		if (_tmp131_ != NULL) {
 			{
-				Event* _tmp134_;
+				Event* _tmp132_;
+				GeeArrayList* _tmp133_;
+				GeeArrayList* _tmp134_;
+				GeeArrayList* _command_list;
 				GeeArrayList* _tmp135_;
-				GeeArrayList* _tmp136_;
-				GeeArrayList* _command_list;
-				GeeArrayList* _tmp137_;
-				gint _tmp138_;
-				gint _tmp139_;
+				gint _tmp136_;
+				gint _tmp137_;
 				gint _command_size;
 				gint _command_index;
-				_tmp134_ = e;
-				_tmp135_ = _tmp134_->commands;
-				_tmp136_ = _g_object_ref0 (_tmp135_);
-				_command_list = _tmp136_;
-				_tmp137_ = _command_list;
-				_tmp138_ = gee_collection_get_size ((GeeCollection*) _tmp137_);
-				_tmp139_ = _tmp138_;
-				_command_size = _tmp139_;
+				_tmp132_ = e;
+				_tmp133_ = _tmp132_->commands;
+				_tmp134_ = _g_object_ref0 (_tmp133_);
+				_command_list = _tmp134_;
+				_tmp135_ = _command_list;
+				_tmp136_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp135_);
+				_tmp137_ = _tmp136_;
+				_command_size = _tmp137_;
 				_command_index = -1;
 				while (TRUE) {
+					gint _tmp138_;
+					gint _tmp139_;
 					gint _tmp140_;
-					gint _tmp141_;
+					GeeArrayList* _tmp141_;
 					gint _tmp142_;
-					GeeArrayList* _tmp143_;
-					gint _tmp144_;
-					gpointer _tmp145_ = NULL;
+					gpointer _tmp143_ = NULL;
 					gchar* command;
-					GtkHBox* _tmp146_;
-					GtkHBox* _tmp147_;
+					GtkHBox* _tmp144_;
+					GtkHBox* _tmp145_;
 					GtkHBox* hb;
 					gchar* nice_command = NULL;
-					const gchar* _tmp163_;
+					const gchar* _tmp161_;
+					GtkLabel* _tmp162_;
+					GtkLabel* _tmp163_;
+					GtkLabel* lbl;
 					GtkLabel* _tmp164_;
-					GtkLabel* _tmp165_;
-					GtkLabel* lbl;
-					GtkLabel* _tmp166_;
-					GtkButton* _tmp167_;
+					GtkButton* _tmp165_;
+					GtkButton* _tmp166_;
+					GtkButton* but;
+					GHashTable* _tmp167_;
 					GtkButton* _tmp168_;
-					GtkButton* but;
-					GHashTable* _tmp169_;
-					GtkButton* _tmp170_;
-					GtkWidget* _tmp171_;
-					const gchar* _tmp172_;
-					gchar* _tmp173_;
-					GtkButton* _tmp174_;
+					GtkWidget* _tmp169_;
+					const gchar* _tmp170_;
+					gchar* _tmp171_;
+					GtkButton* _tmp172_;
+					GtkHBox* _tmp173_;
+					GtkLabel* _tmp174_;
 					GtkHBox* _tmp175_;
-					GtkLabel* _tmp176_;
-					GtkHBox* _tmp177_;
-					GtkButton* _tmp178_;
-					GtkVBox* _tmp179_;
-					GtkHBox* _tmp180_;
-					GtkHBox* _tmp181_;
-					_tmp140_ = _command_index;
-					_command_index = _tmp140_ + 1;
-					_tmp141_ = _command_index;
-					_tmp142_ = _command_size;
-					if (!(_tmp141_ < _tmp142_)) {
+					GtkButton* _tmp176_;
+					GtkVBox* _tmp177_;
+					GtkHBox* _tmp178_;
+					GtkHBox* _tmp179_;
+					_tmp138_ = _command_index;
+					_command_index = _tmp138_ + 1;
+					_tmp139_ = _command_index;
+					_tmp140_ = _command_size;
+					if (!(_tmp139_ < _tmp140_)) {
 						break;
 					}
-					_tmp143_ = _command_list;
-					_tmp144_ = _command_index;
-					_tmp145_ = gee_abstract_list_get ((GeeAbstractList*) _tmp143_, _tmp144_);
-					command = (gchar*) _tmp145_;
-					_tmp146_ = (GtkHBox*) gtk_hbox_new (FALSE, 10);
-					_tmp147_ = g_object_ref_sink (_tmp146_);
-					hb = _tmp147_;
+					_tmp141_ = _command_list;
+					_tmp142_ = _command_index;
+					_tmp143_ = gee_abstract_list_get ((GeeAbstractList*) _tmp141_, _tmp142_);
+					command = (gchar*) _tmp143_;
+					_tmp144_ = (GtkHBox*) gtk_hbox_new (FALSE, 10);
+					_tmp145_ = g_object_ref_sink (_tmp144_);
+					hb = _tmp145_;
 					{
 						GMatchInfo* i_mailto = NULL;
-						GRegex* _tmp148_;
+						GRegex* _tmp146_;
 						GRegex* mailto_rex;
-						GRegex* _tmp149_;
-						const gchar* _tmp150_;
-						GMatchInfo* _tmp151_ = NULL;
-						gboolean _tmp152_ = FALSE;
-						_tmp148_ = g_regex_new ("^gnome-open..mailto:", 0, 0, &_inner_error_);
-						mailto_rex = _tmp148_;
+						GRegex* _tmp147_;
+						const gchar* _tmp148_;
+						GMatchInfo* _tmp149_ = NULL;
+						gboolean _tmp150_ = FALSE;
+						_tmp146_ = g_regex_new ("^gnome-open..mailto:", 0, 0, &_inner_error_);
+						mailto_rex = _tmp146_;
 						if (_inner_error_ != NULL) {
 							_g_match_info_free0 (i_mailto);
 							if (_inner_error_->domain == G_REGEX_ERROR) {
-								goto __catch18_g_regex_error;
+								goto __catch19_g_regex_error;
 							}
 							_g_match_info_free0 (i_mailto);
 							_g_free0 (nice_command);
@@ -4574,54 +4695,54 @@
 							g_clear_error (&_inner_error_);
 							return FALSE;
 						}
-						_tmp149_ = mailto_rex;
-						_tmp150_ = command;
-						_tmp152_ = g_regex_match (_tmp149_, _tmp150_, 0, &_tmp151_);
+						_tmp147_ = mailto_rex;
+						_tmp148_ = command;
+						_tmp150_ = g_regex_match (_tmp147_, _tmp148_, 0, &_tmp149_);
 						_g_match_info_free0 (i_mailto);
-						i_mailto = _tmp151_;
-						if (_tmp152_) {
-							const gchar* _tmp153_;
+						i_mailto = _tmp149_;
+						if (_tmp150_) {
+							const gchar* _tmp151_;
+							gchar* _tmp152_ = NULL;
+							gchar* _tmp153_;
 							gchar* _tmp154_ = NULL;
 							gchar* _tmp155_;
-							gchar* _tmp156_ = NULL;
-							gchar* _tmp157_;
+							gchar* _tmp156_;
+							_tmp151_ = command;
+							_tmp152_ = g_uri_unescape_string (_tmp151_, NULL);
+							_tmp153_ = _tmp152_;
+							_tmp154_ = string_substring (_tmp153_, (glong) 12, (glong) 70);
+							_tmp155_ = _tmp154_;
+							_tmp156_ = g_strconcat (_tmp155_, "...", NULL);
+							_g_free0 (nice_command);
+							nice_command = _tmp156_;
+							_g_free0 (_tmp155_);
+							_g_free0 (_tmp153_);
+						} else {
+							const gchar* _tmp157_;
 							gchar* _tmp158_;
-							_tmp153_ = command;
-							_tmp154_ = g_uri_unescape_string (_tmp153_, NULL);
-							_tmp155_ = _tmp154_;
-							_tmp156_ = string_substring (_tmp155_, (glong) 12, (glong) 70);
-							_tmp157_ = _tmp156_;
-							_tmp158_ = g_strconcat (_tmp157_, "...", NULL);
+							_tmp157_ = command;
+							_tmp158_ = g_strdup (_tmp157_);
 							_g_free0 (nice_command);
 							nice_command = _tmp158_;
-							_g_free0 (_tmp157_);
-							_g_free0 (_tmp155_);
-						} else {
-							const gchar* _tmp159_;
-							gchar* _tmp160_;
-							_tmp159_ = command;
-							_tmp160_ = g_strdup (_tmp159_);
-							_g_free0 (nice_command);
-							nice_command = _tmp160_;
 						}
 						_g_regex_unref0 (mailto_rex);
 						_g_match_info_free0 (i_mailto);
 					}
-					goto __finally18;
-					__catch18_g_regex_error:
+					goto __finally19;
+					__catch19_g_regex_error:
 					{
 						GError* e = NULL;
-						const gchar* _tmp161_;
-						gchar* _tmp162_;
+						const gchar* _tmp159_;
+						gchar* _tmp160_;
 						e = _inner_error_;
 						_inner_error_ = NULL;
-						_tmp161_ = command;
-						_tmp162_ = g_strdup (_tmp161_);
+						_tmp159_ = command;
+						_tmp160_ = g_strdup (_tmp159_);
 						_g_free0 (nice_command);
-						nice_command = _tmp162_;
+						nice_command = _tmp160_;
 						_g_error_free0 (e);
 					}
-					__finally18:
+					__finally19:
 					if (_inner_error_ != NULL) {
 						_g_free0 (nice_command);
 						_g_object_unref0 (hb);
@@ -4635,34 +4756,34 @@
 						g_clear_error (&_inner_error_);
 						return FALSE;
 					}
-					_tmp163_ = nice_command;
-					_tmp164_ = (GtkLabel*) gtk_label_new (_tmp163_);
-					_tmp165_ = g_object_ref_sink (_tmp164_);
-					lbl = _tmp165_;
-					_tmp166_ = lbl;
-					gtk_misc_set_alignment ((GtkMisc*) _tmp166_, 0.0f, 0.5f);
-					_tmp167_ = (GtkButton*) gtk_button_new_from_stock ("gtk-execute");
-					_tmp168_ = g_object_ref_sink (_tmp167_);
-					but = _tmp168_;
-					_tmp169_ = self->priv->command_hash;
-					_tmp170_ = but;
-					_tmp171_ = _g_object_ref0 ((GtkWidget*) _tmp170_);
-					_tmp172_ = command;
-					_tmp173_ = g_strdup (_tmp172_);
-					g_hash_table_insert (_tmp169_, _tmp171_, _tmp173_);
-					_tmp174_ = but;
-					g_signal_connect (_tmp174_, "clicked", (GCallback) _______lambda16__gtk_button_clicked, self);
+					_tmp161_ = nice_command;
+					_tmp162_ = (GtkLabel*) gtk_label_new (_tmp161_);
+					_tmp163_ = g_object_ref_sink (_tmp162_);
+					lbl = _tmp163_;
+					_tmp164_ = lbl;
+					gtk_misc_set_alignment ((GtkMisc*) _tmp164_, 0.0f, 0.5f);
+					_tmp165_ = (GtkButton*) gtk_button_new_from_stock ("gtk-execute");
+					_tmp166_ = g_object_ref_sink (_tmp165_);
+					but = _tmp166_;
+					_tmp167_ = self->priv->command_hash;
+					_tmp168_ = but;
+					_tmp169_ = _g_object_ref0 ((GtkWidget*) _tmp168_);
+					_tmp170_ = command;
+					_tmp171_ = g_strdup (_tmp170_);
+					g_hash_table_insert (_tmp167_, _tmp169_, _tmp171_);
+					_tmp172_ = but;
+					g_signal_connect (_tmp172_, "clicked", (GCallback) _______lambda19__gtk_button_clicked, self);
+					_tmp173_ = hb;
+					_tmp174_ = lbl;
+					gtk_box_pack_end ((GtkBox*) _tmp173_, (GtkWidget*) _tmp174_, TRUE, TRUE, (guint) 0);
 					_tmp175_ = hb;
-					_tmp176_ = lbl;
-					gtk_box_pack_end ((GtkBox*) _tmp175_, (GtkWidget*) _tmp176_, TRUE, TRUE, (guint) 0);
-					_tmp177_ = hb;
-					_tmp178_ = but;
-					gtk_box_pack_end ((GtkBox*) _tmp177_, (GtkWidget*) _tmp178_, FALSE, FALSE, (guint) 0);
-					_tmp179_ = vb;
-					_tmp180_ = hb;
-					gtk_box_pack_end ((GtkBox*) _tmp179_, (GtkWidget*) _tmp180_, TRUE, TRUE, (guint) 0);
-					_tmp181_ = hb;
-					gtk_widget_show_all ((GtkWidget*) _tmp181_);
+					_tmp176_ = but;
+					gtk_box_pack_end ((GtkBox*) _tmp175_, (GtkWidget*) _tmp176_, FALSE, FALSE, (guint) 0);
+					_tmp177_ = vb;
+					_tmp178_ = hb;
+					gtk_box_pack_end ((GtkBox*) _tmp177_, (GtkWidget*) _tmp178_, TRUE, TRUE, (guint) 0);
+					_tmp179_ = hb;
+					gtk_widget_show_all ((GtkWidget*) _tmp179_);
 					_g_object_unref0 (but);
 					_g_object_unref0 (lbl);
 					_g_free0 (nice_command);
@@ -4672,72 +4793,72 @@
 				_g_object_unref0 (_command_list);
 			}
 		}
-		_tmp182_ = self->priv->builder;
-		_tmp183_ = gtk_builder_get_object (_tmp182_, "fDisplayPermissions");
-		_tmp184_ = _g_object_ref0 (GTK_IS_WIDGET (_tmp183_) ? ((GtkWidget*) _tmp183_) : NULL);
-		x = _tmp184_;
-		_tmp185_ = x;
-		_tmp186_ = e;
-		_tmp187_ = _tmp186_->permissions;
-		gtk_widget_set_visible (_tmp185_, _tmp187_ != NULL);
-		_tmp188_ = self->priv->builder;
-		_tmp189_ = gtk_builder_get_object (_tmp188_, "fDisplayMail");
-		_tmp190_ = _g_object_ref0 (GTK_IS_WIDGET (_tmp189_) ? ((GtkWidget*) _tmp189_) : NULL);
-		_g_object_unref0 (x);
-		x = _tmp190_;
-		_tmp191_ = x;
-		_tmp192_ = e;
-		_tmp193_ = _tmp192_->mail_name;
-		gtk_widget_set_visible (_tmp191_, _tmp193_ != NULL);
-		_tmp194_ = self->priv->builder;
-		_tmp195_ = gtk_builder_get_object (_tmp194_, "fRun");
-		_tmp196_ = _g_object_ref0 (GTK_IS_WIDGET (_tmp195_) ? ((GtkWidget*) _tmp195_) : NULL);
-		_g_object_unref0 (x);
-		x = _tmp196_;
-		_tmp197_ = x;
-		_tmp198_ = e;
-		_tmp199_ = _tmp198_->commands;
-		_tmp200_ = gee_collection_get_size ((GeeCollection*) _tmp199_);
-		_tmp201_ = _tmp200_;
-		gtk_widget_set_visible (_tmp197_, _tmp201_ > 0);
+		_tmp180_ = self->priv->builder;
+		_tmp181_ = gtk_builder_get_object (_tmp180_, "fDisplayPermissions");
+		_tmp182_ = _g_object_ref0 (GTK_IS_WIDGET (_tmp181_) ? ((GtkWidget*) _tmp181_) : NULL);
+		x = _tmp182_;
+		_tmp183_ = x;
+		_tmp184_ = e;
+		_tmp185_ = _tmp184_->permissions;
+		gtk_widget_set_visible (_tmp183_, _tmp185_ != NULL);
+		_tmp186_ = self->priv->builder;
+		_tmp187_ = gtk_builder_get_object (_tmp186_, "fDisplayMail");
+		_tmp188_ = _g_object_ref0 (GTK_IS_WIDGET (_tmp187_) ? ((GtkWidget*) _tmp187_) : NULL);
+		_g_object_unref0 (x);
+		x = _tmp188_;
+		_tmp189_ = x;
+		_tmp190_ = e;
+		_tmp191_ = _tmp190_->mail_name;
+		gtk_widget_set_visible (_tmp189_, _tmp191_ != NULL);
+		_tmp192_ = self->priv->builder;
+		_tmp193_ = gtk_builder_get_object (_tmp192_, "fRun");
+		_tmp194_ = _g_object_ref0 (GTK_IS_WIDGET (_tmp193_) ? ((GtkWidget*) _tmp193_) : NULL);
+		_g_object_unref0 (x);
+		x = _tmp194_;
+		_tmp195_ = x;
+		_tmp196_ = e;
+		_tmp197_ = _tmp196_->commands;
+		_tmp198_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp197_);
+		_tmp199_ = _tmp198_;
+		gtk_widget_set_visible (_tmp195_, _tmp199_ > 0);
 		_g_object_unref0 (x);
 		_g_object_unref0 (vb);
 		_g_object_unref0 (l_cause);
 		_g_object_unref0 (l_ctx);
 	} else {
-		gboolean _tmp202_ = FALSE;
-		Event* _tmp203_;
-		gboolean _tmp206_;
-		_tmp203_ = e;
-		if (_tmp203_ != NULL) {
-			Event* _tmp204_;
-			gboolean _tmp205_;
-			_tmp204_ = e;
-			_tmp205_ = _tmp204_->enter_network_error_mode;
-			_tmp202_ = _tmp205_;
+		gboolean _tmp200_ = FALSE;
+		Event* _tmp201_;
+		gboolean _tmp204_;
+		_tmp201_ = e;
+		if (_tmp201_ != NULL) {
+			Event* _tmp202_;
+			gboolean _tmp203_;
+			_tmp202_ = e;
+			_tmp203_ = _tmp202_->enter_network_error_mode;
+			_tmp200_ = _tmp203_;
 		} else {
-			_tmp202_ = FALSE;
+			_tmp200_ = FALSE;
 		}
-		_tmp206_ = _tmp202_;
-		if (_tmp206_) {
-			GtkStatusIcon* _tmp207_;
-			GtkStatusIcon* _tmp208_;
+		_tmp204_ = _tmp200_;
+		if (_tmp204_) {
+			GtkStatusIcon* _tmp205_;
+			GtkStatusIcon* _tmp206_;
 			self->priv->network_error_mode = TRUE;
-			_tmp207_ = self->priv->si;
-			gtk_status_icon_set_from_icon_name (_tmp207_, "dialog-warning");
-			_tmp208_ = self->priv->si;
-			gtk_status_icon_set_tooltip_text (_tmp208_, "Network error");
+			_tmp205_ = self->priv->si;
+			gtk_status_icon_set_from_icon_name (_tmp205_, "dialog-warning");
+			_tmp206_ = self->priv->si;
+			gtk_status_icon_set_tooltip_text (_tmp206_, "Network error");
 		} else {
-			Event* _tmp209_;
-			_tmp209_ = e;
-			if (_tmp209_ != NULL) {
-				GtkStatusIcon* _tmp210_;
-				GtkStatusIcon* _tmp211_;
+			Event* _tmp207_;
+			_tmp207_ = e;
+			if (_tmp207_ != NULL) {
+				GtkStatusIcon* _tmp208_;
+				GtkStatusIcon* _tmp209_;
 				self->priv->network_error_mode = FALSE;
-				_tmp210_ = self->priv->si;
-				gtk_status_icon_set_from_icon_name (_tmp210_, "mail-send-receive");
-				_tmp211_ = self->priv->si;
-				gtk_status_icon_set_tooltip_text (_tmp211_, "smd-applet is running");
+				_tmp208_ = self->priv->si;
+				gtk_status_icon_set_from_icon_name (_tmp208_, "mail-send-receive");
+				_tmp209_ = self->priv->si;
+				gtk_status_icon_set_tooltip_text (_tmp209_, "smd-applet is running");
 			}
 		}
 	}
@@ -4788,13 +4909,13 @@
 		_tmp4_ = gconf_client_get_bool (_tmp3_, SMD_APPLET_key_icon, &_inner_error_);
 		_tmp5_ = _tmp4_;
 		if (_inner_error_ != NULL) {
-			goto __catch20_g_error;
+			goto __catch21_g_error;
 		}
 		_tmp6_ = self->priv->si;
 		gtk_status_icon_set_visible (_tmp6_, !_tmp5_);
 	}
-	goto __finally20;
-	__catch20_g_error:
+	goto __finally21;
+	__catch21_g_error:
 	{
 		GError* e = NULL;
 		FILE* _tmp7_;
@@ -4808,7 +4929,7 @@
 		fprintf (_tmp7_, "%s\n", _tmp9_);
 		_g_error_free0 (e);
 	}
-	__finally20:
+	__finally21:
 	if (_inner_error_ != NULL) {
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 		g_clear_error (&_inner_error_);
@@ -4871,13 +4992,13 @@
 			_tmp6_ = gconf_client_get_bool (_tmp5_, SMD_APPLET_key_icon, &_inner_error_);
 			_tmp7_ = _tmp6_;
 			if (_inner_error_ != NULL) {
-				goto __catch21_g_error;
+				goto __catch22_g_error;
 			}
 			_tmp8_ = self->priv->si;
 			gtk_status_icon_set_visible (_tmp8_, !_tmp7_);
 		}
-		goto __finally21;
-		__catch21_g_error:
+		goto __finally22;
+		__catch22_g_error:
 		{
 			GError* e = NULL;
 			FILE* _tmp9_;
@@ -4891,7 +5012,7 @@
 			fprintf (_tmp9_, "Unable to read gconf key %s: %s\n", SMD_APPLET_key_icon, _tmp11_);
 			_g_error_free0 (e);
 		}
-		__finally21:
+		__finally22:
 		if (_inner_error_ != NULL) {
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 			g_clear_error (&_inner_error_);
@@ -5113,7 +5234,7 @@
 		d = _tmp7_;
 		if (_inner_error_ != NULL) {
 			if (_inner_error_->domain == G_FILE_ERROR) {
-				goto __catch22_g_file_error;
+				goto __catch23_g_file_error;
 			}
 			_g_object_unref0 (b);
 			_g_object_unref0 (tv);
@@ -5152,7 +5273,7 @@
 			gtk_combo_box_text_append_text (_tmp17_, _tmp18_);
 		}
 		_tmp19_ = self->priv->lognames;
-		_tmp20_ = gee_collection_get_size ((GeeCollection*) _tmp19_);
+		_tmp20_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp19_);
 		_tmp21_ = _tmp20_;
 		if (_tmp21_ == 0) {
 			GtkTextBuffer* _tmp22_;
@@ -5176,8 +5297,8 @@
 		_g_free0 (file);
 		_g_dir_close0 (d);
 	}
-	goto __finally22;
-	__catch22_g_file_error:
+	goto __finally23;
+	__catch23_g_file_error:
 	{
 		GError* e = NULL;
 		GtkTextBuffer* _tmp28_;
@@ -5194,7 +5315,7 @@
 		_g_free0 (_tmp31_);
 		_g_error_free0 (e);
 	}
-	__finally22:
+	__finally23:
 	if (_inner_error_ != NULL) {
 		_g_object_unref0 (b);
 		_g_object_unref0 (tv);
@@ -5292,11 +5413,11 @@
 			_tmp13_ = self->priv->notification;
 			notify_notification_show (_tmp13_, &_inner_error_);
 			if (_inner_error_ != NULL) {
-				goto __catch23_g_error;
+				goto __catch24_g_error;
 			}
 		}
-		goto __finally23;
-		__catch23_g_error:
+		goto __finally24;
+		__catch24_g_error:
 		{
 			GError* e = NULL;
 			FILE* _tmp14_;
@@ -5310,7 +5431,7 @@
 			fprintf (_tmp14_, "%s\n", _tmp16_);
 			_g_error_free0 (e);
 		}
-		__finally23:
+		__finally24:
 		if (_inner_error_ != NULL) {
 			if (_inner_error_->domain == EXIT) {
 				g_propagate_error (error, _inner_error_);
@@ -5331,13 +5452,13 @@
 			_tmp18_ = gconf_client_get_bool (_tmp17_, SMD_APPLET_key_icon, &_inner_error_);
 			_tmp19_ = _tmp18_;
 			if (_inner_error_ != NULL) {
-				goto __catch24_g_error;
+				goto __catch25_g_error;
 			}
 			_tmp20_ = self->priv->si;
 			gtk_status_icon_set_visible (_tmp20_, !_tmp19_);
 		}
-		goto __finally24;
-		__catch24_g_error:
+		goto __finally25;
+		__catch25_g_error:
 		{
 			GError* e = NULL;
 			FILE* _tmp21_;
@@ -5351,7 +5472,7 @@
 			fprintf (_tmp21_, "%s\n", _tmp23_);
 			_g_error_free0 (e);
 		}
-		__finally24:
+		__finally25:
 		if (_inner_error_ != NULL) {
 			if (_inner_error_->domain == EXIT) {
 				g_propagate_error (error, _inner_error_);
@@ -5533,6 +5654,7 @@
 
 
 static void smd_applet_instance_init (smdApplet * self) {
+	GMutex _tmp0_ = {0};
 	self->priv = SMD_APPLET_GET_PRIVATE (self);
 	self->priv->builder = NULL;
 	self->priv->menuL = NULL;
@@ -5548,7 +5670,8 @@
 	self->priv->gconf = NULL;
 	self->priv->thread = NULL;
 	self->priv->thread_die = FALSE;
-	self->priv->events_lock = NULL;
+	g_mutex_init (&_tmp0_);
+	self->priv->events_lock = _tmp0_;
 	self->priv->events = NULL;
 	self->priv->error_mode = FALSE;
 	self->priv->network_error_mode = FALSE;
@@ -5575,7 +5698,8 @@
 	_g_object_unref0 (self->priv->cblogs);
 	_g_object_unref0 (self->priv->lognames);
 	_g_object_unref0 (self->priv->gconf);
-	_g_mutex_free0 (self->priv->events_lock);
+	_g_thread_unref0 (self->priv->thread);
+	g_mutex_clear (&self->priv->events_lock);
 	_g_object_unref0 (self->priv->events);
 	_g_hash_table_unref0 (self->priv->command_hash);
 	_g_object_unref0 (self->priv->net_manager);
@@ -5624,29 +5748,36 @@
 	gchar* _tmp3_;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_;
-	const gchar* _tmp23_ = NULL;
-	gchar* _tmp24_;
+	const gchar* _tmp28_ = NULL;
+	gchar* _tmp29_;
 	gchar* homedir;
-	const gchar* _tmp25_;
-	gchar* _tmp26_;
-	const gchar* _tmp27_;
-	gchar* _tmp28_;
-	const gchar* _tmp29_;
-	gchar* _tmp30_;
+	const gchar* _tmp30_;
+	gchar* _tmp31_;
+	const gchar* _tmp32_;
+	gchar* _tmp33_;
+	const gchar* _tmp34_;
+	gchar* _tmp35_;
+	const gchar* _tmp36_ = NULL;
+	gchar* _tmp37_;
+	gchar* conf_home;
+	const gchar* _tmp38_;
+	const gchar* _tmp43_;
+	gchar* _tmp44_ = NULL;
+	gchar* _tmp45_;
 	gboolean config_only;
-	GOptionEntry _tmp31_ = {0};
-	GOptionEntry _tmp32_ = {0};
-	GOptionEntry _tmp33_ = {0};
-	GOptionEntry _tmp34_ = {0};
-	GOptionEntry* _tmp35_ = NULL;
+	GOptionEntry _tmp46_ = {0};
+	GOptionEntry _tmp47_ = {0};
+	GOptionEntry _tmp48_ = {0};
+	GOptionEntry _tmp49_ = {0};
+	GOptionEntry* _tmp50_ = NULL;
 	GOptionEntry* oe;
 	gint oe_length1;
 	gint _oe_size_;
-	GOptionContext* _tmp36_;
+	GOptionContext* _tmp51_;
 	GOptionContext* oc;
-	GOptionContext* _tmp37_;
-	GOptionEntry* _tmp38_;
-	gint _tmp38__length1;
+	GOptionContext* _tmp52_;
+	GOptionEntry* _tmp53_;
+	gint _tmp53__length1;
 	GError * _inner_error_ = NULL;
 	_tmp0_ = g_strdup (SMD_CONF_PREFIX);
 	PREFIX = _tmp0_;
@@ -5668,6 +5799,9 @@
 		gchar* _tmp14_;
 		FILE* _tmp15_;
 		const gchar* _tmp16_;
+		gchar* _tmp17_;
+		FILE* _tmp18_;
+		const gchar* _tmp19_;
 		_tmp6_ = stderr;
 		_tmp7_ = PREFIX;
 		fprintf (_tmp6_, "error: file not found: %s + %s\n", _tmp7_, SMD_APPLET_UI);
@@ -5689,94 +5823,131 @@
 		_tmp15_ = stderr;
 		_tmp16_ = smd_applet_smd_push_cmd;
 		fprintf (_tmp15_, "smd-applet not installed, " "assuming smd-push is: %s\n", _tmp16_);
+		_tmp17_ = g_strdup ("./smd-applet.desktop");
+		_g_free0 (smd_applet_smd_applet_desktop);
+		smd_applet_smd_applet_desktop = _tmp17_;
+		_tmp18_ = stderr;
+		_tmp19_ = smd_applet_smd_applet_desktop;
+		fprintf (_tmp18_, "smd-applet not installed, " "assuming smd-applet.desktop is: %s\n", _tmp19_);
 	} else {
-		const gchar* _tmp17_;
-		gchar* _tmp18_;
-		const gchar* _tmp19_;
-		gchar* _tmp20_;
-		const gchar* _tmp21_;
-		gchar* _tmp22_;
-		_tmp17_ = PREFIX;
-		_tmp18_ = g_strconcat (_tmp17_, SMD_LOOP, NULL);
+		const gchar* _tmp20_;
+		gchar* _tmp21_;
+		const gchar* _tmp22_;
+		gchar* _tmp23_;
+		const gchar* _tmp24_;
+		gchar* _tmp25_;
+		const gchar* _tmp26_;
+		gchar* _tmp27_;
+		_tmp20_ = PREFIX;
+		_tmp21_ = g_strconcat (_tmp20_, SMD_LOOP, NULL);
 		_g_free0 (smd_applet_smd_loop_cmd);
-		smd_applet_smd_loop_cmd = _tmp18_;
-		_tmp19_ = PREFIX;
-		_tmp20_ = g_strconcat (_tmp19_, SMD_PUSH, NULL);
+		smd_applet_smd_loop_cmd = _tmp21_;
+		_tmp22_ = PREFIX;
+		_tmp23_ = g_strconcat (_tmp22_, SMD_PUSH, NULL);
 		_g_free0 (smd_applet_smd_push_cmd);
-		smd_applet_smd_push_cmd = _tmp20_;
-		_tmp21_ = PREFIX;
-		_tmp22_ = g_strconcat (_tmp21_, SMD_APPLET_UI, NULL);
+		smd_applet_smd_push_cmd = _tmp23_;
+		_tmp24_ = PREFIX;
+		_tmp25_ = g_strconcat (_tmp24_, SMD_APPLET_UI, NULL);
 		_g_free0 (smd_applet_smd_applet_ui);
-		smd_applet_smd_applet_ui = _tmp22_;
+		smd_applet_smd_applet_ui = _tmp25_;
+		_tmp26_ = PREFIX;
+		_tmp27_ = g_strconcat (_tmp26_, SMD_APPLET_DESKTOP, NULL);
+		_g_free0 (smd_applet_smd_applet_desktop);
+		smd_applet_smd_applet_desktop = _tmp27_;
 	}
-	_tmp23_ = g_get_home_dir ();
-	_tmp24_ = g_strdup (_tmp23_);
-	homedir = _tmp24_;
-	_tmp25_ = homedir;
-	_tmp26_ = g_strconcat (_tmp25_, "/.smd/log/", NULL);
+	_tmp28_ = g_get_home_dir ();
+	_tmp29_ = g_strdup (_tmp28_);
+	homedir = _tmp29_;
+	_tmp30_ = homedir;
+	_tmp31_ = g_strconcat (_tmp30_, "/.smd/log/", NULL);
 	_g_free0 (SMD_LOGS_DIR);
-	SMD_LOGS_DIR = _tmp26_;
-	_tmp27_ = homedir;