Merge lp:~arthurborsboom/xpad/xpad-4.3 into lp:xpad

[Arthur Borsboom]

[Arthur Borsboom (arthurborsboom)]

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2014-06-07 00:36:45 +0000
+++ ChangeLog	2014-06-13 15:52:27 +0000
@@ -1,4 +1,5 @@
 Version 4.3
+* New: Systray - ability to hide the tray icon (#890334) 
 * New: Toolbar - ability to add multiple separators (#351775)
 * New: Toolbar - ability to add paste button on toolbar (#351775)
 * New: Preferences - Ability to set the automatic start of Xpad in the Preferences menu (#405314)
@@ -21,6 +22,10 @@
 * Fix: Technical - Improve the hiding of pads at Xpad launch (#405314)
 * Fix: Technical - Added thread safe handling of new preferences
 * Fix: Technical - Ensured the use of GNU C libraries, so the readlink function is available
+* Fix: Technical - Prevented dispose functions calling NULL objects leading to errors
+* Fix: Technical - Reduced the amount of functions by using generic setters and getters
+* Fix: Technical - Reduced the number of includes
+* Fix: Credits - all files use the same credits format
 
 Version 4.2
 * New: Undo functionality such as CTRL-Z (#1121740)
 
=== renamed file 'po/xpad.pot' => 'po/xpad.pot.THIS'
=== modified file 'src/fio.c'
--- src/fio.c	2014-06-04 21:08:58 +0000
+++ src/fio.c	2014-06-13 15:52:27 +0000
@@ -1,7 +1,8 @@
 /*
 
 Copyright (c) 2001-2007 Michael Terry
-Copytight (c) 2011 David Hull
+Copyright (c) 2011 David Hull
+Copyright (c) 2013-2014 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -19,16 +20,11 @@
 
 */
 
-#include "../config.h"
+#include <stdlib.h>
+#include <gio/gio.h>
+#include <glib/gstdio.h>
 #include <glib/gi18n.h>
-#include <glib/gstdio.h>
-#include <gio/gio.h>
-#include <errno.h>
 #include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include "fio.h"
 #include "xpad-app.h"
 
 /* Sets filename to full path of filename (prepends xpad_app_get_config_dir ()
 
=== modified file 'src/fio.h'
--- src/fio.h	2008-09-21 00:03:40 +0000
+++ src/fio.h	2014-06-13 15:52:27 +0000
@@ -1,6 +1,7 @@
 /*
 
 Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -21,8 +22,6 @@
 #ifndef _FIO_H_
 #define _FIO_H_
 
-#include <gtk/gtk.h>
-
 gchar *fio_get_file (const gchar *name);
 gboolean fio_set_file (const gchar *name, const gchar *value);
 void fio_remove_file (const gchar *filename);
 
=== modified file 'src/help.c'
--- src/help.c	2013-10-31 21:17:36 +0000
+++ src/help.c	2014-06-13 15:52:27 +0000
@@ -1,6 +1,7 @@
 /*
 
 Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -18,11 +19,8 @@
 
 */
 
-#include "../config.h"
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <string.h>
-#include <gtk/gtk.h>
-#include "help.h"
 
 GtkWidget *help_window = NULL;
 
 
=== modified file 'src/help.h'
--- src/help.h	2003-09-02 19:13:44 +0000
+++ src/help.h	2014-06-13 15:52:27 +0000
@@ -1,3 +1,24 @@
+/*
+
+Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
 #ifndef HELP_H
 #define HELP_H
 
 
=== modified file 'src/xpad-app.c'
--- src/xpad-app.c	2014-06-07 00:19:07 +0000
+++ src/xpad-app.c	2014-06-13 15:52:27 +0000
@@ -1,50 +1,44 @@
-/**
- * Copyright (c) 2004-2007 Michael Terry
- * Copyright (c) 2009 Paul Ivanov
- * Copyright (c) 2013 Arthur Borsboom
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
+/*
+
+Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2009 Paul Ivanov
+Copyright (c) 2013-2014 Arthur Borsboom
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
 
 /* required by socket stuff */
 /* define _GNU_SOURCE here because that makes our sockets work nice
  Unfortunately, we lose portability... */
-#define _GNU_SOURCE	1
+
 #include "../config.h"
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/un.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <errno.h>
-
-#include <string.h>
-#include <stdlib.h> /* for exit */
-
+#include <glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
-
-#include "fio.h" /* for fio_get_info_from_file */
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "help.h"
-#include "prefix.h"
 #include "xpad-app.h"
 #include "xpad-pad.h"
 #include "xpad-pad-group.h"
 #include "xpad-periodic.h"
 #include "xpad-session-manager.h"
-#include "xpad-settings.h"
 #include "xpad-tray.h"
 
 /* Seems that some systems (sun-sparc-solaris2.8 at least), need the following three #defines. 
@@ -87,8 +81,8 @@
 
 static gboolean		config_dir_exists           (void);
 static gchar		*make_config_dir            (void);
-static void		register_stock_icons        (void);
-static gint		xpad_app_load_pads          (void);
+static void			register_stock_icons        (void);
+static gint			xpad_app_load_pads          (void);
 static gboolean		xpad_app_quit_if_no_pads    (XpadPadGroup *group);
 static gboolean		xpad_app_first_idle_check   (XpadPadGroup *group);
 static gboolean		xpad_app_pass_args          (void);
@@ -157,13 +151,16 @@
 	xpad_global_settings = xpad_settings_new ();
 	
 	/* Delay program startup, if user configured it, to wait for example for the loading of the systray. */
-	if (xpad_settings_get_autostart_delay (xpad_global_settings))
-		sleep(xpad_settings_get_autostart_delay (xpad_global_settings));
+	guint autostart_delay;
+	g_object_get (xpad_global_settings, "autostart-delay", &autostart_delay, NULL);
+
+	if (autostart_delay)
+		sleep(autostart_delay);
 
 	pad_group = xpad_pad_group_new();
 	process_remote_args (&xpad_argc, &xpad_argv, TRUE, xpad_global_settings);
 	
-	xpad_tray_open ();
+	xpad_tray_init (xpad_global_settings);
 	xpad_session_manager_init ();
 
 	/* Initialize Xpad-periodic module */
@@ -198,8 +195,7 @@
 }
 
 gint main (gint argc, gchar **argv)
-{
-	xpad_app_init (argc, argv);
+{	xpad_app_init (argc, argv);
 
 	gtk_main ();
 	
@@ -255,13 +251,13 @@
 	/* Free the memory used by group. */
 	g_object_unref (xpad_app_get_pad_group());
 
+	/* Free the memory used by the tray icon and its menu. */
+	xpad_tray_dispose (xpad_global_settings);
+
 	/* Free the memory used by the settings menu. */
 	g_object_unref (xpad_global_settings);
 	xpad_global_settings = NULL; /* This is needed due to the asynchronous finalizing process. */
 
-	/* Free the memory used by the tray icon and its menu. */
-	xpad_tray_close ();
-
 	/* Free the theme reference. Unfortunately GTK3 leaves about 1000 objects behind. */
 	g_object_unref (gtk_icon_theme_get_default ());
 
@@ -395,9 +391,7 @@
 static void
 register_stock_icons (void)
 {
-	GtkIconTheme *theme;
-
-	theme = gtk_icon_theme_get_default ();
+	GtkIconTheme *theme = gtk_icon_theme_get_default ();
 	gtk_icon_theme_prepend_search_path (theme, THEME_DIR);
 }
 
@@ -865,17 +859,24 @@
 		if (have_gtk && option_smid)
 			xpad_session_manager_set_id (option_smid);
 		
-		if (have_gtk && (option_new || xpad_settings_get_autostart_new_pad (xpad_settings)))
+		if (!option_new)
+			g_object_get (xpad_global_settings, "autostart-new-pad", &option_new, NULL);
+
+		if (have_gtk && option_new)
 		{
 			GtkWidget *pad = xpad_pad_new (pad_group);
 			gtk_widget_show (pad);
 		}
+		
+		if (!option_hide && !option_show) {
+			guint display_pads;
+			g_object_get (xpad_settings, "autostart-display-pads", &display_pads, NULL);
+			if (display_pads == 0)
+				option_show = TRUE;
+			else if (display_pads == 1)
+				option_hide = TRUE;
+		}
 
-		if (xpad_settings_get_autostart_display_pads (xpad_settings) == 0)
-			option_show = TRUE;
-		if (xpad_settings_get_autostart_display_pads (xpad_settings) == 1)
-			option_hide = TRUE;
-		
 		if (have_gtk && option_files)
 		{
 			int i;
 
=== modified file 'src/xpad-app.h'
--- src/xpad-app.h	2014-06-04 12:36:36 +0000
+++ src/xpad-app.h	2014-06-13 15:52:27 +0000
@@ -1,20 +1,23 @@
-/**
- * Copyright (c) 2004-2007 Michael Terry
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
+/*
+
+Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
 
 #ifndef __XPAD_APP_H__
 #define __XPAD_APP_H__
@@ -32,7 +35,6 @@
 const gchar *xpad_app_get_program_path (void);
 XpadPadGroup         *xpad_app_get_pad_group (void);
 XpadSettings		 *xpad_global_settings;
-gboolean              xpad_app_get_translucent (void);
 void                  xpad_app_quit (void);
 
 G_END_DECLS
 
=== modified file 'src/xpad-grip-tool-item.c'
--- src/xpad-grip-tool-item.c	2013-10-31 21:17:36 +0000
+++ src/xpad-grip-tool-item.c	2014-06-13 15:52:27 +0000
@@ -1,22 +1,24 @@
-/**
- * Copyright (c) 2004-2007 Michael Terry
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "../config.h"
+/*
+
+Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
 #include "xpad-grip-tool-item.h"
 
 struct XpadGripToolItemPrivate
 
=== modified file 'src/xpad-grip-tool-item.h'
--- src/xpad-grip-tool-item.h	2008-09-21 00:03:40 +0000
+++ src/xpad-grip-tool-item.h	2014-06-13 15:52:27 +0000
@@ -1,20 +1,23 @@
-/**
- * Copyright (c) 2004-2007 Michael Terry
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
+/*
+
+Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
 
 #ifndef __XPAD_GRIP_TOOL_ITEM_H__
 #define __XPAD_GRIP_TOOL_ITEM_H__
@@ -37,8 +40,6 @@
 struct XpadGripToolItem
 {
 	GtkToolItem parent;
-	
-	/* private */
 	XpadGripToolItemPrivate *priv;
 };
 
 
=== modified file 'src/xpad-pad-group.c'
--- src/xpad-pad-group.c	2014-06-04 12:36:36 +0000
+++ src/xpad-pad-group.c	2014-06-13 15:52:27 +0000
@@ -1,25 +1,26 @@
-/**
- * Copyright (c) 2004-2007 Michael Terry
- * Copyright (c) 2009 Paul Ivanov
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "../config.h"
+/*
+
+Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2009 Paul Ivanov
+Copyright (c) 2013-2014 Arthur Borsboom
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
 #include "xpad-pad-group.h"
-#include "xpad-settings.h"
 #include "xpad-pad.h"
 
 struct XpadPadGroupPrivate
@@ -29,8 +30,9 @@
 
 G_DEFINE_TYPE_WITH_PRIVATE(XpadPadGroup, xpad_pad_group, G_TYPE_OBJECT)
 
-static void     xpad_pad_group_dispose           (GObject *object);
-static void     xpad_pad_group_finalize          (GObject *object);
+static void xpad_pad_group_dispose (GObject *object);
+static void xpad_pad_group_finalize (GObject *object);
+static void xpad_pad_group_save_unsaved_all (XpadPadGroup *group);
 
 enum {
 	PROP_0
@@ -180,9 +182,7 @@
 		g_slist_foreach (group->priv->pads, (GFunc) xpad_pad_close, NULL);
 }
 
-void
-xpad_pad_group_save_unsaved_all (XpadPadGroup *group)
-{
+static void xpad_pad_group_save_unsaved_all (XpadPadGroup *group) {
 	if (group)
 		g_slist_foreach (group->priv->pads, (GFunc) xpad_pad_save_unsaved, NULL);
 }
 
=== modified file 'src/xpad-pad-group.h'
--- src/xpad-pad-group.h	2013-10-18 18:31:20 +0000
+++ src/xpad-pad-group.h	2014-06-13 15:52:27 +0000
@@ -1,20 +1,23 @@
-/**
- * Copyright (c) 2004-2007 Michael Terry
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
+/*
+
+Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
 
 #ifndef __XPAD_PAD_GROUP_H__
 #define __XPAD_PAD_GROUP_H__
@@ -63,7 +66,6 @@
 void     xpad_pad_group_toggle_hide      (XpadPadGroup *group);
 GSList * xpad_pad_group_get_pads         (XpadPadGroup *group);
 gint     xpad_pad_group_num_visible_pads (XpadPadGroup *group);
-void     xpad_pad_group_save_unsaved_all (XpadPadGroup *group);
 void     xpad_pad_group_destroy_pads     (XpadPadGroup *group);
 
 G_END_DECLS
 
=== modified file 'src/xpad-pad-properties.c'
--- src/xpad-pad-properties.c	2014-06-04 12:36:36 +0000
+++ src/xpad-pad-properties.c	2014-06-13 15:52:27 +0000
@@ -1,6 +1,7 @@
 /*
 
 Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -18,9 +19,9 @@
 
 */
 
-#include "../config.h"
+#include <gtk/gtk.h>
+#include "xpad-pad-properties.h"
 #include <glib/gi18n.h>
-#include "xpad-pad-properties.h"
 
 struct XpadPadPropertiesPrivate 
 {
@@ -258,7 +259,7 @@
 change_color_check (GtkToggleButton *button, XpadPadProperties *prop)
 {
 	gtk_widget_set_sensitive (prop->priv->colorbox, gtk_toggle_button_get_active (button));
-	
+
 	g_object_notify (G_OBJECT (prop), "follow-color-style");
 }
 
@@ -266,7 +267,7 @@
 change_font_check (GtkToggleButton *button, XpadPadProperties *prop)
 {
 	gtk_widget_set_sensitive (prop->priv->fontbutton, gtk_toggle_button_get_active (button));
-	
+
 	g_object_notify (G_OBJECT (prop), "follow-font-style");
 }
 
@@ -297,99 +298,31 @@
 	g_object_notify (G_OBJECT (prop), "fontname");
 }
 
-void
-xpad_pad_properties_set_follow_font_style (XpadPadProperties *prop, gboolean follow)
-{
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prop->priv->fontcheck), !follow);
-	g_object_notify (G_OBJECT (prop), "follow_font_style");
-}
-
-gboolean
-xpad_pad_properties_get_follow_font_style (XpadPadProperties *prop)
-{
-	return !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prop->priv->fontcheck));
-}
-
-void
-xpad_pad_properties_set_follow_color_style (XpadPadProperties *prop, gboolean follow)
-{
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prop->priv->colorcheck), !follow);
-	g_object_notify (G_OBJECT (prop), "follow_color_style");
-}
-
-gboolean
-xpad_pad_properties_get_follow_color_style (XpadPadProperties *prop)
-{
-	return !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prop->priv->colorcheck));
-}
-
-void
-xpad_pad_properties_set_back_color (XpadPadProperties *prop, const GdkRGBA *back)
-{
-	gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (prop->priv->backbutton), back);
-	g_object_notify (G_OBJECT (prop), "back_color");
-}
-
-const GdkRGBA *
-xpad_pad_properties_get_back_color (XpadPadProperties *prop)
-{
-	gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (prop->priv->backbutton), &prop->priv->backtmp);
-	return &prop->priv->backtmp;
-}
-
-void
-xpad_pad_properties_set_text_color (XpadPadProperties *prop, const GdkRGBA *text)
-{
-	gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (prop->priv->textbutton), text);
-	g_object_notify (G_OBJECT (prop), "text_color");
-}
-
-const GdkRGBA *
-xpad_pad_properties_get_text_color (XpadPadProperties *prop)
-{
-	gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (prop->priv->textbutton), &prop->priv->texttmp);
-	return &prop->priv->texttmp;
-}
-
-void
-xpad_pad_properties_set_fontname (XpadPadProperties *prop, const gchar *fontname)
-{
-	gtk_font_button_set_font_name (GTK_FONT_BUTTON (prop->priv->fontbutton), fontname);
-	g_object_notify (G_OBJECT (prop), "fontname");
-}
-
-const gchar *xpad_pad_properties_get_fontname (XpadPadProperties *prop)
-{
-	return gtk_font_button_get_font_name (GTK_FONT_BUTTON (prop->priv->fontbutton));
-}
-
 static void
 xpad_pad_properties_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
-	XpadPadProperties *prop;
-	
-	prop = XPAD_PAD_PROPERTIES (object);
+	XpadPadProperties *prop = XPAD_PAD_PROPERTIES (object);
 	
 	switch (prop_id)
 	{
 	case PROP_FOLLOW_FONT_STYLE:
-		xpad_pad_properties_set_follow_font_style (prop, g_value_get_boolean (value));
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prop->priv->fontcheck), !g_value_get_boolean (value));
 		break;
 	
 	case PROP_FOLLOW_COLOR_STYLE:
-		xpad_pad_properties_set_follow_color_style (prop, g_value_get_boolean (value));
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prop->priv->colorcheck), !g_value_get_boolean (value));
 		break;
 	
 	case PROP_BACK_COLOR:
-		xpad_pad_properties_set_back_color (prop, g_value_get_boxed (value));
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (prop->priv->backbutton), g_value_get_boxed (value));
 		break;
 	
 	case PROP_TEXT_COLOR:
-		xpad_pad_properties_set_text_color (prop, g_value_get_boxed (value));
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (prop->priv->textbutton), g_value_get_boxed (value));
 		break;
 	
 	case PROP_FONTNAME:
-		xpad_pad_properties_set_fontname (prop, g_value_get_string (value));
+		gtk_font_button_set_font_name (GTK_FONT_BUTTON (prop->priv->fontbutton), g_value_get_string (value));
 		break;
 	
 	default:
@@ -401,30 +334,30 @@
 static void
 xpad_pad_properties_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
-	XpadPadProperties *prop;
-	
-	prop = XPAD_PAD_PROPERTIES (object);
+	XpadPadProperties *prop = XPAD_PAD_PROPERTIES (object);
 	
 	switch (prop_id)
 	{
 	case PROP_FOLLOW_FONT_STYLE:
-		g_value_set_boolean (value, xpad_pad_properties_get_follow_font_style (prop));
+		g_value_set_boolean (value, !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prop->priv->fontcheck)));
 		break;
 	
 	case PROP_FOLLOW_COLOR_STYLE:
-		g_value_set_boolean (value, xpad_pad_properties_get_follow_color_style (prop));
+		g_value_set_boolean (value, !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prop->priv->colorcheck)));
 		break;
 	
 	case PROP_BACK_COLOR:
-		g_value_set_static_boxed (value, xpad_pad_properties_get_back_color (prop));
+		gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (prop->priv->backbutton), &prop->priv->backtmp);
+		g_value_set_static_boxed (value, &prop->priv->backtmp);
 		break;
 	
 	case PROP_TEXT_COLOR:
-		g_value_set_static_boxed (value, xpad_pad_properties_get_text_color (prop));
+		gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (prop->priv->textbutton), &prop->priv->texttmp);
+		g_value_set_static_boxed (value, &prop->priv->texttmp);
 		break;
 	
 	case PROP_FONTNAME:
-		g_value_set_string (value, xpad_pad_properties_get_fontname (prop));
+		g_value_set_string (value, gtk_font_button_get_font_name (GTK_FONT_BUTTON (prop->priv->fontbutton)));
 		break;
 	
 	default:
 
=== modified file 'src/xpad-pad-properties.h'
--- src/xpad-pad-properties.h	2014-06-04 12:36:36 +0000
+++ src/xpad-pad-properties.h	2014-06-13 15:52:27 +0000
@@ -1,6 +1,7 @@
 /*
 
 Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -38,7 +39,6 @@
 
 struct XpadPadProperties
 {
-	/* private */
 	GtkDialog parent;
 	XpadPadPropertiesPrivate *priv;
 };
@@ -52,21 +52,6 @@
 
 GtkWidget *xpad_pad_properties_new (void);
 
-void xpad_pad_properties_set_follow_font_style (XpadPadProperties *pad_properties, gboolean follow);
-gboolean xpad_pad_properties_get_follow_font_style (XpadPadProperties *pad_properties);
-
-void xpad_pad_properties_set_follow_color_style (XpadPadProperties *pad_properties, gboolean follow);
-gboolean xpad_pad_properties_get_follow_color_style (XpadPadProperties *pad_properties);
-
-void xpad_pad_properties_set_back_color (XpadPadProperties *pad_properties, const GdkRGBA *back);
-const GdkRGBA *xpad_pad_properties_get_back_color (XpadPadProperties *pad_properties);
-
-void xpad_pad_properties_set_text_color (XpadPadProperties *pad_properties, const GdkRGBA *text);
-const GdkRGBA *xpad_pad_properties_get_text_color (XpadPadProperties *pad_properties);
-
-void xpad_pad_properties_set_fontname (XpadPadProperties *pad_properties, const gchar *fontname);
-const gchar *xpad_pad_properties_get_fontname (XpadPadProperties *pad_properties);
-
 G_END_DECLS
 
 #endif /* __XPAD_PAD_PROPERTIES_H__ */
 
=== modified file 'src/xpad-pad.c'
--- src/xpad-pad.c	2014-06-07 00:36:45 +0000
+++ src/xpad-pad.c	2014-06-13 15:52:27 +0000
@@ -5,7 +5,7 @@
 Copyright (c) 2011 Sergei Riaguzov
 Copyright (c) 2011 Dennis Hilmar
 Copyright (c) 2011 OBATA Akio
-Copyright (c) 2013 Arthur Borsboom
+Copyright (c) 2013-2014 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -24,9 +24,8 @@
 */
 
 #include "../config.h"
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <gdk/gdkkeysyms.h>
-#include <string.h>
 #include "fio.h"
 #include "help.h"
 #include "xpad-app.h"
@@ -34,13 +33,12 @@
 #include "xpad-pad-properties.h"
 #include "xpad-periodic.h"
 #include "xpad-preferences.h"
-#include "xpad-settings.h"
 #include "xpad-text-buffer.h"
 #include "xpad-text-view.h"
 #include "xpad-toolbar.h"
 #include "xpad-tray.h"
 
-struct XpadPadPrivate 
+struct XpadPadPrivate
 {
 	/* saved values */
 	gint x, y;
@@ -125,6 +123,7 @@
 static void xpad_pad_open_properties (XpadPad *pad);
 static void xpad_pad_open_preferences ();
 static void xpad_pad_quit ();
+/* static void xpad_pad_show_all (XpadPad *pad); */
 static void xpad_pad_close_all (XpadPad *pad);
 static void xpad_pad_sync_title (XpadPad *pad);
 static void xpad_pad_set_group (XpadPad *pad, XpadPadGroup *group);
@@ -237,11 +236,8 @@
 	pad->priv->x = 0;
 	pad->priv->y = 0;
 	pad->priv->location_valid = FALSE;
-	pad->priv->width = xpad_settings_get_width (xpad_global_settings);
-	pad->priv->height = xpad_settings_get_height (xpad_global_settings);
 	pad->priv->infoname = NULL;
 	pad->priv->contentname = NULL;
-	pad->priv->sticky = xpad_settings_get_autostart_sticky (xpad_global_settings);
 	pad->priv->textview = NULL;
 	pad->priv->scrollbar = NULL;
 	pad->priv->toolbar = NULL;
@@ -253,6 +249,10 @@
 	pad->priv->unsaved_content = FALSE;
 	pad->priv->unsaved_info = FALSE;
 	pad->priv->group = NULL;
+	g_object_get (xpad_global_settings,
+			"width", &pad->priv->width,
+			"height", &pad->priv->height,
+			"autostart-sticky", &pad->priv->sticky, NULL);
 
 	XpadTextView *text_view = XPAD_TEXT_VIEW (xpad_text_view_new ());
 	xpad_text_view_set_pad (text_view, pad);
@@ -287,12 +287,13 @@
 
 	gtk_container_child_set (GTK_CONTAINER (vbox), pad->priv->toolbar, "expand", FALSE, NULL);
 
-	gtk_window_set_decorated (GTK_WINDOW(pad), xpad_settings_get_has_decorations (xpad_global_settings));
-	gtk_window_set_default_size (GTK_WINDOW(pad), (gint) xpad_settings_get_width (xpad_global_settings), (gint) xpad_settings_get_height (xpad_global_settings));
+	gboolean decorations;
+	g_object_get (xpad_global_settings, "has-decorations", &decorations, NULL);
+	gtk_window_set_decorated (GTK_WINDOW(pad), decorations);
+	gtk_window_set_default_size (GTK_WINDOW(pad), (gint) pad->priv->width, (gint) pad->priv->height);
 	gtk_window_set_gravity (GTK_WINDOW(pad),  GDK_GRAVITY_STATIC); /* static gravity makes saving pad x,y work */
-	gtk_window_set_skip_pager_hint (GTK_WINDOW(pad),xpad_settings_get_has_decorations (xpad_global_settings));
-	gtk_window_set_skip_taskbar_hint (GTK_WINDOW(pad), !xpad_settings_get_has_decorations (xpad_global_settings));
-	gtk_window_set_type_hint (GTK_WINDOW(pad), GDK_WINDOW_TYPE_HINT_NORMAL);
+	gtk_window_set_skip_pager_hint (GTK_WINDOW(pad), decorations);
+	gtk_window_set_skip_taskbar_hint (GTK_WINDOW(pad), !decorations);
 	gtk_window_set_position (GTK_WINDOW(pad), GTK_WIN_POS_MOUSE);
 
 	g_object_set (G_OBJECT (pad),
@@ -432,11 +433,12 @@
 static void
 xpad_pad_notify_has_scrollbar (XpadPad *pad)
 {
-	if (xpad_settings_get_has_scrollbar (xpad_global_settings))
-	{
+	gboolean has_scrollbar;
+	g_object_get (xpad_global_settings, "has-scrollbar", &has_scrollbar, NULL);
+
+	if (has_scrollbar)
 		gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pad->priv->scrollbar), 
 			GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	}
 	else
 	{
 		GtkAdjustment *v, *h;
@@ -456,7 +458,8 @@
 static void
 xpad_pad_notify_has_decorations (XpadPad *pad)
 {
-	gboolean decorations = xpad_settings_get_has_decorations (xpad_global_settings);
+	gboolean decorations;
+	g_object_get (xpad_global_settings, "has-decorations", &decorations, NULL);
 	
 	/**
 	 *  There are two modes of operation:  a normal mode and a 'stealth' mode.
@@ -564,11 +567,11 @@
 static void
 xpad_pad_notify_has_toolbar (XpadPad *pad)
 {
-	if (xpad_settings_get_has_toolbar (xpad_global_settings))
-	{
-		if (!xpad_settings_get_autohide_toolbar (xpad_global_settings))
-			xpad_pad_show_toolbar (pad);
-	}
+	gboolean has_toolbar, autohide_toolbar;
+	g_object_get (xpad_global_settings, "has-toolbar", &has_toolbar, "autohide-toolbar", &autohide_toolbar, NULL);
+
+	if (has_toolbar && !autohide_toolbar)
+		xpad_pad_show_toolbar (pad);
 	else
 		xpad_pad_hide_toolbar (pad);
 }
@@ -579,9 +582,10 @@
 	if (!pad || !pad->priv || !pad->priv->toolbar_timeout)
 		return FALSE;
 
-	if (pad->priv->toolbar_timeout &&
-		 xpad_settings_get_autohide_toolbar (xpad_global_settings) &&
-		 xpad_settings_get_has_toolbar (xpad_global_settings))
+	gboolean has_toolbar, autohide_toolbar;
+	g_object_get (xpad_global_settings, "has-toolbar", &has_toolbar, "autohide-toolbar", &autohide_toolbar, NULL);
+
+	if (pad->priv->toolbar_timeout && autohide_toolbar && has_toolbar)
 		xpad_pad_hide_toolbar (pad);
 	
 	pad->priv->toolbar_timeout = 0;
@@ -592,7 +596,10 @@
 static void
 xpad_pad_notify_autohide_toolbar (XpadPad *pad)
 {
-	if (xpad_settings_get_autohide_toolbar (xpad_global_settings))
+	gboolean autohide_toolbar;
+	g_object_get (xpad_global_settings, "autohide-toolbar", &autohide_toolbar, NULL);
+
+	if (autohide_toolbar)
 	{
 		/* Likely not to be in pad when turning setting on */
 		if (!pad->priv->toolbar_timeout)
@@ -600,7 +607,10 @@
 	}
 	else
 	{
-		if (xpad_settings_get_has_toolbar (xpad_global_settings))
+		gboolean has_toolbar;
+		g_object_get (xpad_global_settings, "has-toolbar", &has_toolbar, NULL);
+
+		if (has_toolbar)
 			xpad_pad_show_toolbar(pad);
 	}
 }
@@ -660,8 +670,10 @@
 static gboolean
 xpad_pad_enter_notify_event (GtkWidget *pad, GdkEventCrossing *event)
 {
-	if (xpad_settings_get_has_toolbar (xpad_global_settings) &&
-		 xpad_settings_get_autohide_toolbar (xpad_global_settings) &&
+	gboolean has_toolbar, autohide_toolbar;
+	g_object_get (xpad_global_settings, "has-toolbar", &has_toolbar, "autohide-toolbar", &autohide_toolbar, NULL);
+
+	if (has_toolbar && autohide_toolbar &&
 		 event->detail != GDK_NOTIFY_INFERIOR &&
 		 event->mode == GDK_CROSSING_NORMAL)
 	{
@@ -675,8 +687,10 @@
 static gboolean
 xpad_pad_leave_notify_event (GtkWidget *pad, GdkEventCrossing *event)
 {
-	if (xpad_settings_get_has_toolbar (xpad_global_settings) &&
-		 xpad_settings_get_autohide_toolbar (xpad_global_settings) &&
+	gboolean has_toolbar, autohide_toolbar;
+	g_object_get (xpad_global_settings, "has-toolbar", &has_toolbar, "autohide-toolbar", &autohide_toolbar, NULL);
+
+	if (has_toolbar && autohide_toolbar &&
 		 event->detail != GDK_NOTIFY_INFERIOR &&
 		 event->mode == GDK_CROSSING_NORMAL)
 	{
@@ -741,7 +755,8 @@
 	gchar *content;
 	gboolean confirm;
 	
-	if (!xpad_settings_get_confirm_destroy (xpad_global_settings))
+	g_object_get (xpad_global_settings, "confirm-destroy", &confirm, NULL);
+	if (!confirm)
 		return FALSE;
 	
 	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
@@ -821,12 +836,15 @@
 prop_notify_follow_font (XpadPad *pad)
 {
 	XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties);
-	
-	xpad_text_view_set_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview), xpad_pad_properties_get_follow_font_style (prop));
-	
-	if (!xpad_pad_properties_get_follow_font_style (prop))
+
+	gboolean follow_font_style;
+	g_object_get (prop, "follow-font-style", &follow_font_style, NULL);
+	xpad_text_view_set_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview), follow_font_style);
+	
+	if (!follow_font_style)
 	{
-		const gchar *font = xpad_pad_properties_get_fontname (prop);
+		const gchar *font;
+		g_object_get (prop, "fontname", &font, NULL);
 		PangoFontDescription *fontdesc;
 		
 		fontdesc = font ? pango_font_description_from_string (font) : NULL;
@@ -843,13 +861,15 @@
 {
 	XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties);
 	
-	xpad_text_view_set_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview), xpad_pad_properties_get_follow_color_style (prop));
+	gboolean follow_color_style;
+	g_object_get (prop, "follow-color-style", &follow_color_style, NULL);
+	xpad_text_view_set_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview), follow_color_style);
 
-	if (xpad_pad_properties_get_follow_color_style (prop))
+	if (follow_color_style)
 	{
 		/* Set the colors to the global preferences colors */
-		const GdkRGBA *text_color = xpad_settings_get_text_color (xpad_global_settings);
-		const GdkRGBA *back_color = xpad_settings_get_back_color (xpad_global_settings);
+		const GdkRGBA *text_color, *back_color;
+		g_object_get (xpad_global_settings, "text-color", &text_color, "back-color", &back_color, NULL);
 
 		gtk_widget_override_cursor (pad->priv->textview, text_color, text_color);
 		gtk_widget_override_color (pad->priv->textview, GTK_STATE_FLAG_NORMAL, text_color);
@@ -862,8 +882,8 @@
 	else
 	{
 		/* Set the color to the individual pad properties colors */
-		const GdkRGBA *text_color = xpad_pad_properties_get_text_color (prop);
-		const GdkRGBA *back_color = xpad_pad_properties_get_back_color (prop);
+		const GdkRGBA *text_color, *back_color;
+		g_object_get (prop, "text-color", &text_color, "back-color", &back_color, NULL);
 
 		gtk_widget_override_cursor (pad->priv->textview, text_color, text_color);
 		gtk_widget_override_color (pad->priv->textview, GTK_STATE_FLAG_NORMAL, text_color);
@@ -882,7 +902,8 @@
 {
 	XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties);
 	
-	const gchar *font = xpad_pad_properties_get_fontname (prop);
+	const gchar *font;
+	g_object_get (prop, "fontname", &font, NULL);
 	PangoFontDescription *fontdesc;
 	
 	fontdesc = font ? pango_font_description_from_string (font) : NULL;
@@ -923,8 +944,8 @@
 	g_object_set (G_OBJECT (pad->priv->properties),
 		"follow-font-style", xpad_text_view_get_follow_font_style (XPAD_TEXT_VIEW (pad->priv->textview)),
 		"follow-color-style", xpad_text_view_get_follow_color_style (XPAD_TEXT_VIEW (pad->priv->textview)),
+		"text-color", &widget_text_color,
 		"back-color", &widget_background_color,
-		"text-color", &widget_text_color,
 		"fontname", pango_font_description_to_string(font),
 		NULL);
 	pango_font_description_free (font);
@@ -1280,8 +1301,11 @@
 	pad->priv->unsaved_info = FALSE;
 	
 	pad->priv->location_valid = TRUE;
-	if (xpad_settings_get_has_toolbar (xpad_global_settings) &&
-		 !xpad_settings_get_autohide_toolbar (xpad_global_settings))
+
+	gboolean has_toolbar, autohide_toolbar;
+	g_object_get (xpad_global_settings, "has-toolbar", &has_toolbar, "autohide-toolbar", &autohide_toolbar, NULL);
+
+	if (has_toolbar && !autohide_toolbar)
 	{
 		pad->priv->toolbar_height = 0;
 		xpad_pad_hide_toolbar (pad);
@@ -1443,7 +1467,7 @@
 	const gchar *artists[] = {"Michael Terry <[e-mail]>", NULL};
 	const gchar *authors[] = {"Arthur Borsboom <[e-mail]>", "Jeroen Vermeulen <[e-mail]>", "Michael Terry <[e-mail]>", "Paul Ivanov <[e-mail]>", "Sachin Raut <[e-mail]>", NULL};
 	const gchar *comments = _("Sticky notes");
-	const gchar *copyright = "© 2001-2013 Michael Terry";
+	const gchar *copyright = "© 2001-2014 Michael Terry";
 	/* Translators: please translate this as your own name and optionally email
 		like so: "Your Name <[e-mail]>" */
 	const gchar *translator_credits = _("translator-credits");
@@ -1562,6 +1586,17 @@
 	i = NULL;
 }
 
+/*
+static void
+xpad_pad_show_all (XpadPad *pad)
+{
+	if (!pad->priv->group)
+		return;
+
+	xpad_pad_group_show_all (pad->priv->group);
+}
+*/
+
 static void
 xpad_pad_close_all (XpadPad *pad)
 {
@@ -1636,49 +1671,37 @@
 static void
 menu_toolbar (XpadPad *pad, GtkCheckMenuItem *check)
 {
-	/*
-	 * A dirty way to silence the compiler for these unused variables.
-	 * Feel free to implement these variables in the way they are ment to be used.
-	 */
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) pad;
 
-	xpad_settings_set_has_toolbar (xpad_global_settings, gtk_check_menu_item_get_active (check));
+	g_object_set (xpad_global_settings, "has-toolbar", gtk_check_menu_item_get_active (check), NULL);
 }
 
 static void
 menu_scrollbar (XpadPad *pad, GtkCheckMenuItem *check)
 {
-	/*
-	 * A dirty way to silence the compiler for these unused variables.
-	 * Feel free to implement these variables in the way they are ment to be used.
-	 */
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) pad;
 
-	xpad_settings_set_has_scrollbar (xpad_global_settings, gtk_check_menu_item_get_active (check));
+	g_object_set (xpad_global_settings, "has-scrollbar", gtk_check_menu_item_get_active (check), NULL);
 }
 
 static void
 menu_autohide (XpadPad *pad, GtkCheckMenuItem *check)
 {
-	/*
-	 * A dirty way to silence the compiler for these unused variables.
-	 * Feel free to implement these variables in the way they are ment to be used.
-	 */
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) pad;
 
-	xpad_settings_set_autohide_toolbar (xpad_global_settings, gtk_check_menu_item_get_active (check));
+	g_object_set (xpad_global_settings, "autohide-toolbar", gtk_check_menu_item_get_active (check), NULL);
 }
 
 static void
 menu_decorated (XpadPad *pad, GtkCheckMenuItem *check)
 {
-	/*
-	 * A dirty way to silence the compiler for these unused variables.
-	 * Feel free to implement these variables in the way they are ment to be used.
-	 */
+	/* A dirty way to silence the compiler for these unused variables. */
 	(void) pad;
 
-	xpad_settings_set_has_decorations (xpad_global_settings, gtk_check_menu_item_get_active (check));
+	g_object_set (xpad_global_settings, "has-decorations", gtk_check_menu_item_get_active (check), NULL);
 }
 
 static gint
@@ -1731,6 +1754,13 @@
 menu_get_popup_no_highlight (XpadPad *pad, GtkAccelGroup *accel_group)
 {
 	GtkWidget *uppermenu, *menu, *item;
+	gboolean has_toolbar, autohide_toolbar, has_scrollbar, decorations;
+
+	g_object_get (xpad_global_settings,
+			"has-toolbar", &has_toolbar,
+			"autohide-toolbar", &autohide_toolbar,
+			"has-decorations", &decorations,
+			"has-scrollbar", &has_scrollbar, NULL);
 	
 	uppermenu = gtk_menu_new ();
 	gtk_menu_set_accel_group (GTK_MENU (uppermenu), accel_group);
@@ -1769,11 +1799,11 @@
 	gtk_container_add (GTK_CONTAINER (uppermenu), item);
 	menu = gtk_menu_new ();
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
-	MENU_ADD_CHECK (_("_Toolbar"), xpad_settings_get_has_toolbar (xpad_global_settings), menu_toolbar);
-	MENU_ADD_CHECK (_("_Autohide Toolbar"), xpad_settings_get_autohide_toolbar (xpad_global_settings), menu_autohide);
-	gtk_widget_set_sensitive (item, xpad_settings_get_has_toolbar (xpad_global_settings));
-	MENU_ADD_CHECK (_("_Scrollbar"), xpad_settings_get_has_scrollbar (xpad_global_settings), menu_scrollbar);
-	MENU_ADD_CHECK (_("_Window Decorations"), xpad_settings_get_has_decorations (xpad_global_settings), menu_decorated);
+	MENU_ADD_CHECK (_("_Toolbar"), has_toolbar, menu_toolbar);
+	MENU_ADD_CHECK (_("_Autohide Toolbar"), autohide_toolbar, menu_autohide);
+	gtk_widget_set_sensitive (item, has_toolbar);
+	MENU_ADD_CHECK (_("_Scrollbar"), has_scrollbar, menu_scrollbar);
+	MENU_ADD_CHECK (_("_Window Decorations"), decorations, menu_decorated);
 	
 	/* Notes submenu */
 	item = gtk_menu_item_new_with_mnemonic (_("_Notes"));
@@ -1843,16 +1873,12 @@
 		MENU_ADD_SEP ();
 		g_object_set_data (G_OBJECT (menu), "notes-sep", item);
 		
-		/**
-		 * Order pads according to title.
-		 */
+		/* Order pads according to title */
 		pads = xpad_pad_group_get_pads (current_pad->priv->group);
 		
 		pads = g_slist_sort (pads, (GCompareFunc) menu_title_compare);
 		
-		/**
-		 * Populate list of windows.
-		 */
+		/* Populate list of windows */
 		for (l = pads, n = 1; l; l = l->next, n++)
 		{
 			gchar *title;
@@ -1939,10 +1965,7 @@
 
 	cairo_rectangle_int_t rect;
 
-	/**
-	 * We must check if we disabled off of pad and start the timeout if so.
-	 */
-
+	/* We must check if we disabled off of pad and start the timeout if so. */
 	rect.x = 10;
 	rect.y = 10;
 	rect.width = 1;
 
=== modified file 'src/xpad-pad.h'
--- src/xpad-pad.h	2013-10-09 22:02:22 +0000
+++ src/xpad-pad.h	2014-06-13 15:52:27 +0000
@@ -3,6 +3,7 @@
 Copyright (c) 2001-2007 Michael Terry
 Copyright (c) 2009 Paul Ivanov
 Copyright (c) 2011 Sergei Riaguzov
+Copyright (c) 2013-2014 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
=== modified file 'src/xpad-periodic.c'
--- src/xpad-periodic.c	2014-06-04 12:36:36 +0000
+++ src/xpad-periodic.c	2014-06-13 15:52:27 +0000
@@ -1,8 +1,26 @@
-#include "../config.h"
+/*
+
+Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
-#include <stdarg.h>
 #include "xpad-periodic.h"
 
 #ifdef SHOW_DEBUG
@@ -45,8 +63,9 @@
 /* prototypes */
 static gint xppd_intercept (gpointer);
 static gint gprint_ignore(const char *, ...);
+static void Xpad_periodic_signal (const char * cbname, void * xpad_pad);
+static void Xpad_periodic_error_exit (const char *, ...);
 
-static void xpad_sigref_dump2 (gint);
 static gboolean str_equal (const char *, const char *);
 
 /* global variables */
@@ -149,7 +168,7 @@
     }
 
     if (! isdone) {
-        printf("Failed to install signal callback: %s\n", cbname);
+        g_print("Failed to install signal callback: %s\n", cbname);
         exit(1);
     }
 
@@ -166,8 +185,7 @@
     Xpad_periodic_signal("save-content", xpad_pad);
 }
 
-void Xpad_periodic_signal (const char * cbname, void * xpad_pad)
-{
+static void Xpad_periodic_signal (const char * cbname, void * xpad_pad) {
     int isdone = 0;
     int tnx=0, snx=0;
     XpadPeriodicFunc func_ptr = 0;
@@ -236,38 +254,10 @@
     return 0;
 }
 
-void xpad_sigref_dump2 (gint twhich)
-{
-    int tlen = 0, cnt = 0;
-    Xpadsigref * xlist = 0;
-    if (0 == twhich) { xlist = xpptr->template; }
-    if (1 == twhich) { xlist = xpptr->sigs; }
-    if (0 == twhich) { tlen = xpptr->template_len; }
-    if (1 == twhich) { tlen = xpptr->sigs_len; }
-
-    for (cnt = 0; cnt < tlen; ++cnt) {
-        Xpadsigref * xitem = xlist + cnt;
-        if (0 == xitem->signame) { continue; }
-        printf("%3d: %s : %p : %p\n", cnt, xitem->signame,
-            xitem->func_ptr, xitem->data);
-    }
-}
-
-void Xpad_periodic_error_exit (const char * fmt, ...)
-{
+static void Xpad_periodic_error_exit (const char * fmt, ...) {
     va_list app;
     va_start(app, fmt);
-    vprintf(fmt, app);
+    g_print(fmt, app);
     va_end(app);
     exit(1);
 }
-
-void Xpad_periodic_test (void)
-{
-    puts("Template:");
-    xpad_sigref_dump2(0);
-    exit(0);
-}
-
-
-/* vim: set ts=4 sw=4 :vim */
 
=== modified file 'src/xpad-periodic.h'
--- src/xpad-periodic.h	2013-10-09 14:46:10 +0000
+++ src/xpad-periodic.h	2014-06-13 15:52:27 +0000
@@ -1,8 +1,28 @@
+/*
+
+Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
 
 #ifndef XPAD_PERIODIC_H
 #define XPAD_PERIODIC_H
 
-#include <gtk/gtk.h>
+#include <glib.h>
 
 typedef void (*XpadPeriodicFunc)(void *);
 
@@ -30,13 +50,5 @@
 ************************/
 void	Xpad_periodic_save_content_delayed (void * xpad_pad);
 void	Xpad_periodic_save_info_delayed (void * xpad_pad);
-void	Xpad_periodic_signal (const char * cbname, void * xpad_pad);
-
-void	Xpad_periodic_test (); /* aborts program */
-void	Xpad_periodic_error_exit (const char *, ...); /* ditto */
 
 #endif /* XPAD_PERIODIC_H */
-
-/************************
-************************/
-/* vim: set ts=4 sw=4 :vim */
 
=== modified file 'src/xpad-preferences.c'
--- src/xpad-preferences.c	2014-06-07 00:19:07 +0000
+++ src/xpad-preferences.c	2014-06-13 15:52:27 +0000
@@ -1,6 +1,7 @@
 /*
 
 Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -18,17 +19,10 @@
 
 */
 
-#include "../config.h"
 #include <glib/gi18n.h>
-#include <string.h>
+#include <gtk/gtk.h>
+#include "xpad-preferences.h"
 #include "xpad-app.h"
-#include "xpad-preferences.h"
-#include "xpad-settings.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
 
 struct XpadPreferencesPrivate 
 {
@@ -46,7 +40,8 @@
 	GtkWidget *autostart_new_pad;
 	GtkWidget *autostart_sticky;
 	GtkWidget *autostart_display_pads;
-	GtkWidget *trayconfigbox;
+	GtkWidget *tray_enabled;
+	GtkWidget *tray_click_configuration;
 	GtkWidget *editcheck;
 	GtkWidget *confirmcheck;
 
@@ -61,19 +56,22 @@
 	gulong autostart_new_pad_handler;
 	gulong autostart_sticky_handler;
 	gulong autostart_display_pads_handler;	
-	gulong trayclick_handler;
+	gulong tray_enabled_handler;
+	gulong tray_click_handler;
 	gulong editcheck_handler;
 	gulong confirmcheck_handler;
 
 	gulong notify_font_handler;
 	gulong notify_text_handler;
 	gulong notify_back_handler;
+	gulong notify_autostart_xpad_handler;
 	gulong notify_autostart_wait_systray_handler;
 	gulong notify_autostart_delay_handler;
 	gulong notify_autostart_new_pad_handler;
 	gulong notify_autostart_sticky_handler;
 	gulong notify_autostart_display_pads_handler;
-	gulong notify_tray_handler;
+	gulong notify_tray_enabled_handler;
+	gulong notify_tray_click_handler;
 	gulong notify_edit_handler;
 	gulong notify_confirm_handler;
 };
@@ -91,19 +89,21 @@
 static void change_autostart_new_pad (GtkToggleButton *button, XpadPreferences *pref);
 static void change_autostart_sticky (GtkToggleButton *button, XpadPreferences *pref);
 static void change_autostart_display_pads (GtkComboBox *box, XpadPreferences *pref);
-static void change_tray_click_configuration (GtkComboBox *box, XpadPreferences *pref);
+static void change_tray_enabled (GtkToggleButton *button, XpadPreferences *pref);
+static void change_tray_click (GtkComboBox *box, XpadPreferences *pref);
 static void change_edit_check (GtkToggleButton *button, XpadPreferences *pref);
 static void change_confirm_check (GtkToggleButton *button, XpadPreferences *pref);
 
 static void notify_fontname (XpadPreferences *pref);
 static void notify_text_color (XpadPreferences *pref);
 static void notify_back_color (XpadPreferences *pref);
-
+static void notify_autostart_xpad (XpadPreferences *pref);
 static void notify_autostart_wait_systray (XpadPreferences *pref);
 static void notify_autostart_delay (XpadPreferences *pref);
 static void notify_autostart_new_pad (XpadPreferences *pref);
 static void notify_autostart_sticky (XpadPreferences *pref);
 static void notify_autostart_display_pads (XpadPreferences *pref);
+static void notify_tray_enabled (XpadPreferences *pref);
 static void notify_tray_click (XpadPreferences *pref);
 static void notify_edit (XpadPreferences *pref);
 static void notify_confirm (XpadPreferences *pref);
@@ -139,7 +139,7 @@
 xpad_preferences_init (XpadPreferences *pref)
 {
 	GtkWidget *hbox, *font_hbox, *vbox;
-	const GdkRGBA *color;
+	const GdkRGBA *text_color, *back_color;
 	const gchar *fontname;
 	GtkStyleContext *style;
 	GtkWidget *appearance_frame, *start_frame, *tray_frame, *other_frame;
@@ -150,9 +150,26 @@
 	GtkRequisition req;
 	GdkRGBA theme_text_color = {0, 0, 0, 0};
 	GdkRGBA theme_background_color = {0, 0, 0, 0};
+	guint tray_click_configuration, autostart_delay, autostart_display_pads;
+	gboolean confirm_destroy, edit_lock, autostart_xpad, autostart_wait_systray, autostart_new_pad, autostart_sticky;
 	
 	pref->priv = xpad_preferences_get_instance_private(pref);
 	
+	g_object_get (xpad_global_settings,
+			"fontname", &fontname,
+			"text-color", &text_color,
+			"back-color", &back_color,
+			"confirm-destroy", &confirm_destroy,
+			"edit-lock", &edit_lock,
+			"tray-click-configuration", &tray_click_configuration,
+			"autostart-xpad", &autostart_xpad,
+			"autostart-wait-systray", &autostart_wait_systray,
+			"autostart-new-pad", &autostart_new_pad,
+			"autostart-sticky", &autostart_sticky,
+			"autostart-delay", &autostart_delay,
+			"autostart-display-pads", &autostart_display_pads,
+			NULL);
+
 	/* Appearance options */
 	text = g_strconcat ("<b>", _("Appearance"), "</b>", NULL);
 	label = GTK_WIDGET (g_object_new (GTK_TYPE_LABEL,
@@ -213,7 +230,6 @@
 	gtk_style_context_get_color (style, GTK_STATE_FLAG_NORMAL, &theme_text_color);
 	gtk_style_context_get_background_color (style, GTK_STATE_FLAG_NORMAL, &theme_background_color);
 
-	fontname = xpad_settings_get_fontname (xpad_global_settings);
 	if (fontname)
 	{
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->fontcheck), TRUE);
@@ -231,17 +247,15 @@
 		pango_font_description_free (font);
 	}
 
-	color = xpad_settings_get_text_color (xpad_global_settings);
-	if (color)
-		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->textbutton), color);
+	if (text_color)
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->textbutton), text_color);
 	else
 		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->textbutton), &theme_text_color);
 	
-	color = xpad_settings_get_back_color (xpad_global_settings);
-	if (color)
+	if (back_color)
 	{
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->colorcheck), TRUE);
-		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->backbutton), color);
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->backbutton), back_color);
 	}
 	else
 	{
@@ -300,15 +314,15 @@
 		
 	pref->priv->autostart_xpad = gtk_check_button_new_with_mnemonic (_("_Start Xpad automatically after login"));
 	gtk_box_pack_start (GTK_BOX (autostart_vbox), pref->priv->autostart_xpad, FALSE, FALSE, 0);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_xpad), xpad_settings_get_autostart_xpad (xpad_global_settings));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_xpad), autostart_xpad);
 
 	pref->priv->autostart_wait_systray = gtk_check_button_new_with_mnemonic (_("_Wait for systray (if possible)"));
 	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 20);
 	gtk_box_pack_start (GTK_BOX (hbox), gtk_alignment_new (1, 1, 1, 1), FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (hbox), pref->priv->autostart_wait_systray, FALSE, FALSE, 0);	
 
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_wait_systray), xpad_settings_get_autostart_wait_systray (xpad_global_settings));
-	if (xpad_settings_get_autostart_xpad (xpad_global_settings))
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_wait_systray), autostart_wait_systray);
+	if (autostart_xpad)
 		gtk_widget_set_sensitive (pref->priv->autostart_wait_systray, TRUE);
 	else
 		gtk_widget_set_sensitive (pref->priv->autostart_wait_systray, FALSE);
@@ -316,19 +330,19 @@
 
 	pref->priv->autostart_new_pad = gtk_check_button_new_with_mnemonic (_("_Open a new empty pad"));
 	gtk_box_pack_start (GTK_BOX (autostart_vbox), pref->priv->autostart_new_pad, FALSE, FALSE, 0);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_new_pad), xpad_settings_get_autostart_new_pad (xpad_global_settings));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_new_pad), autostart_new_pad);
 
 	pref->priv->autostart_sticky = gtk_check_button_new_with_mnemonic (_("_Pads start on all workspaces"));
 	gtk_box_pack_start (GTK_BOX (autostart_vbox), pref->priv->autostart_sticky, FALSE, FALSE, 0);	
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_sticky), xpad_settings_get_autostart_sticky (xpad_global_settings));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_sticky), autostart_sticky);
 
 	label = gtk_label_new (_("Delay in seconds"));
 	pref->priv->autostart_delay = gtk_combo_box_text_new();	
 	guint i;
 	for (i=0; i<15; i++)
-		gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT( pref->priv->autostart_delay ), g_strdup_printf ("%i", i));
-	gtk_combo_box_set_active (GTK_COMBO_BOX (pref->priv->autostart_delay), (guint) xpad_settings_get_autostart_delay (xpad_global_settings));
-	 hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref->priv->autostart_delay), g_strdup_printf ("%i", i));
+	gtk_combo_box_set_active (GTK_COMBO_BOX (pref->priv->autostart_delay), autostart_delay);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), pref->priv->autostart_delay, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(autostart_vbox), hbox, TRUE, TRUE, 0);
@@ -338,7 +352,7 @@
 	gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT( pref->priv->autostart_display_pads ), _("Open all pads") );
 	gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT( pref->priv->autostart_display_pads ), _("Hide all pads") );
 	gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT( pref->priv->autostart_display_pads ), _("Restore to previous state") );
-	gtk_combo_box_set_active( GTK_COMBO_BOX( pref->priv->autostart_display_pads ), (guint) xpad_settings_get_autostart_display_pads (xpad_global_settings));
+	gtk_combo_box_set_active (GTK_COMBO_BOX (pref->priv->autostart_display_pads), (guint) autostart_display_pads);
 	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), pref->priv->autostart_display_pads, TRUE, TRUE, 0);
@@ -368,16 +382,19 @@
 		"child", alignment,
 		NULL));
 
+	pref->priv->tray_enabled = gtk_check_button_new_with_mnemonic (_("_Enable tray icon"));
+	gtk_box_pack_start (GTK_BOX (tray_vbox), pref->priv->tray_enabled, FALSE, FALSE, 0);
+
 	label = gtk_label_new_with_mnemonic(_("Tray click behaviour"));
-	pref->priv->trayconfigbox = gtk_combo_box_text_new();	
-	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref->priv->trayconfigbox), _("Do Nothing") );
-	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref->priv->trayconfigbox), _("Toggle Show All") );
-	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref->priv->trayconfigbox), _("List of Pads") );
-	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref->priv->trayconfigbox), _("New Pad") );
-	gtk_combo_box_set_active (GTK_COMBO_BOX (pref->priv->trayconfigbox), (guint) xpad_settings_get_tray_click_handler (xpad_global_settings));
+	pref->priv->tray_click_configuration = gtk_combo_box_text_new();
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref->priv->tray_click_configuration), _("Do Nothing") );
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref->priv->tray_click_configuration), _("Toggle Show All") );
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref->priv->tray_click_configuration), _("List of Pads") );
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pref->priv->tray_click_configuration), _("New Pad") );
+	gtk_combo_box_set_active (GTK_COMBO_BOX (pref->priv->tray_click_configuration), tray_click_configuration);
 	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(hbox), pref->priv->trayconfigbox, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), pref->priv->tray_click_configuration, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(tray_vbox), hbox, TRUE, TRUE, 0);
 
 	/* Other options */
@@ -408,10 +425,10 @@
 	pref->priv->confirmcheck = gtk_check_button_new_with_mnemonic (_("_Confirm pad deletion"));
 
 	gtk_box_pack_start (GTK_BOX (other_vbox), pref->priv->editcheck, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (other_vbox), pref->priv->confirmcheck, FALSE, FALSE, 0);	
+	gtk_box_pack_start (GTK_BOX (other_vbox), pref->priv->confirmcheck, FALSE, FALSE, 0);
 	
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->editcheck), xpad_settings_get_edit_lock (xpad_global_settings));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->confirmcheck), xpad_settings_get_confirm_destroy (xpad_global_settings));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->editcheck), edit_lock);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->confirmcheck), confirm_destroy);
 
 	/* Close button and window title */
 	gtk_dialog_add_button (GTK_DIALOG (pref), "gtk-close", GTK_RESPONSE_CLOSE);
@@ -433,7 +450,8 @@
 	pref->priv->autostart_sticky_handler = g_signal_connect (pref->priv->autostart_sticky, "toggled", G_CALLBACK (change_autostart_sticky), pref);
 	pref->priv->autostart_display_pads_handler = g_signal_connect (pref->priv->autostart_display_pads, "changed", G_CALLBACK (change_autostart_display_pads), pref);
 
-	pref->priv->trayclick_handler = g_signal_connect(pref->priv->trayconfigbox, "changed", G_CALLBACK(change_tray_click_configuration), pref);
+	pref->priv->tray_enabled_handler = g_signal_connect (pref->priv->tray_enabled, "toggled", G_CALLBACK (change_tray_enabled), pref);
+	pref->priv->tray_click_handler = g_signal_connect(pref->priv->tray_click_configuration, "changed", G_CALLBACK(change_tray_click), pref);
 	pref->priv->editcheck_handler = g_signal_connect (pref->priv->editcheck, "toggled", G_CALLBACK (change_edit_check), pref);
 	pref->priv->confirmcheck_handler = g_signal_connect (pref->priv->confirmcheck, "toggled", G_CALLBACK (change_confirm_check), pref);
 
@@ -441,23 +459,28 @@
 	pref->priv->notify_text_handler = g_signal_connect_swapped (xpad_global_settings, "notify::text-color", G_CALLBACK (notify_text_color), pref);
 	pref->priv->notify_back_handler = g_signal_connect_swapped (xpad_global_settings, "notify::back-color", G_CALLBACK (notify_back_color), pref);
 
-	pref->priv->notify_autostart_wait_systray_handler = g_signal_connect_swapped (xpad_global_settings, "notify::autostart_wait_systray", G_CALLBACK (notify_autostart_wait_systray), pref);
-	pref->priv->notify_autostart_delay_handler = g_signal_connect_swapped (xpad_global_settings, "notify::autostart_delay", G_CALLBACK(notify_autostart_delay), pref);
-	pref->priv->notify_autostart_new_pad_handler = g_signal_connect_swapped (xpad_global_settings, "notify::autostart_new_pad", G_CALLBACK (notify_autostart_new_pad), pref);
-	pref->priv->notify_autostart_sticky_handler = g_signal_connect_swapped (xpad_global_settings, "notify::autostart_sticky", G_CALLBACK (notify_autostart_sticky), pref);
-	pref->priv->notify_autostart_display_pads_handler = g_signal_connect_swapped (xpad_global_settings, "notify::autostart_display_pads", G_CALLBACK (notify_autostart_display_pads), pref);
+	pref->priv->notify_autostart_xpad_handler = g_signal_connect_swapped (xpad_global_settings, "notify::autostart-xpad", G_CALLBACK (notify_autostart_xpad), pref);
+	pref->priv->notify_autostart_wait_systray_handler = g_signal_connect_swapped (xpad_global_settings, "notify::autostart-wait-systray", G_CALLBACK (notify_autostart_wait_systray), pref);
+	pref->priv->notify_autostart_delay_handler = g_signal_connect_swapped (xpad_global_settings, "notify::autostart-delay", G_CALLBACK(notify_autostart_delay), pref);
+	pref->priv->notify_autostart_new_pad_handler = g_signal_connect_swapped (xpad_global_settings, "notify::autostart-new-pad", G_CALLBACK (notify_autostart_new_pad), pref);
+	pref->priv->notify_autostart_sticky_handler = g_signal_connect_swapped (xpad_global_settings, "notify::autostart-sticky", G_CALLBACK (notify_autostart_sticky), pref);
+	pref->priv->notify_autostart_display_pads_handler = g_signal_connect_swapped (xpad_global_settings, "notify::autostart-display-pads", G_CALLBACK (notify_autostart_display_pads), pref);
 	pref->priv->notify_edit_handler = g_signal_connect_swapped (xpad_global_settings, "notify::edit-lock", G_CALLBACK (notify_edit), pref);
 	pref->priv->notify_confirm_handler = g_signal_connect_swapped (xpad_global_settings, "notify::confirm-destroy", G_CALLBACK (notify_confirm), pref);
-	pref->priv->notify_tray_handler = g_signal_connect_swapped (xpad_global_settings, "notify::tray_click_configuration", G_CALLBACK(notify_tray_click), pref);
+	pref->priv->notify_tray_enabled_handler = g_signal_connect_swapped (xpad_global_settings, "notify::tray-enabled", G_CALLBACK (notify_tray_enabled), pref);
+	pref->priv->notify_tray_click_handler = g_signal_connect_swapped (xpad_global_settings, "notify::tray-click-configuration", G_CALLBACK(notify_tray_click), pref);
 	
 	g_object_unref (size_group_labels);
 
+	/* Initiliaze the GUI logic */
+	g_object_notify (G_OBJECT (xpad_global_settings), "tray-enabled");
+
 	/* Make the preference dialog visible */
 	global_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_box_set_homogeneous (GTK_BOX (global_vbox), FALSE);
 	gtk_box_pack_start (GTK_BOX (global_vbox), appearance_frame, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (global_vbox), start_frame, FALSE, FALSE, 0);	
-	gtk_box_pack_start (GTK_BOX (global_vbox), tray_frame, FALSE, FALSE, 0);	
+	gtk_box_pack_start (GTK_BOX (global_vbox), tray_frame, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (global_vbox), other_frame, FALSE, FALSE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (global_vbox), 6);
 	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (pref))), global_vbox, FALSE, FALSE, 0);	
@@ -497,9 +520,9 @@
 	g_signal_handler_block (xpad_global_settings, pref->priv->notify_font_handler);
 	
 	if (!gtk_toggle_button_get_active (button))
-		xpad_settings_set_fontname (xpad_global_settings, NULL);
+		g_object_set (xpad_global_settings, "fontname", NULL, NULL);
 	else
-		xpad_settings_set_fontname (xpad_global_settings, gtk_font_button_get_font_name (GTK_FONT_BUTTON (pref->priv->fontbutton)));
+		g_object_set (xpad_global_settings, "fontname", gtk_font_button_get_font_name (GTK_FONT_BUTTON (pref->priv->fontbutton)), NULL);
 	
 	gtk_widget_set_sensitive (pref->priv->fontbutton, gtk_toggle_button_get_active (button));
 	
@@ -510,142 +533,58 @@
 change_font_face (GtkFontButton *button, XpadPreferences *pref)
 {
 	g_signal_handler_block (xpad_global_settings, pref->priv->notify_font_handler);
-	xpad_settings_set_fontname (xpad_global_settings, gtk_font_button_get_font_name (button));
+	g_object_set (xpad_global_settings, "fontname", gtk_font_button_get_font_name (button), NULL);
 	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_font_handler);
 }
 
 static void
 change_color_check (GtkToggleButton *button, XpadPreferences *pref)
 {
+	g_signal_handler_block (xpad_global_settings, pref->priv->notify_text_handler);
 	g_signal_handler_block (xpad_global_settings, pref->priv->notify_back_handler);
-	g_signal_handler_block (xpad_global_settings, pref->priv->notify_text_handler);
 	
 	if (!gtk_toggle_button_get_active (button))
-	{
-		xpad_settings_set_text_color (xpad_global_settings, NULL);
-		xpad_settings_set_back_color (xpad_global_settings, NULL);
-	}
+		g_object_set (xpad_global_settings, "text-color", NULL, "back-color", NULL, NULL);
 	else
 	{
-		GdkRGBA color;
-		gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (pref->priv->textbutton), &color);
-		xpad_settings_set_text_color (xpad_global_settings, &color);
-		gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (pref->priv->backbutton), &color);
-		xpad_settings_set_back_color (xpad_global_settings, &color);
+		GdkRGBA text_color, back_color;
+		gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (pref->priv->textbutton), &text_color);
+		gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (pref->priv->backbutton), &back_color);
+		g_object_set (xpad_global_settings, "text-color", &text_color, "back-color", &back_color, NULL);
 	}
 	
 	gtk_widget_set_sensitive (pref->priv->colorbox, gtk_toggle_button_get_active (button));
 	
+	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_text_handler);
 	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_back_handler);
-	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_text_handler);
 }
 
 static void
 change_text_color (GtkColorChooser *chooser, XpadPreferences *pref)
 {
-	GdkRGBA color = {0, 0, 0, 0};
-	gtk_color_chooser_get_rgba (chooser, &color);
+	GdkRGBA text_color = {0, 0, 0, 0};
+	gtk_color_chooser_get_rgba (chooser, &text_color);
 
 	g_signal_handler_block (xpad_global_settings, pref->priv->notify_text_handler);
-	xpad_settings_set_text_color (xpad_global_settings, &color);
+	g_object_set (xpad_global_settings, "text-color", &text_color, NULL);
 	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_text_handler);
 }
 
 static void
 change_back_color (GtkColorChooser *chooser, XpadPreferences *pref)
 {
-	GdkRGBA color = {0, 0, 0, 0};
-	gtk_color_chooser_get_rgba (chooser, &color);
+	GdkRGBA back_color = {0, 0, 0, 0};
+	gtk_color_chooser_get_rgba (chooser, &back_color);
 
 	g_signal_handler_block (xpad_global_settings, pref->priv->notify_back_handler);
-	xpad_settings_set_back_color (xpad_global_settings, &color);
+	g_object_set (xpad_global_settings, "back-color", &back_color, NULL);
 	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_back_handler);
 }
 
 static void
 change_autostart_xpad (GtkToggleButton *button, XpadPreferences *pref)
 {
-	gboolean autostart;
-	
-	autostart = gtk_toggle_button_get_active (button);
-	
-	if (autostart) {
-		/* Copy the xpad.desktop file to the autostart folder and enable/disable the wait for systray preference */
-		gboolean success;
-		char *source_filename;
-		char *destination_directory;
-		GFile *source, *destination;
-		GError *error = NULL;
-		
-		/* Find the base directory where the application is installed /usr or /usr/local, to find the correct xpad.desktop file. */
-		char *szTmp = g_strdup_printf ("/proc/%d/exe", getpid());
-		enum { BUFFERSIZE = 1024 };
-		char buf[BUFFERSIZE];
-		ssize_t len = readlink(szTmp, buf, sizeof(buf)-1);
-		
-		if (len == -1) {
-			gchar *errtext;
-			errtext = g_strdup_printf (_("Could not find the directory where Xpad is installed\n%s"), error->message);
-			xpad_app_error (NULL, _("Error enabling Xpad autostart"), errtext);
-			g_free (errtext);
-			
-			gtk_toggle_button_set_active (button, FALSE);
-		}
-		else {
-			char basedir[len-8];
-			guint i;
-			for (i=0; i<len-8; i++)
-				basedir[i] = buf[i];
-			basedir[len-9] = '\0';
-
-			source_filename = g_strdup_printf ("%s/share/applications/xpad.desktop", basedir);
-			destination_directory = g_strdup_printf ("%s/.config/autostart/xpad.desktop", g_getenv ("HOME"));
-
-			source = g_file_new_for_path (source_filename);
-			destination = g_file_new_for_path (destination_directory);
-			success = g_file_copy (source, destination, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, &error);
-			
-			if (!success) {
-				gchar *errtext;
-				errtext = g_strdup_printf (_("Could not copy %s to %s\n%s"), source_filename, destination_directory, error->message);
-				xpad_app_error (NULL, _("Error enabling Xpad autostart"), errtext);
-				g_free (errtext);
-				
-				gtk_toggle_button_set_active (button, FALSE);
-			}
-			else {
-				g_signal_handler_block (xpad_global_settings, pref->priv->notify_autostart_wait_systray_handler);
-				gtk_widget_set_sensitive (pref->priv->autostart_wait_systray, TRUE);
-				change_autostart_wait_systray (GTK_TOGGLE_BUTTON (pref->priv->autostart_wait_systray), pref);				
-				g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_autostart_wait_systray_handler);
-			}
-		}
-	}
-	else {
-		/* Remove the xpad.desktop file from the autostart folder and enable/disable the wait for systray preference */
-		gboolean success;
-		char *filename;
-		GFile *file;
-		GError *error = NULL;		
-		
-		filename = g_strdup_printf ("%s/.config/autostart/xpad.desktop", g_getenv ("HOME"));
-		file = g_file_new_for_path (filename);
-		success = g_file_delete (file, NULL, &error);
-
-		if (!success) {
-			gchar *errtext;
-			errtext = g_strdup_printf (_("Could not delete %s\n%s"), filename, error->message);
-			xpad_app_error (NULL, _("Error disabling Xpad autostart"), errtext);
-			g_free (errtext);
-			
-			gtk_toggle_button_set_active (button, TRUE);
-		}
-		else {
-			g_signal_handler_block (xpad_global_settings, pref->priv->notify_autostart_wait_systray_handler);
-			gtk_widget_set_sensitive (pref->priv->autostart_wait_systray, FALSE);
-			g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_autostart_wait_systray_handler);
-		}
-	}
+	g_object_set (xpad_global_settings, "autostart-xpad", gtk_toggle_button_get_active (button), NULL);
 }
 
 static void
@@ -689,23 +628,15 @@
 	}
 
 	g_signal_handler_block (xpad_global_settings, pref->priv->notify_autostart_wait_systray_handler);
-	xpad_settings_set_autostart_wait_systray (xpad_global_settings, wait_systray);
+	g_object_set (xpad_global_settings, "autostart-wait-systray", wait_systray, NULL);
 	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_autostart_wait_systray_handler);
 }
 
 static void
-change_autostart_delay (GtkComboBox *box, XpadPreferences *pref)
-{
-	g_signal_handler_block(xpad_global_settings, pref->priv->notify_autostart_delay_handler);
-	xpad_settings_set_autostart_delay (xpad_global_settings, (guint) gtk_combo_box_get_active(box));
-	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_autostart_delay_handler);
-}
-
-static void
 change_autostart_new_pad (GtkToggleButton *button, XpadPreferences *pref)
 {
 	g_signal_handler_block (xpad_global_settings, pref->priv->notify_autostart_new_pad_handler);
-	xpad_settings_set_autostart_new_pad (xpad_global_settings, gtk_toggle_button_get_active (button));
+	g_object_set (xpad_global_settings, "autostart-new-pad", gtk_toggle_button_get_active (button), NULL);
 	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_autostart_new_pad_handler);
 }
 
@@ -713,31 +644,45 @@
 change_autostart_sticky (GtkToggleButton *button, XpadPreferences *pref)
 {
 	g_signal_handler_block (xpad_global_settings, pref->priv->notify_autostart_sticky_handler);
-	xpad_settings_set_autostart_sticky (xpad_global_settings, gtk_toggle_button_get_active (button));
+	g_object_set (xpad_global_settings, "autostart-sticky", gtk_toggle_button_get_active (button), NULL);
 	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_autostart_sticky_handler);
 }
 
 static void
+change_autostart_delay (GtkComboBox *box, XpadPreferences *pref)
+{
+	g_signal_handler_block(xpad_global_settings, pref->priv->notify_autostart_delay_handler);
+	g_object_set (xpad_global_settings, "autostart-delay", (guint) gtk_combo_box_get_active (box), NULL);
+	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_autostart_delay_handler);
+}
+
+static void
 change_autostart_display_pads (GtkComboBox *box, XpadPreferences *pref)
 {
 	g_signal_handler_block (xpad_global_settings, pref->priv->notify_autostart_display_pads_handler);
-	xpad_settings_set_autostart_display_pads (xpad_global_settings, (guint) gtk_combo_box_get_active(box));
+	g_object_set (xpad_global_settings, "autostart-display-pads", (guint) gtk_combo_box_get_active (box), NULL);
 	g_signal_handler_unblock(xpad_global_settings, pref->priv->notify_autostart_display_pads_handler);
 }
 
 static void
-change_tray_click_configuration (GtkComboBox *box, XpadPreferences *pref)
-{
-	g_signal_handler_block(xpad_global_settings, pref->priv->notify_tray_handler);
-	xpad_settings_set_tray_click_handler (xpad_global_settings, (guint) gtk_combo_box_get_active(box));
-	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_tray_handler);
+change_tray_enabled (GtkToggleButton *button, XpadPreferences *pref)
+{
+	g_object_set (xpad_global_settings, "tray-enabled", gtk_toggle_button_get_active (button), NULL);
+}
+
+static void
+change_tray_click (GtkComboBox *box, XpadPreferences *pref)
+{
+	g_signal_handler_block(xpad_global_settings, pref->priv->notify_tray_click_handler);
+	g_object_set (xpad_global_settings, "tray-click-configuration", (guint) gtk_combo_box_get_active (box), NULL);
+	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_tray_click_handler);
 }
 
 static void
 change_edit_check (GtkToggleButton *button, XpadPreferences *pref)
 {
 	g_signal_handler_block (xpad_global_settings, pref->priv->notify_edit_handler);
-	xpad_settings_set_edit_lock (xpad_global_settings, gtk_toggle_button_get_active (button));
+	g_object_set (xpad_global_settings, "edit-lock", gtk_toggle_button_get_active (button), NULL);
 	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_edit_handler);
 }
 
@@ -745,14 +690,15 @@
 change_confirm_check (GtkToggleButton *button, XpadPreferences *pref)
 {
 	g_signal_handler_block (xpad_global_settings, pref->priv->notify_confirm_handler);
-	xpad_settings_set_confirm_destroy (xpad_global_settings, gtk_toggle_button_get_active (button));
+	g_object_set (xpad_global_settings, "confirm-destroy", gtk_toggle_button_get_active (button), NULL);
 	g_signal_handler_unblock (xpad_global_settings, pref->priv->notify_confirm_handler);
 }
 
 static void
 notify_fontname (XpadPreferences *pref)
 {
-	const gchar *fontname = xpad_settings_get_fontname (xpad_global_settings);
+	const gchar *fontname;
+	g_object_get (xpad_global_settings, "fontname", &fontname, NULL);
 	
 	g_signal_handler_block (pref->priv->fontbutton, pref->priv->font_handler);
 	g_signal_handler_block (pref->priv->fontcheck, pref->priv->fontcheck_handler);
@@ -776,16 +722,17 @@
 static void
 notify_text_color (XpadPreferences *pref)
 {
-	const GdkRGBA *color = xpad_settings_get_text_color (xpad_global_settings);
+	const GdkRGBA *text_color;
+	g_object_get (xpad_global_settings, "text-color", &text_color, NULL);
 	
 	g_signal_handler_block (pref->priv->textbutton, pref->priv->text_handler);
 	g_signal_handler_block (pref->priv->colorcheck, pref->priv->colorcheck_handler);
 	
-	if (color)
+	if (text_color)
 	{
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->colorcheck), TRUE);
 		gtk_widget_set_sensitive (pref->priv->colorbox, TRUE);
-		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->textbutton), color);
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->textbutton), text_color);
 
 	}
 	else
@@ -801,16 +748,17 @@
 static void
 notify_back_color (XpadPreferences *pref)
 {
-	const GdkRGBA *color = xpad_settings_get_back_color (xpad_global_settings);
-	
+	const GdkRGBA *back_color;
+	g_object_get (xpad_global_settings, "back-color", &back_color, NULL);
+
 	g_signal_handler_block (pref->priv->backbutton, pref->priv->back_handler);
 	g_signal_handler_block (pref->priv->colorcheck, pref->priv->colorcheck_handler);
 	
-	if (color)
+	if (back_color)
 	{
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->colorcheck), TRUE);
 		gtk_widget_set_sensitive (pref->priv->colorbox, TRUE);
-		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->backbutton), color);
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->backbutton), back_color);
 	}
 	else
 	{
@@ -823,65 +771,108 @@
 }
 
 static void
+notify_autostart_xpad (XpadPreferences *pref)
+{
+	gboolean value;
+	g_object_get (xpad_global_settings, "autostart-xpad", &value, NULL);
+	g_signal_handler_block (pref->priv->autostart_xpad, pref->priv->autostart_xpad_handler);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_xpad), value);
+	gtk_widget_set_sensitive (pref->priv->autostart_wait_systray, value);
+	if (value)
+		change_autostart_wait_systray (GTK_TOGGLE_BUTTON (pref->priv->autostart_wait_systray), pref);
+	g_signal_handler_unblock (pref->priv->autostart_xpad, pref->priv->autostart_xpad_handler);
+}
+
+static void
 notify_autostart_wait_systray (XpadPreferences *pref)
 {
+	gboolean value;
+	g_object_get (xpad_global_settings, "autostart-wait-systray", &value, NULL);
 	g_signal_handler_block (pref->priv->autostart_wait_systray, pref->priv->autostart_wait_systray_handler);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_wait_systray), xpad_settings_get_autostart_wait_systray (xpad_global_settings));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_wait_systray), value);
 	g_signal_handler_unblock (pref->priv->autostart_wait_systray, pref->priv->autostart_wait_systray_handler);
 }
 
-static void 
-notify_autostart_delay (XpadPreferences *pref)
-{
-	g_signal_handler_block (pref->priv->autostart_delay, pref->priv->autostart_delay_handler);
-	gtk_combo_box_set_active (GTK_COMBO_BOX (pref->priv->autostart_delay), (guint) xpad_settings_get_autostart_delay (xpad_global_settings));
-	g_signal_handler_unblock (pref->priv->autostart_delay, pref->priv->autostart_delay_handler);
-}
-
 static void
 notify_autostart_new_pad (XpadPreferences *pref)
 {
+	gboolean value;
+	g_object_get (xpad_global_settings, "autostart-new-pad", &value, NULL);
 	g_signal_handler_block (pref->priv->autostart_new_pad, pref->priv->autostart_new_pad_handler);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_new_pad), xpad_settings_get_autostart_new_pad (xpad_global_settings));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_new_pad), value);
 	g_signal_handler_unblock (pref->priv->autostart_new_pad, pref->priv->autostart_new_pad_handler);
 }
 
 static void
 notify_autostart_sticky (XpadPreferences *pref)
 {
+	gboolean value;
+	g_object_get (xpad_global_settings, "autostart-sticky", &value, NULL);
 	g_signal_handler_block (pref->priv->autostart_sticky, pref->priv->autostart_sticky_handler);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_sticky), xpad_settings_get_autostart_sticky (xpad_global_settings));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->autostart_sticky), value);
 	g_signal_handler_unblock (pref->priv->autostart_sticky, pref->priv->autostart_sticky_handler);
 }
 
 static void
+notify_autostart_delay (XpadPreferences *pref)
+{
+	guint value;
+	g_object_get (xpad_global_settings, "autostart-delay", &value, NULL);
+	g_signal_handler_block (pref->priv->autostart_delay, pref->priv->autostart_delay_handler);
+	gtk_combo_box_set_active (GTK_COMBO_BOX (pref->priv->autostart_delay), value);
+	g_signal_handler_unblock (pref->priv->autostart_delay, pref->priv->autostart_delay_handler);
+}
+
+static void
 notify_autostart_display_pads (XpadPreferences *pref)
 {
+	guint value;
+	g_object_get (xpad_global_settings, "autostart-display-pads", &value, NULL);
 	g_signal_handler_block (pref->priv->autostart_display_pads, pref->priv->autostart_display_pads_handler);
-	gtk_combo_box_set_active (GTK_COMBO_BOX (pref->priv->autostart_display_pads), (guint) xpad_settings_get_autostart_display_pads (xpad_global_settings));
-	g_signal_handler_unblock (pref->priv->autostart_wait_systray, pref->priv->autostart_wait_systray_handler);
+	gtk_combo_box_set_active (GTK_COMBO_BOX (pref->priv->autostart_display_pads), value);
+	g_signal_handler_unblock (pref->priv->autostart_display_pads, pref->priv->autostart_display_pads_handler);
+}
+
+static void
+notify_tray_enabled (XpadPreferences *pref)
+{
+	gboolean value;
+	g_object_get (xpad_global_settings, "tray-enabled", &value, NULL);
+	g_signal_handler_block (pref->priv->tray_enabled, pref->priv->tray_enabled_handler);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->tray_enabled), value);
+	gtk_widget_set_sensitive (pref->priv->tray_click_configuration, value);
+	gtk_widget_set_sensitive (pref->priv->autostart_display_pads, value);
+	if (!value)
+		g_object_set (xpad_global_settings, "autostart-display-pads", 0, NULL);
+	g_signal_handler_unblock (pref->priv->tray_enabled, pref->priv->tray_enabled_handler);
 }
 
 static void 
 notify_tray_click (XpadPreferences *pref)
 {
-	g_signal_handler_block (pref->priv->trayconfigbox, pref->priv->trayclick_handler);
-	gtk_combo_box_set_active (GTK_COMBO_BOX (pref->priv->trayconfigbox), (guint) xpad_settings_get_tray_click_handler(xpad_global_settings));
-	g_signal_handler_unblock (pref->priv->trayconfigbox, pref->priv->trayclick_handler);
+	guint value;
+	g_object_get (xpad_global_settings, "tray-click-configuration", &value, NULL);
+	g_signal_handler_block (pref->priv->tray_click_configuration, pref->priv->tray_click_handler);
+	gtk_combo_box_set_active (GTK_COMBO_BOX (pref->priv->tray_click_configuration), value);
+	g_signal_handler_unblock (pref->priv->tray_click_configuration, pref->priv->tray_click_handler);
 }
 
 static void
 notify_edit (XpadPreferences *pref)
 {
+	gboolean value;
+	g_object_get (xpad_global_settings, "edit-lock", &value, NULL);
 	g_signal_handler_block (pref->priv->editcheck, pref->priv->editcheck_handler);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->editcheck), xpad_settings_get_edit_lock (xpad_global_settings));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->editcheck), value);
 	g_signal_handler_unblock (pref->priv->editcheck, pref->priv->editcheck_handler);
 }
 
 static void
 notify_confirm (XpadPreferences *pref)
 {
+	gboolean value;
+	g_object_get (xpad_global_settings, "confirm-destroy", &value, NULL);
 	g_signal_handler_block (pref->priv->confirmcheck, pref->priv->confirmcheck_handler);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->confirmcheck), xpad_settings_get_confirm_destroy (xpad_global_settings));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->confirmcheck), value);
 	g_signal_handler_unblock (pref->priv->confirmcheck, pref->priv->confirmcheck_handler);
 }
 
=== modified file 'src/xpad-preferences.h'
--- src/xpad-preferences.h	2008-09-21 00:03:40 +0000
+++ src/xpad-preferences.h	2014-06-13 15:52:27 +0000
@@ -1,6 +1,7 @@
 /*
 
 Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
=== modified file 'src/xpad-session-manager.c'
--- src/xpad-session-manager.c	2014-06-04 12:36:36 +0000
+++ src/xpad-session-manager.c	2014-06-13 15:52:27 +0000
@@ -1,6 +1,7 @@
 /*
 
 Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -18,22 +19,15 @@
 
 */
 
-#include "../config.h"
-#include "xpad-session-manager.h"
-
 #ifndef X_DISPLAY_MISSING
 
+#include <glib.h>
+#include <pwd.h>
+#include <stdlib.h>
+#include <string.h>
 #include <gdk/gdkx.h>
 #include <X11/SM/SMlib.h>
-#include <stdio.h>	/* only for printf */
-#include <sys/types.h> /* for getuid and getpwuid */
-#include <sys/select.h>	/* for select */
-#include <stdlib.h>	/* for free */
-#include <string.h>	/* for strlen */
-#include <unistd.h>	/* for getuid */
-#include <pwd.h>	/* for getpwuid */
-#include <sys/types.h>	/* for getuid and getpwuid */
-#include <sys/time.h>	/* for struct timeval */
+#include "xpad-session-manager.h"
 #include "xpad-app.h"
 
 static SmcConn xpad_session_manager_conn = NULL;
 
=== modified file 'src/xpad-session-manager.h'
--- src/xpad-session-manager.h	2008-09-21 00:03:40 +0000
+++ src/xpad-session-manager.h	2014-06-13 15:52:27 +0000
@@ -1,6 +1,7 @@
 /*
 
 Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@
 #ifndef __XPAD_SESSION_MANAGER_H__
 #define __XPAD_SESSION_MANAGER_H__
 
-#include <gtk/gtk.h>
+#include <glib.h>
 
 gboolean xpad_session_manager_start_interact (gboolean error);
 void     xpad_session_manager_stop_interact (gboolean stop_shutdown);
 
=== modified file 'src/xpad-settings.c'
--- src/xpad-settings.c	2014-06-07 00:19:07 +0000
+++ src/xpad-settings.c	2014-06-13 15:52:27 +0000
@@ -1,6 +1,7 @@
 /*
 
 Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -18,10 +19,12 @@
 
 */
 
-#include "../config.h"
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
 #include <string.h>
+#include "fio.h"
 #include "xpad-settings.h"
-#include "fio.h"
+#include "xpad-app.h"
 
 struct XpadSettingsPrivate
 {
@@ -30,13 +33,14 @@
 	gboolean has_decorations;
 	gboolean confirm_destroy;
 	gboolean edit_lock;
+	gboolean tray_enabled;
 	guint tray_click_configuration;
 	gboolean has_toolbar;
 	gboolean autohide_toolbar;
 	gboolean has_scrollbar;
+	GdkRGBA *text;
 	GdkRGBA *back;
-	GdkRGBA *text;
-	gchar *fontname;
+	const gchar *fontname;
 	GSList *toolbar_buttons;
 	gboolean autostart_wait_systray;
 	guint autostart_delay;
@@ -63,13 +67,15 @@
   PROP_HAS_DECORATIONS,
   PROP_CONFIRM_DESTROY,
   PROP_EDIT_LOCK,
+  PROP_TRAY_ENABLED,
   PROP_TRAY_CLICK_CONFIGURATION,
   PROP_HAS_TOOLBAR,
   PROP_AUTOHIDE_TOOLBAR,
   PROP_HAS_SCROLLBAR,
+  PROP_TEXT_COLOR,
   PROP_BACK_COLOR,
-  PROP_TEXT_COLOR,
   PROP_FONTNAME,
+  PROP_AUTOSTART_XPAD,
   PROP_AUTOSTART_WAIT_SYSTRAY,
   PROP_AUTOSTART_DELAY,  
   PROP_AUTOSTART_NEW_PAD,
@@ -125,7 +131,7 @@
 	
 	g_object_class_install_property (gobject_class,
 	                                 PROP_HAS_DECORATIONS,
-	                                 g_param_spec_boolean ("has_decorations",
+	                                 g_param_spec_boolean ("has-decorations",
 	                                                       "Has Decorations",
 	                                                       "Whether pads have window decorations",
 	                                                       TRUE,
@@ -133,7 +139,7 @@
 	
 	g_object_class_install_property (gobject_class,
 	                                 PROP_CONFIRM_DESTROY,
-	                                 g_param_spec_boolean ("confirm_destroy",
+	                                 g_param_spec_boolean ("confirm-destroy",
 	                                                       "Confirm Destroy",
 	                                                       "Whether destroying a pad requires user confirmation",
 	                                                       TRUE,
@@ -141,31 +147,39 @@
 	
 	g_object_class_install_property (gobject_class,
 	                                 PROP_EDIT_LOCK,
-	                                 g_param_spec_boolean ("edit_lock",
+	                                 g_param_spec_boolean ("edit-lock",
 	                                                       "Edit Lock",
 	                                                       "Whether edit lock mode is enabled",
 	                                                       FALSE,
 	                                                       G_PARAM_READWRITE));
 	g_object_class_install_property (gobject_class,
+	                                 PROP_TRAY_ENABLED,
+	                                 g_param_spec_boolean ("tray-enabled",
+	                                                       "Enable the tray icon",
+	                                                       "Whether to enable or disable the systray icon",
+	                                                       TRUE,
+	                                                       G_PARAM_READWRITE));
+
+	g_object_class_install_property (gobject_class,
                                      PROP_TRAY_CLICK_CONFIGURATION,
-                                     g_param_spec_uint ("tray_click_configuration",
-                                                        "Tray Click Configuration",
+                                     g_param_spec_uint ("tray-click-configuration",
+                                                        "Tray click configuration",
                                                         "What configuration is selected on tray click",
                                                         0,
                                                         G_MAXUINT,
-                                                        2,
+                                                        0,
                                                         G_PARAM_READWRITE));
 	g_object_class_install_property (gobject_class,
 	                                 PROP_HAS_TOOLBAR,
-	                                 g_param_spec_boolean ("has_toolbar",
-	                                                       "Has Toolbar",
+	                                 g_param_spec_boolean ("has-toolbar",
+	                                                       "Each pad has a toolbar",
 	                                                       "Whether pads have toolbars",
 	                                                       TRUE,
 	                                                       G_PARAM_READWRITE));
 	
 	g_object_class_install_property (gobject_class,
 	                                 PROP_AUTOHIDE_TOOLBAR,
-	                                 g_param_spec_boolean ("autohide_toolbar",
+	                                 g_param_spec_boolean ("autohide-toolbar",
 	                                                       "Autohide Toolbar",
 	                                                       "Whether toolbars hide when not used",
 	                                                       TRUE,
@@ -173,10 +187,10 @@
 	
 	g_object_class_install_property (gobject_class,
 	                                 PROP_HAS_SCROLLBAR,
-	                                 g_param_spec_boolean ("has_scrollbar",
+	                                 g_param_spec_boolean ("has-scrollbar",
 	                                                       "Has Scrollbar",
 	                                                       "Whether pads have scrollbars",
-	                                                       FALSE,
+	                                                       TRUE,
 	                                                       G_PARAM_READWRITE));
 	
 	g_object_class_install_property (gobject_class,
@@ -189,7 +203,7 @@
 	
 	g_object_class_install_property (gobject_class,
 	                                 PROP_TEXT_COLOR,
-	                                 g_param_spec_boxed ("text_color",
+	                                 g_param_spec_boxed ("text-color",
 	                                                     "Text Color",
 	                                                     "Default color of pad text",
 	                                                     GDK_TYPE_RGBA,
@@ -197,33 +211,31 @@
 	
 	g_object_class_install_property (gobject_class,
 	                                 PROP_BACK_COLOR,
-	                                 g_param_spec_boxed ("back_color",
+	                                 g_param_spec_boxed ("back-color",
 	                                                     "Back Color",
 	                                                     "Default color of pad background",
 	                                                     GDK_TYPE_RGBA,
 	                                                     G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class,
+	                                 PROP_AUTOSTART_XPAD,
+	                                 g_param_spec_boolean ("autostart-xpad",
+	                                                       "Automatically start xpad",
+	                                                       "Whether to start xpad after login",
+	                                                       FALSE,
+	                                                       G_PARAM_READWRITE));
+
+	g_object_class_install_property (gobject_class,
 	                                 PROP_AUTOSTART_WAIT_SYSTRAY,
-	                                 g_param_spec_boolean ("autostart_wait_systray",
+	                                 g_param_spec_boolean ("autostart-wait-systray",
 	                                                       "Autostart Xpad wait for systray",
 	                                                       "Whether to wait for the systray before starting xpad automatically after login",
-	                                                       FALSE,
+	                                                       TRUE,
 	                                                       G_PARAM_READWRITE));
 
 	g_object_class_install_property (gobject_class,
-                                     PROP_AUTOSTART_DISPLAY_PADS,
-                                     g_param_spec_uint ("autostart_delay",
-                                                        "Delay autostart of Xpad",
-                                                        "How many seconds will Xpad wait before continuing startup",
-                                                        0,
-                                                        G_MAXUINT,
-                                                        2,
-                                                        G_PARAM_READWRITE));
-	
-	g_object_class_install_property (gobject_class,
 	                                 PROP_AUTOSTART_NEW_PAD,
-	                                 g_param_spec_boolean ("autostart_new_pad",
+	                                 g_param_spec_boolean ("autostart-new-pad",
 	                                                       "Autostart a new pad",
 	                                                       "Whether to create a new pad on startup",
 	                                                       FALSE,
@@ -231,15 +243,25 @@
 	
 	g_object_class_install_property (gobject_class,
 	                                 PROP_AUTOSTART_STICKY,
-	                                 g_param_spec_boolean ("autostart_sticky",
+	                                 g_param_spec_boolean ("autostart-sticky",
 	                                                       "Default Stickiness",
 	                                                       "Whether pads are sticky on creation",
 	                                                       FALSE,
 	                                                       G_PARAM_READWRITE));
 	
 	g_object_class_install_property (gobject_class,
+                                     PROP_AUTOSTART_DELAY,
+                                     g_param_spec_uint ("autostart-delay",
+                                                        "Delay autostart of Xpad",
+                                                        "How many seconds will Xpad wait before continuing startup",
+                                                        0,
+                                                        G_MAXUINT,
+                                                        0,
+                                                        G_PARAM_READWRITE));
+
+	g_object_class_install_property (gobject_class,
                                      PROP_AUTOSTART_DISPLAY_PADS,
-                                     g_param_spec_uint ("autostart_display_pads",
+                                     g_param_spec_uint ("autostart-display-pads",
                                                         "Autostart display pads",
                                                         "How to show the different pads when Xpad is started",
                                                         0,
@@ -265,18 +287,6 @@
 	settings->priv->text = gdk_rgba_copy(&(GdkRGBA) {0, 0, 0, 1});
 	settings->priv->back = gdk_rgba_copy(&(GdkRGBA) {1, 0.933334350586, 0.6, 1});
 
-	settings->priv->width = 200;
-	settings->priv->height = 200;
-	settings->priv->has_decorations = TRUE;
-	settings->priv->confirm_destroy = TRUE;
-	settings->priv->autostart_sticky = FALSE;
-	settings->priv->edit_lock = FALSE;
-	settings->priv->tray_click_configuration = 0;
-	settings->priv->fontname = NULL;
-	settings->priv->has_toolbar = TRUE;
-	settings->priv->autohide_toolbar = TRUE;
-	settings->priv->has_scrollbar = TRUE;
-	
 	settings->priv->toolbar_buttons = NULL;
 	settings->priv->toolbar_buttons = g_slist_append (settings->priv->toolbar_buttons, g_strdup ("New"));
 	settings->priv->toolbar_buttons = g_slist_append (settings->priv->toolbar_buttons, g_strdup ("Delete"));
@@ -288,11 +298,6 @@
 	settings->priv->toolbar_buttons = g_slist_append (settings->priv->toolbar_buttons, g_strdup ("Undo"));
 	settings->priv->toolbar_buttons = g_slist_append (settings->priv->toolbar_buttons, g_strdup ("Redo"));	
 
-	settings->priv->autostart_wait_systray = TRUE;
-	settings->priv->autostart_delay = 0;
-	settings->priv->autostart_new_pad = FALSE;
-	settings->priv->autostart_display_pads = 2;
-
 	load_from_file (settings, DEFAULTS_FILENAME);
 }
 
@@ -313,163 +318,10 @@
 		gdk_rgba_free (settings->priv->text);
 	if (settings->priv->back)
 		gdk_rgba_free (settings->priv->back);
-
-	g_free (settings->priv->fontname);
 		
 	G_OBJECT_CLASS (xpad_settings_parent_class)->finalize (object);
 }
 
-void xpad_settings_set_width (XpadSettings *settings, guint width)
-{
-	if (settings->priv->width == width)
-		return;
-	
-	settings->priv->width = width;
-	
-	save_to_file (settings, DEFAULTS_FILENAME);
-	
-	g_object_notify (G_OBJECT (settings), "width");
-}
-
-guint xpad_settings_get_width (XpadSettings *settings)
-{
-	return settings->priv->width;
-}
-
-void xpad_settings_set_height (XpadSettings *settings, guint height)
-{
-	if (settings->priv->height == height)
-		return;
-	
-	settings->priv->height = height;
-	
-	save_to_file (settings, DEFAULTS_FILENAME);
-	
-	g_object_notify (G_OBJECT (settings), "height");
-}
-
-guint xpad_settings_get_height (XpadSettings *settings)
-{
-	return settings->priv->height;
-}
-
-void xpad_settings_set_has_decorations (XpadSettings *settings, gboolean decorations)
-{
-	if (settings->priv->has_decorations == decorations)
-		return;
-	
-	settings->priv->has_decorations = decorations;
-	
-	save_to_file (settings, DEFAULTS_FILENAME);
-	
-	g_object_notify (G_OBJECT (settings), "has_decorations");
-}
-
-gboolean xpad_settings_get_has_decorations (XpadSettings *settings)
-{
-	return settings->priv->has_decorations;
-}
-
-void xpad_settings_set_confirm_destroy (XpadSettings *settings, gboolean confirm)
-{
-	if (settings->priv->confirm_destroy == confirm)
-		return;
-	
-	settings->priv->confirm_destroy = confirm;
-	
-	save_to_file (settings, DEFAULTS_FILENAME);
-	
-	g_object_notify (G_OBJECT (settings), "confirm_destroy");
-}
-
-gboolean xpad_settings_get_confirm_destroy (XpadSettings *settings)
-{
-	return settings->priv->confirm_destroy;
-}
-
-void xpad_settings_set_edit_lock (XpadSettings *settings, gboolean lock)
-{
-	if (settings->priv->edit_lock == lock)
-		return;
-	
-	settings->priv->edit_lock = lock;
-	
-	save_to_file (settings, DEFAULTS_FILENAME);
-	
-	g_object_notify (G_OBJECT (settings), "edit_lock");
-}
-
-gboolean xpad_settings_get_edit_lock (XpadSettings *settings)
-{
-	return settings->priv->edit_lock;
-}
-
-void xpad_settings_set_tray_click_handler (XpadSettings *settings, guint conf)
-{
-	if (settings->priv->tray_click_configuration == conf)
-		return;
-	
-	settings->priv->tray_click_configuration = conf;
-	save_to_file(settings, DEFAULTS_FILENAME);
-	g_object_notify (G_OBJECT (settings), "tray_click_configuration");
-}
-
-guint xpad_settings_get_tray_click_handler(XpadSettings *settings)
-{
-	return settings->priv->tray_click_configuration;
-}
-
-void xpad_settings_set_has_toolbar (XpadSettings *settings, gboolean toolbar)
-{
-	if (settings->priv->has_toolbar == toolbar)
-		return;
-	
-	settings->priv->has_toolbar = toolbar;
-	
-	save_to_file (settings, DEFAULTS_FILENAME);
-	
-	g_object_notify (G_OBJECT (settings), "has_toolbar");
-}
-
-gboolean xpad_settings_get_has_toolbar (XpadSettings *settings)
-{
-	return settings->priv->has_toolbar;
-}
-
-void xpad_settings_set_autohide_toolbar (XpadSettings *settings, gboolean hide)
-{
-	if (settings->priv->autohide_toolbar == hide)
-		return;
-	
-	settings->priv->autohide_toolbar = hide;
-	
-	save_to_file (settings, DEFAULTS_FILENAME);
-	
-	g_object_notify (G_OBJECT (settings), "autohide_toolbar");
-}
-
-gboolean xpad_settings_get_autohide_toolbar (XpadSettings *settings)
-{
-	return settings->priv->autohide_toolbar;
-}
-
-void xpad_settings_set_has_scrollbar (XpadSettings *settings, gboolean scrollbar)
-{
-	if (settings->priv->has_scrollbar == scrollbar)
-		return;
-	
-	settings->priv->has_scrollbar = scrollbar;
-	
-	save_to_file (settings, DEFAULTS_FILENAME);
-	
-	g_object_notify (G_OBJECT (settings), "has_scrollbar");
-}
-
-gboolean xpad_settings_get_has_scrollbar (XpadSettings *settings)
-{
-	return settings->priv->has_scrollbar;
-}
-
 void xpad_settings_add_toolbar_button (XpadSettings *settings, const gchar *button)
 {
 	settings->priv->toolbar_buttons = g_slist_append (settings->priv->toolbar_buttons, g_strdup (button));
@@ -530,313 +382,254 @@
 	return settings->priv->toolbar_buttons;
 }
 
-void xpad_settings_set_back_color (XpadSettings *settings, const GdkRGBA *back)
-{
-	if (settings->priv->back)
-		gdk_rgba_free (settings->priv->back);
-	
-	if (back)
-		settings->priv->back = gdk_rgba_copy (back);
-	else
-		settings->priv->back = NULL;
-	
-	save_to_file (settings, DEFAULTS_FILENAME);
-	
-	g_object_notify (G_OBJECT (settings), "back_color");
-}
-
-const GdkRGBA *xpad_settings_get_back_color (XpadSettings *settings)
-{
-	return settings->priv->back;
-}
-
-void xpad_settings_set_text_color (XpadSettings *settings, const GdkRGBA *text)
-{
-	if (settings->priv->text)
-		gdk_rgba_free (settings->priv->text);
-	
-	if (text)
-		settings->priv->text = gdk_rgba_copy (text);
-	else
-		settings->priv->text = NULL;
-	
-	save_to_file (settings, DEFAULTS_FILENAME);
-	
-	g_object_notify (G_OBJECT (settings), "text_color");
-}
-
-const GdkRGBA *xpad_settings_get_text_color (XpadSettings *settings)
-{
-	return settings->priv->text;
-}
-
-void xpad_settings_set_fontname (XpadSettings *settings, const gchar *fontname)
-{
-	g_free (settings->priv->fontname);
-	settings->priv->fontname = g_strdup (fontname);
-	
-	save_to_file (settings, DEFAULTS_FILENAME);
-	
-	g_object_notify (G_OBJECT (settings), "fontname");
-}
-
-const gchar *xpad_settings_get_fontname (XpadSettings *settings)
-{
-	return settings->priv->fontname;
-}
-
-gboolean xpad_settings_get_autostart_xpad (XpadSettings *settings)
-{
-	/* The existence of the xpad.desktop file in the autostart folder defines if autostarting is enabled or disabled */
-	const gchar *filename = g_strdup_printf ("%s/.config/autostart/xpad.desktop", g_getenv ("HOME"));
-	return g_file_test (filename, G_FILE_TEST_EXISTS);
-}
-
-void xpad_settings_set_autostart_wait_systray (XpadSettings *settings, gboolean conf)
-{
-	if (settings->priv->autostart_wait_systray == conf)
-		return;
-	
-	settings->priv->autostart_wait_systray = conf;
-	save_to_file (settings, DEFAULTS_FILENAME);
-	g_object_notify (G_OBJECT (settings), "autostart_wait_systray");
-}
-
-gboolean xpad_settings_get_autostart_wait_systray (XpadSettings *settings)
-{
-	return settings->priv->autostart_wait_systray;
-}
-
-void xpad_settings_set_autostart_delay (XpadSettings *settings, guint conf)
-{
-	if (settings->priv->autostart_delay == conf)
-		return;
-	
-	settings->priv->autostart_delay = conf;
-	save_to_file(settings, DEFAULTS_FILENAME);
-	g_object_notify (G_OBJECT (settings), "autostart_delay");
-}
-
-guint xpad_settings_get_autostart_delay (XpadSettings *settings)
-{
-	return settings->priv->autostart_delay;
-}
-
-void xpad_settings_set_autostart_new_pad (XpadSettings *settings, gboolean conf)
-{
-	if (settings->priv->autostart_new_pad == conf)
-		return;
-	
-	settings->priv->autostart_new_pad = conf;
-	save_to_file (settings, DEFAULTS_FILENAME);
-	g_object_notify (G_OBJECT (settings), "autostart_new_pad");
-}
-
-gboolean xpad_settings_get_autostart_new_pad (XpadSettings *settings)
-{
-	return settings->priv->autostart_new_pad;
-}
-
-void xpad_settings_set_autostart_sticky (XpadSettings *settings, gboolean sticky)
-{
-	if (settings->priv->autostart_sticky == sticky)
-		return;
-	
-	settings->priv->autostart_sticky = sticky;
-	save_to_file (settings, DEFAULTS_FILENAME);
-	g_object_notify (G_OBJECT (settings), "autostart_sticky");
-}
-
-gboolean xpad_settings_get_autostart_sticky (XpadSettings *settings)
-{
-	return settings->priv->autostart_sticky;
-}
-
-void xpad_settings_set_autostart_display_pads (XpadSettings *settings, guint conf)
-{
-	if (settings->priv->autostart_display_pads == conf)
-		return;
-	
-	settings->priv->autostart_display_pads = conf;
-	save_to_file (settings, DEFAULTS_FILENAME);
-	g_object_notify (G_OBJECT (settings), "autostart_display_pads");
-}
-
-guint xpad_settings_get_autostart_display_pads(XpadSettings *settings)
-{
-	return settings->priv->autostart_display_pads;
-}
-
 static void
 xpad_settings_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
-	XpadSettings *settings;
-	
-	settings = XPAD_SETTINGS (object);
+	XpadSettings *settings = XPAD_SETTINGS (object);
 	
 	switch (prop_id)
 	{
+	case PROP_WIDTH:
+		settings->priv->width = g_value_get_uint (value);
+		break;
+	
 	case PROP_HEIGHT:
-		xpad_settings_set_height (settings, g_value_get_uint (value));
-		break;
-	
-	case PROP_WIDTH:
-		xpad_settings_set_width (settings, g_value_get_uint (value));
+		settings->priv->height = g_value_get_uint (value);
 		break;
 	
 	case PROP_HAS_DECORATIONS:
-		xpad_settings_set_has_decorations (settings, g_value_get_boolean (value));
+		settings->priv->has_decorations = g_value_get_boolean (value);
 		break;
 	
 	case PROP_CONFIRM_DESTROY:
-		xpad_settings_set_confirm_destroy (settings, g_value_get_boolean (value));
+		settings->priv->confirm_destroy = g_value_get_boolean (value);
 		break;
 	
 	case PROP_EDIT_LOCK:
-		xpad_settings_set_edit_lock (settings, g_value_get_boolean (value));
+		settings->priv->edit_lock = g_value_get_boolean (value);
 		break;
 		
+	case PROP_TRAY_ENABLED:
+		settings->priv->tray_enabled = g_value_get_boolean (value);
+		break;
+
 	case PROP_TRAY_CLICK_CONFIGURATION:
-		xpad_settings_set_tray_click_handler(settings, g_value_get_uint(value));
+		settings->priv->tray_click_configuration = g_value_get_uint(value);
 		break;
 		
 	case PROP_HAS_TOOLBAR:
-		xpad_settings_set_has_toolbar (settings, g_value_get_boolean (value));
+		settings->priv->has_toolbar = g_value_get_boolean (value);
 		break;
 	
 	case PROP_AUTOHIDE_TOOLBAR:
-		xpad_settings_set_autohide_toolbar (settings, g_value_get_boolean (value));
+		settings->priv->autohide_toolbar = g_value_get_boolean (value);
 		break;
 	
 	case PROP_HAS_SCROLLBAR:
-		xpad_settings_set_has_scrollbar (settings, g_value_get_boolean (value));
+		settings->priv->has_scrollbar = g_value_get_boolean (value);
 		break;
 	
+	case PROP_TEXT_COLOR:
+		if (settings->priv->text)
+			gdk_rgba_free (settings->priv->text);
+		if (g_value_get_boxed (value))
+			settings->priv->text = gdk_rgba_copy (g_value_get_boxed (value));
+		else
+			settings->priv->text = NULL;
+		break;
+
 	case PROP_BACK_COLOR:
-		xpad_settings_set_back_color (settings, g_value_get_boxed (value));
-		break;
-	
-	case PROP_TEXT_COLOR:
-		xpad_settings_set_text_color (settings, g_value_get_boxed (value));
-		break;
-	
+		if (settings->priv->back)
+			gdk_rgba_free (settings->priv->back);
+		if (g_value_get_boxed (value))
+			settings->priv->back = gdk_rgba_copy (g_value_get_boxed (value));
+		else
+			settings->priv->back = NULL;
+		break;
+
 	case PROP_FONTNAME:
-		xpad_settings_set_fontname (settings, g_value_get_string (value));
+		if (value)
+			settings->priv->fontname = g_value_dup_string (value);
+		else
+			settings->priv->fontname = NULL;
+		break;
+
+	case PROP_AUTOSTART_XPAD:
+		if (g_value_get_boolean (value)) {
+			/* Copy the xpad.desktop file to the autostart folder and enable/disable the wait for systray preference */
+			gboolean success;
+			char *source_filename, *destination_directory;
+			GFile *source, *destination;
+			GError *error = NULL;
+
+			/* Find the base directory where the application is installed /usr or /usr/local, to find the correct xpad.desktop file. */
+			const char *program_path = xpad_app_get_program_path();
+
+			if (!program_path)
+				xpad_app_error (NULL, _("Error enabling Xpad autostart"), g_strdup_printf (_("Could not find the directory where Xpad is installed\n%s"), error->message));
+			else {
+				size_t len = strlen(program_path);
+				char basedir[len-8];
+				guint i;
+				for (i=0; i<len-8; i++)
+					basedir[i] = program_path[i];
+				basedir[len-9] = '\0';
+
+				source_filename = g_strdup_printf ("%s/share/applications/xpad.desktop", basedir);
+				destination_directory = g_strdup_printf ("%s/.config/autostart/xpad.desktop", g_getenv ("HOME"));
+
+				source = g_file_new_for_path (source_filename);
+				destination = g_file_new_for_path (destination_directory);
+				success = g_file_copy (source, destination, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, &error);
+
+				if (!success)
+					xpad_app_error (NULL, _("Error enabling Xpad autostart"), g_strdup_printf (_("Could not copy %s to %s\n%s"), source_filename, destination_directory, error->message));
+			}
+		}
+		else {
+			/* Remove the xpad.desktop file from the autostart folder and enable/disable the wait for systray preference */
+			gboolean success;
+			char *filename;
+			GFile *file;
+			GError *error = NULL;
+
+			filename = g_strdup_printf ("%s/.config/autostart/xpad.desktop", g_getenv ("HOME"));
+			file = g_file_new_for_path (filename);
+			success = g_file_delete (file, NULL, &error);
+
+			if (!success)
+				xpad_app_error (NULL, _("Error disabling Xpad autostart"), g_strdup_printf (_("Could not delete %s\n%s"), filename, error->message));
+		}
 		break;
 
 	case PROP_AUTOSTART_WAIT_SYSTRAY:
-		xpad_settings_set_autostart_wait_systray (settings, g_value_get_boolean (value));
-		break;
-
-	case PROP_AUTOSTART_DELAY:
-		xpad_settings_set_autostart_delay (settings, g_value_get_uint (value));
+		settings->priv->autostart_wait_systray = g_value_get_boolean (value);
 		break;
 
 	case PROP_AUTOSTART_NEW_PAD:
-		xpad_settings_set_autostart_new_pad (settings, g_value_get_boolean (value));
+		settings->priv->autostart_new_pad = g_value_get_boolean (value);
 		break;
 
 	case PROP_AUTOSTART_STICKY:
-		xpad_settings_set_autostart_sticky (settings, g_value_get_boolean (value));
+		settings->priv->autostart_sticky = g_value_get_boolean (value);
 		break;
 	
+	case PROP_AUTOSTART_DELAY:
+		settings->priv->autostart_delay = g_value_get_uint (value);
+		break;
+
 	case PROP_AUTOSTART_DISPLAY_PADS:
-		xpad_settings_set_autostart_display_pads (settings, g_value_get_uint (value));
+		settings->priv->autostart_display_pads = g_value_get_uint (value);
 		break;
 		
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
+		return;
 	}
+	save_to_file (settings, DEFAULTS_FILENAME);
 }
 
 static void
 xpad_settings_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
-	XpadSettings *settings;
-	
-	settings = XPAD_SETTINGS (object);
+	XpadSettings *settings = XPAD_SETTINGS (object);
 	
 	switch (prop_id)
 	{
+	case PROP_WIDTH:
+		g_value_set_uint (value, settings->priv->width);
+		break;
+	
 	case PROP_HEIGHT:
-		g_value_set_uint (value, xpad_settings_get_height (settings));
-		break;
-	
-	case PROP_WIDTH:
-		g_value_set_uint (value, xpad_settings_get_width (settings));
+		g_value_set_uint (value, settings->priv->height);
 		break;
 	
 	case PROP_HAS_DECORATIONS:
-		g_value_set_boolean (value, xpad_settings_get_has_decorations (settings));
+		g_value_set_boolean (value, settings->priv->has_decorations);
 		break;
 	
 	case PROP_CONFIRM_DESTROY:
-		g_value_set_boolean (value, xpad_settings_get_confirm_destroy (settings));
+		g_value_set_boolean (value, settings->priv->confirm_destroy);
 		break;
 	
 	case PROP_EDIT_LOCK:
-		g_value_set_boolean (value, xpad_settings_get_edit_lock (settings));
+		g_value_set_boolean (value, settings->priv->edit_lock);
 		break;
 	
+	case PROP_TRAY_ENABLED:
+		g_value_set_boolean (value, settings->priv->tray_enabled);
+		break;
+
+	case PROP_TRAY_CLICK_CONFIGURATION:
+		g_value_set_uint (value, settings->priv->tray_click_configuration);
+		break;
+
 	case PROP_HAS_TOOLBAR:
-		g_value_set_boolean (value, xpad_settings_get_has_toolbar (settings));
+		g_value_set_boolean (value, settings->priv->has_toolbar);
 		break;
 	
 	case PROP_AUTOHIDE_TOOLBAR:
-		g_value_set_boolean (value, xpad_settings_get_autohide_toolbar (settings));
+		g_value_set_boolean (value, settings->priv->autohide_toolbar);
 		break;
 	
 	case PROP_HAS_SCROLLBAR:
-		g_value_set_boolean (value, xpad_settings_get_has_scrollbar (settings));
+		g_value_set_boolean (value, settings->priv->has_scrollbar);
+		break;
+	
+	case PROP_TEXT_COLOR:
+		if (settings->priv->text)
+			g_value_set_static_boxed (value, settings->priv->text);
+		else
+			value = NULL;
 		break;
 	
 	case PROP_BACK_COLOR:
-		g_value_set_static_boxed (value, xpad_settings_get_back_color (settings));
-		break;
-	
-	case PROP_TEXT_COLOR:
-		g_value_set_static_boxed (value, xpad_settings_get_text_color (settings));
+		if (settings->priv->back)
+			g_value_set_static_boxed (value, settings->priv->back);
+		else
+			value = NULL;
 		break;
 	
 	case PROP_FONTNAME:
-		g_value_set_string (value, xpad_settings_get_fontname (settings));
+		if (settings->priv->fontname)
+			g_value_set_string (value, settings->priv->fontname);
+		else
+			value = NULL;
+		break;
+
+	case PROP_AUTOSTART_XPAD:
+		g_value_set_boolean (value, g_file_test (g_strdup_printf ("%s/.config/autostart/xpad.desktop", g_getenv ("HOME")), G_FILE_TEST_EXISTS));
 		break;
 
 	case PROP_AUTOSTART_WAIT_SYSTRAY:
-		g_value_set_boolean (value, xpad_settings_get_autostart_wait_systray (settings));
-		break;
-	
-	case PROP_AUTOSTART_DELAY:
-		g_value_set_uint (value, xpad_settings_get_autostart_delay (settings));
+		g_value_set_boolean (value, settings->priv->autostart_wait_systray);
 		break;
 	
 	case PROP_AUTOSTART_NEW_PAD:
-		g_value_set_boolean (value, xpad_settings_get_autostart_new_pad (settings));
+		g_value_set_boolean (value, settings->priv->autostart_new_pad);
 		break;
 	
 	case PROP_AUTOSTART_STICKY:
-		g_value_set_boolean (value, xpad_settings_get_autostart_sticky (settings));
+		g_value_set_boolean (value, settings->priv->autostart_sticky);
 		break;
 	
+	case PROP_AUTOSTART_DELAY:
+		g_value_set_uint (value, settings->priv->autostart_delay);
+		break;
+
 	case PROP_AUTOSTART_DISPLAY_PADS:
-		g_value_set_uint (value, xpad_settings_get_autostart_display_pads (settings));
+		g_value_set_uint (value, settings->priv->autostart_display_pads);
 		break;
-	
+
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
+		return;
 	}
 }
 
 static void
 load_from_file (XpadSettings *settings, const gchar *filename)
 {
-	/**
-	 * We need to set up int values for all these to take the value from the file.
-	 * These will be assigned back to the appropriate values after load.
-	 */
-
 	gchar *buttons = NULL;
 	gchar *text_color_string = NULL;
 	gchar *background_color_string = NULL;
@@ -860,6 +653,7 @@
 		"b|confirm_destroy", &settings->priv->confirm_destroy,
 		"b|edit_lock", &settings->priv->edit_lock,
 		"b|sticky_on_start", &settings->priv->autostart_sticky,
+		"b|tray_enabled", &settings->priv->tray_enabled,
 		"u|tray_click_configuration", &settings->priv->tray_click_configuration,
 		"s|back", &background_color_string,
 		"b|use_back", &use_back,
@@ -877,8 +671,7 @@
 		NULL))
 		return;
 
-	if (use_text)
-	{
+	if (use_text) {
 		gdk_rgba_free (settings->priv->text);
 
 		/*
@@ -886,15 +679,12 @@
 		 * (for example due to the migration to the new GdkRGBA colors),
 		 * set the color to the default.
 		 */
-		if (text_color_string == NULL) {
+		if (text_color_string == NULL)
 			text = (GdkRGBA) {0, 0, 0, 1};
-		}
-		else {
+		else
 			/* If, for some reason, the parsing of the colors fail, set the color to the default. */
-			if (!gdk_rgba_parse (&text, text_color_string)) {
+			if (!gdk_rgba_parse (&text, text_color_string))
 				text = (GdkRGBA) {0, 0, 0, 1};
-			}
-		}
 
 		settings->priv->text = gdk_rgba_copy (&text);
 	}
@@ -906,15 +696,12 @@
 		 * (for example due to the migration to the new GdkRGBA colors),
 		 * set the color to the default.
 		 */
-		if (background_color_string == NULL) {
+		if (background_color_string == NULL)
 			back = (GdkRGBA) {1, 0.933334350586, 0.6, 1};
-		}
-		else {
+		else
 			/* If, for some reason, the parsing of the colors fail, set the color to the default. */
-			if (!gdk_rgba_parse (&back, background_color_string)) {
+			if (!gdk_rgba_parse (&back, background_color_string))
 				back = (GdkRGBA) {1, 0.933334350586, 0.6, 1};
-			}
-		}
 
 		settings->priv->back = gdk_rgba_copy (&back);
 	}
@@ -922,10 +709,7 @@
 		settings->priv->back = NULL;
 
 	if (settings->priv->fontname && strcmp (settings->priv->fontname, "NULL") == 0)
-	{
-		g_free (settings->priv->fontname);
 		settings->priv->fontname = NULL;
-	}
 	
 	if (buttons)
 	{
@@ -943,11 +727,9 @@
 		}
 		
 		for (i = 0; button_names[i]; ++i)
-		{
 			settings->priv->toolbar_buttons = 
 				g_slist_append (settings->priv->toolbar_buttons,
 				g_strstrip (button_names[i])); /* takes ownership of string */
-		}
 		
 		g_free (button_names);
 		g_free (buttons);
@@ -983,6 +765,7 @@
 		"b|confirm_destroy", settings->priv->confirm_destroy,
 		"b|edit_lock", settings->priv->edit_lock,
 		"b|sticky_on_start", settings->priv->autostart_sticky,
+		"b|tray_enabled", settings->priv->tray_enabled,
 		"u|tray_click_configuration", settings->priv->tray_click_configuration,
 		"s|back", settings->priv->back ? gdk_rgba_to_string (settings->priv->back) : "NULL",
 		"b|use_back", settings->priv->back ? TRUE : FALSE,
 
=== modified file 'src/xpad-settings.h'
--- src/xpad-settings.h	2014-06-07 00:19:07 +0000
+++ src/xpad-settings.h	2014-06-13 15:52:27 +0000
@@ -1,6 +1,7 @@
 /*
 
 Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -21,7 +22,7 @@
 #ifndef __XPAD_SETTINGS_H__
 #define __XPAD_SETTINGS_H__
 
-#include <gtk/gtk.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
@@ -54,65 +55,11 @@
 
 XpadSettings *xpad_settings_new (void);
 
-void xpad_settings_set_width (XpadSettings *settings, guint width);
-guint xpad_settings_get_width (XpadSettings *settings);
-
-void xpad_settings_set_height (XpadSettings *settings, guint height);
-guint xpad_settings_get_height (XpadSettings *settings);
-
-void xpad_settings_set_has_decorations (XpadSettings *settings, gboolean decorations);
-gboolean xpad_settings_get_has_decorations (XpadSettings *settings);
-
-void xpad_settings_set_confirm_destroy (XpadSettings *settings, gboolean confirm);
-gboolean xpad_settings_get_confirm_destroy (XpadSettings *settings);
-
-void xpad_settings_set_edit_lock (XpadSettings *settings, gboolean lock);
-gboolean xpad_settings_get_edit_lock (XpadSettings *settings);
-
-void xpad_settings_set_has_toolbar (XpadSettings *settings, gboolean toolbar);
-gboolean xpad_settings_get_has_toolbar (XpadSettings *settings);
-
-void xpad_settings_set_autohide_toolbar (XpadSettings *settings, gboolean hide);
-gboolean xpad_settings_get_autohide_toolbar (XpadSettings *settings);
-
-void xpad_settings_set_has_scrollbar (XpadSettings *settings, gboolean scrollbar);
-gboolean xpad_settings_get_has_scrollbar (XpadSettings *settings);
-
 void xpad_settings_add_toolbar_button (XpadSettings *settings, const gchar *button);
 gboolean xpad_settings_remove_all_toolbar_buttons (XpadSettings *settings);
 gboolean xpad_settings_remove_last_toolbar_button (XpadSettings *settings);
 const GSList *xpad_settings_get_toolbar_buttons (XpadSettings *settings);
 
-void xpad_settings_set_back_color (XpadSettings *settings, const GdkRGBA *back);
-const GdkRGBA *xpad_settings_get_back_color (XpadSettings *settings);
-
-void xpad_settings_set_text_color (XpadSettings *settings, const GdkRGBA *text);
-const GdkRGBA *xpad_settings_get_text_color (XpadSettings *settings);
-
-void xpad_settings_set_fontname (XpadSettings *settings, const gchar *fontname);
-const gchar *xpad_settings_get_fontname (XpadSettings *settings);
-
-void xpad_settings_set_tray_click_handler (XpadSettings *settings, guint conf);
-guint xpad_settings_get_tray_click_handler (XpadSettings *settings);
-
-void xpad_settings_set_autostart_xpad (XpadSettings *settings, gboolean conf);
-gboolean xpad_settings_get_autostart_xpad (XpadSettings *settings);
-
-void xpad_settings_set_autostart_wait_systray (XpadSettings *settings, gboolean conf);
-gboolean xpad_settings_get_autostart_wait_systray (XpadSettings *settings);
-
-void xpad_settings_set_autostart_delay (XpadSettings *settings, guint conf);
-guint xpad_settings_get_autostart_delay (XpadSettings *settings);
-
-void xpad_settings_set_autostart_new_pad (XpadSettings *settings, gboolean conf);
-gboolean xpad_settings_get_autostart_new_pad (XpadSettings *settings);
-
-void xpad_settings_set_autostart_sticky (XpadSettings *settings, gboolean conf);
-gboolean xpad_settings_get_autostart_sticky (XpadSettings *settings);
-
-void xpad_settings_set_autostart_display_pads (XpadSettings *settings, guint conf);
-guint xpad_settings_get_autostart_display_pads (XpadSettings *settings);
-
 G_END_DECLS
 
 #endif /* __XPAD_SETTINGS_H__ */
 
=== modified file 'src/xpad-text-buffer.c'
--- src/xpad-text-buffer.c	2013-11-01 20:16:37 +0000
+++ src/xpad-text-buffer.c	2014-06-13 15:52:27 +0000
@@ -1,26 +1,27 @@
-/**
- * Copyright (c) 2004-2007 Michael Terry
- * Copyright (c) 2011 Sergei Riaguzov
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "../config.h"
-#include "xpad-text-buffer.h"
+/*
+
+Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2011 Sergei Riaguzov
+Copyright (c) 2013-2014 Arthur Borsboom
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+#include "xpad-pad.h"
 #include "xpad-undo.h"
-#include "xpad-pad.h"
 
 struct XpadTextBufferPrivate 
 {
 
=== modified file 'src/xpad-text-buffer.h'
--- src/xpad-text-buffer.h	2013-10-18 18:31:20 +0000
+++ src/xpad-text-buffer.h	2014-06-13 15:52:27 +0000
@@ -1,26 +1,28 @@
-/**
- * Copyright (c) 2004-2007 Michael Terry
- * Copyright (c) 2011 Sergei Riaguzov
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
+/*
+
+Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2011 Sergei Riaguzov
+Copyright (c) 2013-2014 Arthur Borsboom
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
 
 #ifndef __XPAD_TEXT_BUFFER_H__
 #define __XPAD_TEXT_BUFFER_H__
 
-#include <gtk/gtk.h>
 #include "xpad-pad.h"
 
 G_BEGIN_DECLS
@@ -39,8 +41,6 @@
 struct XpadTextBuffer
 {
 	GtkTextBuffer parent;
-
-	/* private */
 	XpadTextBufferPrivate *priv;
 };
 
 
=== modified file 'src/xpad-text-view.c'
--- src/xpad-text-view.c	2014-06-04 15:59:25 +0000
+++ src/xpad-text-view.c	2014-06-13 15:52:27 +0000
@@ -1,25 +1,27 @@
-/**
- * Copyright (c) 2004-2007 Michael Terry
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "../config.h"
+/*
+
+Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+#include <gtk/gtk.h>
 #include "xpad-text-view.h"
 #include "xpad-text-buffer.h"
-#include "xpad-settings.h"
 #include "xpad-app.h"
 
 struct XpadTextViewPrivate 
@@ -117,7 +119,6 @@
 	view->priv->notify_font_handler = g_signal_connect_swapped (xpad_global_settings, "notify::fontname", G_CALLBACK (xpad_text_view_notify_fontname), view);
 	view->priv->notify_text_handler = g_signal_connect_swapped (xpad_global_settings, "notify::text-color", G_CALLBACK (xpad_text_view_notify_colors), view);
 	view->priv->notify_back_handler = g_signal_connect_swapped (xpad_global_settings, "notify::back-color", G_CALLBACK (xpad_text_view_notify_colors), view);
-	
 	xpad_text_view_notify_colors (view);
 	xpad_text_view_notify_fontname (view);
 }
@@ -147,7 +148,9 @@
 static void
 xpad_text_view_realize (XpadTextView *view)
 {
-	gtk_text_view_set_editable (GTK_TEXT_VIEW (view), !xpad_settings_get_edit_lock (xpad_global_settings));
+	gboolean edit_lock;
+	g_object_get (xpad_global_settings, "edit-lock", &edit_lock, NULL);
+	gtk_text_view_set_editable (GTK_TEXT_VIEW (view), !edit_lock);
 }
 
 static gboolean
@@ -156,7 +159,10 @@
 	/* A dirty way to silence the compiler for these unused variables. */
 	(void) event;
 
-	if (xpad_settings_get_edit_lock (xpad_global_settings))
+	gboolean edit_lock;
+	g_object_get (xpad_global_settings, "edit-lock", &edit_lock, NULL);
+
+	if (edit_lock)
 	{
 		gtk_text_view_set_editable (GTK_TEXT_VIEW (widget), FALSE);
 		return TRUE;
@@ -168,8 +174,11 @@
 static gboolean
 xpad_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
 {
+	gboolean edit_lock;
+	g_object_get (xpad_global_settings, "edit-lock", &edit_lock, NULL);
+
 	if (event->button == 1 &&
-	    xpad_settings_get_edit_lock (xpad_global_settings) &&
+	    edit_lock &&
 	    !gtk_text_view_get_editable (GTK_TEXT_VIEW (widget)))
 	{
 		if (event->type == GDK_2BUTTON_PRESS)
@@ -191,7 +200,9 @@
 xpad_text_view_notify_edit_lock (XpadTextView *view)
 {
 	/* chances are good that they don't have the text view focused while it changed, so make non-editable if edit lock turned on */
-	gtk_text_view_set_editable (GTK_TEXT_VIEW (view), !xpad_settings_get_edit_lock (xpad_global_settings));
+	gboolean edit_lock;
+	g_object_get (xpad_global_settings, "edit-lock", &edit_lock, NULL);
+	gtk_text_view_set_editable (GTK_TEXT_VIEW (view), !edit_lock);
 }
 
 static void
@@ -218,7 +229,8 @@
 static void
 xpad_text_view_notify_fontname (XpadTextView *view)
 {
-	const gchar *font = xpad_settings_get_fontname (xpad_global_settings);
+	const gchar *font;
+	g_object_get (xpad_global_settings, "fontname", &font, NULL);
 	PangoFontDescription *fontdesc;
 	
 	fontdesc = font ? pango_font_description_from_string (font) : NULL;
@@ -232,8 +244,8 @@
 xpad_text_view_notify_colors (XpadTextView *view)
 {
 	/* Set the colors of this individual pad to the global setting preference. */
-	const GdkRGBA *text_color = xpad_settings_get_text_color (xpad_global_settings);
-	const GdkRGBA *back_color = xpad_settings_get_back_color (xpad_global_settings);
+	const GdkRGBA *text_color, *back_color;
+	g_object_get (xpad_global_settings, "text-color", &text_color, "back-color", &back_color, NULL);
 
 	gtk_widget_override_cursor (GTK_WIDGET (view), text_color, text_color);
 	gtk_widget_override_color (GTK_WIDGET (view), GTK_STATE_FLAG_NORMAL, text_color);
 
=== modified file 'src/xpad-text-view.h'
--- src/xpad-text-view.h	2011-11-16 18:10:04 +0000
+++ src/xpad-text-view.h	2014-06-13 15:52:27 +0000
@@ -1,25 +1,27 @@
-/**
- * Copyright (c) 2004-2007 Michael Terry
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
+/*
+
+Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
 
 #ifndef __XPAD_TEXT_VIEW_H__
 #define __XPAD_TEXT_VIEW_H__
 
-#include <gtk/gtk.h>
 #include "xpad-pad.h"
 
 G_BEGIN_DECLS
@@ -38,8 +40,6 @@
 struct XpadTextView
 {
 	GtkTextView parent;
-	
-	/* private */
 	XpadTextViewPrivate *priv;
 };
 
 
=== modified file 'src/xpad-toolbar.c'
--- src/xpad-toolbar.c	2014-06-04 12:36:36 +0000
+++ src/xpad-toolbar.c	2014-06-13 15:52:27 +0000
@@ -1,6 +1,7 @@
 /*
 
 Copyright (c) 2001-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -18,14 +19,10 @@
 
 */
 
-#include "../config.h"
-#include <string.h>
-#include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
+#include "xpad-app.h"
+#include "xpad-grip-tool-item.h"
 #include "xpad-toolbar.h"
-#include "xpad-settings.h"
-#include "xpad-grip-tool-item.h"
-#include "xpad-app.h"
 
 struct XpadToolbarPrivate
 {
 
=== modified file 'src/xpad-toolbar.h'
--- src/xpad-toolbar.h	2011-11-16 18:10:04 +0000
+++ src/xpad-toolbar.h	2014-06-13 15:52:27 +0000
@@ -21,7 +21,6 @@
 #ifndef __XPAD_TOOLBAR_H__
 #define __XPAD_TOOLBAR_H__
 
-#include <gtk/gtk.h>
 #include "xpad-pad.h"
 
 G_BEGIN_DECLS
@@ -40,8 +39,6 @@
 struct XpadToolbar
 {
 	GtkToolbar parent;
-	
-	/* private */
 	XpadToolbarPrivate *priv;
 };
 
 
=== modified file 'src/xpad-tray.c'
--- src/xpad-tray.c	2014-06-04 12:36:36 +0000
+++ src/xpad-tray.c	2014-06-13 15:52:27 +0000
@@ -2,7 +2,7 @@
 
 Copyright (c) 2002 Jamis Buck
 Copyright (c) 2003-2007 Michael Terry
-Copyright (c) 2013 Arthur Borsboom
+Copyright (c) 2013-2014 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -21,12 +21,11 @@
 */
 
 #include "../config.h"
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 #include "fio.h"
 #include "xpad-app.h"
 #include "xpad-pad.h"
-#include "xpad-pad-group.h"
 #include "xpad-preferences.h"
 #include "xpad-settings.h"
 #include "xpad-tray.h"
@@ -38,12 +37,17 @@
 	LIST_OF_PADS,
 	NEW_PAD
 };
+
+static void xpad_tray_open (XpadSettings *settings);
+static void xpad_tray_close ();
+/* Enable/disable the tray icon */
+static void xpad_tray_toggle (XpadSettings *settings);
 /* tray icon left click handler */
-static void xpad_tray_activate_cb (GtkStatusIcon *icon);
+static void xpad_tray_activate_cb (GtkStatusIcon *icon, XpadSettings *settings);
 /* tray icon right click handler */
 static void xpad_tray_popup_menu_cb (GtkStatusIcon *icon, guint button, guint time);
 /* "toggle show all" menu item handler */
-static void xpad_tray_show_hide_all (void);
+static void xpad_tray_show_hide_all ();
 /* "show pads" menu item handler */
 static void xpad_tray_show_windows_list (GtkStatusIcon *icon);
 /* helper function to append pad window title as item to menu */
@@ -52,35 +56,42 @@
 static GtkStatusIcon  *docklet = NULL;
 static GtkWidget *menu = NULL;
 
-void
-xpad_tray_open ()
+void xpad_tray_init (XpadSettings *settings) {
+	xpad_tray_toggle (settings);
+	g_signal_connect (settings, "notify::tray-enabled", G_CALLBACK (xpad_tray_toggle), NULL);
+}
+
+static void xpad_tray_toggle (XpadSettings *settings) {
+	gboolean tray_enabled;
+	g_object_get (settings, "tray-enabled", &tray_enabled, NULL);
+
+	if (tray_enabled) {
+		if (!docklet)
+			xpad_tray_open (settings);
+	}
+	else
+		xpad_tray_close ();
+}
+
+static void xpad_tray_open (XpadSettings *settings)
 {
-	GtkIconTheme *theme;
-
-	theme = gtk_icon_theme_get_default ();
-
-	if (!gtk_icon_theme_has_icon (theme, PACKAGE)) {
+	GtkIconTheme *theme = gtk_icon_theme_get_default ();
+
+	if (!gtk_icon_theme_has_icon (theme, PACKAGE))
 		return;
-	}
 
 	if (gtk_icon_theme_has_icon (theme, "xpad-panel"))
-	{
 		docklet = gtk_status_icon_new_from_icon_name ("xpad-panel");
-	}
 	else
-	{
 	    docklet = gtk_status_icon_new_from_icon_name (PACKAGE);
-	}
 
-	if (docklet)
-	{
+	if (docklet) {
 		g_signal_connect (docklet, "activate", G_CALLBACK (xpad_tray_activate_cb), NULL);
 		g_signal_connect (docklet, "popup-menu", G_CALLBACK (xpad_tray_popup_menu_cb), NULL);
 	}
 }
 
-void
-xpad_tray_close (void)
+static void xpad_tray_close (XpadSettings *settings)
 {
 	if (docklet) {
 		g_object_unref (docklet);
@@ -91,8 +102,13 @@
 		gtk_widget_destroy(menu);
 }
 
+void xpad_tray_dispose (XpadSettings *settings) {
+	g_signal_handlers_disconnect_by_func(settings, xpad_tray_toggle, NULL);
+	xpad_tray_close (settings);
+}
+
 gboolean
-xpad_tray_is_open (void)
+xpad_tray_is_open ()
 {
 	if (docklet)
 		return gtk_status_icon_is_embedded (docklet);
@@ -123,7 +139,7 @@
 }
 
 static void 
-xpad_tray_show_hide_all (void)
+xpad_tray_show_hide_all ()
 {
 	GSList *pads = xpad_pad_group_get_pads (xpad_app_get_pad_group ());
 	/* find if any pad is visible */
@@ -208,10 +224,10 @@
 	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, gtk_status_icon_position_menu, icon, button, time);
 }
 
-static void
-xpad_tray_activate_cb (GtkStatusIcon *icon)
-{
-	switch (xpad_settings_get_tray_click_handler(xpad_global_settings))
+static void xpad_tray_activate_cb (GtkStatusIcon *icon, XpadSettings *settings) {
+	guint tray_click_configuration;
+	g_object_get (settings, "tray-click-configuration", &tray_click_configuration, NULL);
+	switch (tray_click_configuration)
 	{
 		case TOGGLE_SHOW_ALL:
 			xpad_tray_show_hide_all();
 
=== modified file 'src/xpad-tray.h'
--- src/xpad-tray.h	2008-09-21 00:03:40 +0000
+++ src/xpad-tray.h	2014-06-13 15:52:27 +0000
@@ -2,6 +2,7 @@
 
 Copyright (c) 2002 Jamis Buck
 Copyright (c) 2003-2007 Michael Terry
+Copyright (c) 2013-2014 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -22,10 +23,8 @@
 #ifndef __XPAD_TRAY_H__
 #define __XPAD_TRAY_H__
 
-#include <gtk/gtk.h>
-
-void     xpad_tray_open    (void);
-void     xpad_tray_close   (void);
-gboolean xpad_tray_is_open (void);
+void xpad_tray_init (XpadSettings *settings);
+void xpad_tray_dispose (XpadSettings *settings);
+gboolean xpad_tray_is_open ();
 
 #endif /* __TRAY_H__ */
 
=== modified file 'src/xpad-undo.c'
--- src/xpad-undo.c	2014-06-04 12:36:36 +0000
+++ src/xpad-undo.c	2014-06-13 15:52:27 +0000
@@ -2,6 +2,7 @@
 
 Copyright (c) 2001-2007 Michael Terry
 Copyright (c) 2010 Sergei Riaguzov
+Copyright (c) 2013-2014 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -19,12 +20,10 @@
 
 */
 
-
-#include "../config.h"
+#include <glib.h>
 #include <stdlib.h>
-#include <glib.h>
+#include "xpad-text-buffer.h"
 #include "xpad-undo.h"
-#include "xpad-text-buffer.h"
 
 struct XpadUndoPrivate
 {
 
=== modified file 'src/xpad-undo.h'
--- src/xpad-undo.h	2011-11-16 18:10:04 +0000
+++ src/xpad-undo.h	2014-06-13 15:52:27 +0000
@@ -2,6 +2,7 @@
 
 Copyright (c) 2001-2007 Michael Terry
 Copyright (c) 2010 Sergei Riaguzov
+Copyright (c) 2013-2014 Arthur Borsboom
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -22,9 +23,8 @@
 #ifndef __XPAD_UNDO_H__
 #define __XPAD_UNDO_H__
 
-#include <gtk/gtk.h>
+#include <glib.h>
 #include "xpad-text-buffer.h"
-#include "xpad-pad.h"
 
 G_BEGIN_DECLS
 
@@ -42,8 +42,6 @@
 struct XpadUndo
 {
 	GObject parent;
-
-	/* private */
 	XpadUndoPrivate *priv;
 };