Merge lp:~ghugesss/xpad/code_refactor into lp:xpad

[Sagar Ghuge]

https://wiki.gnome.org/Projects/GTK%2B/BestPractices

As our app is under GNOME so we need to follow the global coding style and also follow the header includes for .c files.

I have tested a code and working fine. As I know you will going to see lot of changes, so from onwards before accepting any patch from other contributors we ask him to also follow the standard coding style.

[Arthur Borsboom (arthurborsboom)]

Hi Sagar,

I went through most of the code changes.
Some things I dislike, some things I like.
Let's see if we can agree on the parts.
I summarize below what I would like to see different.
Feel free to disagree and explain,

1. Split and group changes (and merge requests)

When working with other developers, in general it is better to produce small changes.
And if the changes are bigger, than at least group the different changes together.
In this merge proposal there are many different changes, with some I agree (which I would like to merge) and some I disagree, which I would like to request fixing.

Splitting the changes also makes it easier to find issues introduced by changes. It also makes it easier to undo a change.

So my request is to split the different changes. Below I try to do a start, since I discuss each group of changes by subject.

2. Order of includes

Agree totally. I would like to merge this directly.

3. Improving head guards

I Agree totally. I would like to merge this directly.

4. Improving function declarations by G_BEGIN_DECLS and G_END_DECLS

I Agree totally. I would like to merge this directly.

5. Removal of function prototypes by reordering functions

I am in a split here.
I agree that it is nicer and easier to maintain if these are removed.
I disagree since it sometimes make readability and therefore maintainability harder.

So, only if the readability of the code stays more or less the same, I am in favor of this. Two examples:

I do like the removal of the forward declaration in xpad-pad-group.c

I dislike reading the xpad-pad.c and xpad-app.c from the bottom to the top (instead of the other way around), and therefore I don't like this to be changed.

6. Reformatting of function parameters, each parameter on a new line.

I strongly dislike this. In my opinion this makes reading the code much harder.

I guess it comes from the old-fashioned Linux kernel coding rule: 80 character limit. I used to dislike it and I still dislike it. These days almost each developer has a screen with at least 200 characters if not 500.

Only when the function declaration becomes extremely long, breaking this line in two or three pieces might be better.

7. Reformatting of function and return type on a new line.

I guess this is better. This might be my Java coding habit from the old days.

/* good */
static void
xpad_undo_class_init (XpadUndoClass *klass)

/* bad */
static void xpad_undo_class_init (XpadUndoClass *klass)

I prefer the one defined by me as 'bad', but I don't think it changes readability a lot and the code conforms to the best practice.

***

In general, best practices are good, but are not the law. In my opinion if you have a good reason to disagree with the best practice, it is okay.

For me, most of the disagreements above have to do with readability and maintainability. And since I (we) are maintaining the software, I like to do this as easy as possible.

Again, everything is open for discussing.

Nevertheless, I would like you to start with discussion point 1.
Then I can merge all the subjects we agree on and we can discuss the others after that.

Cheers,
Arthur.

review: Needs Fixing (code review no testing)

Unmerged revisions

705. By Sagar Ghuge on 2014-09-08

Typo corrected.

704. By Sagar Ghuge on 2014-09-08

Code refactoring done.

=== modified file 'src/fio.h'
--- src/fio.h	2014-06-15 10:02:50 +0000
+++ src/fio.h	2014-09-08 13:22:52 +0000
@@ -19,11 +19,13 @@
 
 */
 
-#ifndef _FIO_H_
-#define _FIO_H_
+#ifndef __FIO_H__
+#define __FIO_H__
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 gchar *fio_get_file (const gchar *name);
 gboolean fio_set_file (const gchar *name, const gchar *value);
 void fio_remove_file (const gchar *filename);
@@ -35,4 +37,6 @@
 
 gchar *fio_unique_name (const gchar *prefix);
 
-#endif /* _FIO_H_ */
+G_END_DECLS
+
+#endif /* __FIO_H__ */
 
=== modified file 'src/help.c'
--- src/help.c	2014-06-21 11:03:38 +0000
+++ src/help.c	2014-09-08 13:22:52 +0000
@@ -20,10 +20,12 @@
 */
 
 #include "../config.h"
+
 #include "help.h"
+#include "xpad-app.h"
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include "xpad-app.h"
+
 
 GtkWindow *help_window = NULL;
 
 
=== modified file 'src/help.h'
--- src/help.h	2014-06-10 20:55:56 +0000
+++ src/help.h	2014-09-08 13:22:52 +0000
@@ -19,9 +19,9 @@
 
 */
 
-#ifndef HELP_H
-#define HELP_H
+#ifndef __HELP_H__
+#define __HELP_H__
 
 void show_help (void);
 
-#endif
+#endif /* __HELP_H__ */
 
=== modified file 'src/prefix.h'
--- src/prefix.h	2008-09-21 00:03:40 +0000
+++ src/prefix.h	2014-09-08 13:22:52 +0000
@@ -26,8 +26,8 @@
  * to br_*", try renaming prefix.c to prefix.cpp
  */
 
-#ifndef _PREFIX_H_
-#define _PREFIX_H_
+#ifndef __PREFIX_H__
+#define __PREFIX_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -126,4 +126,4 @@
 }
 #endif /* __cplusplus */
 
-#endif /* _PREFIX_H_ */
+#endif /* __PREFIX_H__ */
 
=== modified file 'src/xpad-app.c'
--- src/xpad-app.c	2014-07-23 10:03:02 +0000
+++ src/xpad-app.c	2014-09-08 13:22:52 +0000
@@ -25,15 +25,8 @@
  Unfortunately, we lose portability... */
 
 #include "../config.h"
+
 #include "xpad-app.h"
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <glib/gstdio.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include "help.h"
 #include "xpad-pad.h"
 #include "xpad-pad-group.h"
@@ -41,6 +34,16 @@
 #include "xpad-session-manager.h"
 #include "xpad-tray.h"
 
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <glib/gstdio.h>
+
 /* Seems that some systems (sun-sparc-solaris2.8 at least), need the following three #defines. 
    These were provided by Alan Mizrahi <[e-mail]>.
 */
@@ -76,137 +79,36 @@
 static gint pads_loaded_on_start = 0;
 static XpadSettings *settings;
 
-static gboolean		process_local_args          (gint *argc, gchar **argv[]);
-static gboolean		process_remote_args         (gint *argc, gchar **argv[], gboolean have_gtk, XpadSettings *xpad_settings);
-
-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 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);
-static gboolean		xpad_app_open_proc_file     (void);
-
-static void
-xpad_app_init (int argc, char **argv)
-{
-	gboolean first_time;
-	gboolean have_gtk;
-
-	/* Set up support different languages */
-#ifdef ENABLE_NLS
-	bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
-	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-	textdomain (GETTEXT_PACKAGE);
-#endif
-
-	have_gtk = gtk_init_check (&argc, &argv);
-	xpad_argc = argc;
-	xpad_argv = argv;
-	output = stdout;
-	
-	/* Set up config directory. */
-	first_time = !config_dir_exists ();
-	config_dir = make_config_dir ();
-	
-	/* create master socket name */
-	server_filename = g_build_filename (xpad_app_get_config_dir (), "server", NULL);
-	
-	if (!have_gtk)
-	{
-		/* We don't have GTK+, but we can still do
-		   --version or --help and such.  Plus, we
-		   can pass commands to a remote instance. */
-		process_local_args (&xpad_argc, &xpad_argv);
-		if (!xpad_app_pass_args ())
-		{
-			process_remote_args (&xpad_argc, &xpad_argv, FALSE, settings);
-			fprintf (output, "%s\n", _("Xpad is a graphical program.  Please run it from your desktop."));
-		}
-		exit (0);
-	}
-	
-	g_set_application_name (_("Xpad"));
-	gdk_set_program_class (PACKAGE);
-
-	/* Set up program path. */
-	if (xpad_argc > 0)
-		program_path = g_find_program_in_path (xpad_argv[0]);
-	else
-		program_path = NULL;
-	
-	process_local_args (&xpad_argc, &xpad_argv);
-	
-	if (xpad_app_pass_args ())
-		exit (0);
-
-	/* Race condition here, between calls */
-	xpad_app_open_proc_file ();
-	
-	register_stock_icons ();
-	gtk_window_set_default_icon_name (PACKAGE);
-	
-	/* Read the Xpad configuration file from disk (if exists) */
-	settings = xpad_settings_new ();
-
-	/* Delay program startup, if user configured it, to wait for example for the loading of the systray. */
-	guint autostart_delay;
-	g_object_get (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, settings);
-	
-	xpad_tray_init (settings);
-	xpad_session_manager_init ();
-
-	/* Initialize Xpad-periodic module */
-	xpad_periodic_init ();
-	xpad_periodic_set_callback ("save-content", (XpadPeriodicFunc) xpad_pad_save_content);
-	xpad_periodic_set_callback ("save-info", (XpadPeriodicFunc) xpad_pad_save_info);
-	
-	/* load all pads */
-	pads_loaded_on_start = xpad_app_load_pads ();
-	if (pads_loaded_on_start == 0 && !option_new) {
-		if (!option_nonew) {
-			GtkWidget *pad = xpad_pad_new (pad_group, settings);
-			gtk_widget_show (pad);
-		}
-	}
-
-	/* Since all pads have been loaded, reprocess the show/hide/toggle option for all pads */
-	if (have_gtk && (option_show))
-		xpad_pad_group_show_all (pad_group);
-	if (have_gtk && (option_hide))
-		xpad_pad_group_close_all (pad_group);
-	if (have_gtk && option_toggle)
-		xpad_pad_group_toggle_hide (pad_group);
-	
-	g_idle_add ((GSourceFunc)xpad_app_first_idle_check, pad_group);
-	
-	if (first_time)
-		show_help ();
-	
-	g_free (server_filename);
-	server_filename = NULL;
-}
-
-gint main (gint argc, gchar **argv)
-{	xpad_app_init (argc, argv);
-
-	gtk_main ();
-	
-	return 0;
-}
+/**
+ * Here are the functions called when arguments are passed to us.
+ */
+
+static GOptionEntry local_options[] =
+{
+	{"version", 'v', 0, G_OPTION_ARG_NONE, &option_version, N_("Show version number and quit"), NULL},
+	{"no-new", 'N', 0, G_OPTION_ARG_NONE, &option_nonew, N_("Don't create a new pad on startup if no previous pads exist"), NULL},
+	{NULL}
+};
+
+static GOptionEntry remote_options[] =
+{
+	{"new", 'n', 0, G_OPTION_ARG_NONE, &option_new, N_("Create a new pad on startup even if pads already exist"), NULL},
+	{"hide", 'h', 0, G_OPTION_ARG_NONE, &option_hide, N_("Hide all pads"), NULL},
+	{"show", 's', 0, G_OPTION_ARG_NONE, &option_show, N_("Show all pads"), NULL},
+	{"toggle", 't', 0, G_OPTION_ARG_NONE, &option_toggle, N_("Toggle between show and hide all pads"), NULL},
+	{"new-from-file", 'f', 0, G_OPTION_ARG_FILENAME_ARRAY, &option_files, N_("Create a new pad with the contents of a file"), N_("FILE")},
+	{"quit", 'q', 0, G_OPTION_ARG_NONE, &option_quit, N_("Close all pads"), NULL},
+	{"sm-client-id", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &option_smid, NULL, NULL},
+	{NULL}
+};
 
 /* parent and secondary may be NULL.
  * Returns when user dismisses error.
  */
 void
-xpad_app_error (GtkWindow *parent, const gchar *primary, const gchar *secondary)
+xpad_app_error (GtkWindow   *parent,
+	        const gchar *primary,
+	        const gchar *secondary)
 {
 	GtkWidget *dialog;
 	
@@ -215,7 +117,7 @@
 	
 	g_printerr ("%s\n", primary);
 	
-	dialog = xpad_app_alert_dialog (parent, "dialog-error", primary, secondary);	
+	dialog = xpad_app_alert_dialog (parent, "dialog-error", primary, secondary);
 	gtk_dialog_add_buttons (GTK_DIALOG (dialog), _("_Ok"), GTK_RESPONSE_OK, NULL);
 	gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
@@ -349,7 +251,10 @@
  * secondary text of 'secondary'.  No buttons are added.
  */
 GtkWidget *
-xpad_app_alert_dialog (GtkWindow *parent, const gchar *icon_name, const gchar *primary, const gchar *secondary)
+xpad_app_alert_dialog (GtkWindow   *parent,
+		       const gchar *icon_name,
+		       const gchar *primary,
+		       const gchar *secondary)
 {
 	GtkWidget *dialog, *hbox, *image, *label;
 	gchar *buf;
@@ -360,7 +265,7 @@
 	gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
 
 	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
-	image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_DIALOG);	
+	image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_DIALOG);
 	label = gtk_label_new (NULL);
 	
 	if (secondary)
@@ -440,13 +345,13 @@
 }
 
 static void
-xpad_app_pad_added (XpadPadGroup *group, XpadPad *pad)
+xpad_app_pad_added (XpadPadGroup *group,
+		    XpadPad      *pad)
 {
 	g_signal_connect_swapped (pad, "closed", G_CALLBACK (xpad_app_quit_if_no_pads), group);
 	g_signal_connect_swapped (pad, "destroy", G_CALLBACK (xpad_app_quit_if_no_pads), group);
 }
 
-
 /* Scans config directory for pad files and loads them. */
 static gint
 xpad_app_load_pads (void)
@@ -499,7 +404,9 @@
 puts allocated string in dest, and returns size
 */
 static guint
-args_to_string (int argc, char **argv, char **dest)
+args_to_string (int  argc,
+	        char **argv,
+	        char **dest)
 {
 	gint i = 0;
 	guint size = 0;
@@ -541,7 +448,8 @@
 returns number of strings in newly allocated argv
 */
 static guint
-string_to_args (const char *string, char ***argv)
+string_to_args (const char *string,
+	        char       ***argv)
 {
 	guint num, i;
 	const gchar *tmp;
@@ -589,6 +497,82 @@
 	return num;
 }
 
+static gboolean
+process_remote_args (gint         *argc,
+		     gchar        **argv[],
+		     gboolean     have_gtk,
+		     XpadSettings *xpad_settings)
+{
+	GError *error = NULL;
+	GOptionContext *context;
+	
+	option_new = FALSE;
+	option_files = NULL;
+	option_quit = FALSE;
+	option_smid = NULL;
+	option_hide = FALSE;
+	option_show = FALSE;
+	option_toggle = FALSE;
+	
+	context = g_option_context_new (NULL);
+	g_option_context_set_ignore_unknown_options (context, TRUE);
+	g_option_context_set_help_enabled (context, FALSE);
+	g_option_context_add_main_entries (context, remote_options, GETTEXT_PACKAGE);
+	if (g_option_context_parse (context, argc, argv, &error))
+	{
+		if (have_gtk && option_smid)
+			xpad_session_manager_set_id (option_smid);
+		
+		if (!option_new)
+			g_object_get (settings, "autostart-new-pad", &option_new, NULL);
+
+		if (have_gtk && option_new)
+		{
+			GtkWidget *pad = xpad_pad_new (pad_group, settings);
+			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 (have_gtk && option_files)
+		{
+			int i;
+			for (i = 0; option_files[i]; i++)
+			{
+				GtkWidget *pad = xpad_pad_new_from_file (pad_group, settings, option_files[i]);
+				if (pad)
+					gtk_widget_show (pad);
+			}
+		}
+		
+		if (option_quit)
+		{
+			if (have_gtk && gtk_main_level () > 0)
+				xpad_app_quit ();
+			else
+				exit (0);
+		}
+	}
+	else
+	{
+		fprintf (output, "%s\n", error->message);
+		/* Don't quit.  Bad options passed to the main xpad program by other
+		   iterations shouldn't close the main one. */
+	}
+	
+	g_option_context_free (context);
+	
+	return(option_new || option_quit || option_smid || option_files ||
+	       option_hide || option_show || option_toggle);
+}
+
 /* This reads a line from the proc file.  This line will contain arguments to process. */
 static void
 xpad_app_read_from_proc_file (void)
@@ -661,7 +645,9 @@
 }
 
 static gboolean
-can_read_from_server_fd (GIOChannel *source, GIOCondition condition, gpointer data)
+can_read_from_server_fd (GIOChannel   *source,
+		         GIOCondition condition,
+		         gpointer     data)
 {
 	/* A dirty way to silence the compiler for these unused variables. */
 	(void) source;
@@ -702,7 +688,6 @@
 	return TRUE;
 }
 
-
 static gboolean
 xpad_app_pass_args (void)
 {
@@ -770,31 +755,9 @@
 	return connected;
 }
 
-/**
- * Here are the functions called when arguments are passed to us.
- */
-
-static GOptionEntry local_options[] =
-{
-	{"version", 'v', 0, G_OPTION_ARG_NONE, &option_version, N_("Show version number and quit"), NULL},
-	{"no-new", 'N', 0, G_OPTION_ARG_NONE, &option_nonew, N_("Don't create a new pad on startup if no previous pads exist"), NULL},
-	{NULL}
-};
-
-static GOptionEntry remote_options[] =
-{
-	{"new", 'n', 0, G_OPTION_ARG_NONE, &option_new, N_("Create a new pad on startup even if pads already exist"), NULL},
-	{"hide", 'h', 0, G_OPTION_ARG_NONE, &option_hide, N_("Hide all pads"), NULL},
-	{"show", 's', 0, G_OPTION_ARG_NONE, &option_show, N_("Show all pads"), NULL},
-	{"toggle", 't', 0, G_OPTION_ARG_NONE, &option_toggle, N_("Toggle between show and hide all pads"), NULL},
-	{"new-from-file", 'f', 0, G_OPTION_ARG_FILENAME_ARRAY, &option_files, N_("Create a new pad with the contents of a file"), N_("FILE")},
-	{"quit", 'q', 0, G_OPTION_ARG_NONE, &option_quit, N_("Close all pads"), NULL},
-	{"sm-client-id", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &option_smid, NULL, NULL},
-	{NULL}
-};
-
 static gboolean
-process_local_args (gint *argc, gchar **argv[])
+process_local_args (gint  *argc,
+		    gchar **argv[])
 {
 	GError *error = NULL;
 	GOptionContext *context;
@@ -836,75 +799,119 @@
 	return (option_version || option_nonew);
 }
 
-static gboolean
-process_remote_args (gint *argc, gchar **argv[], gboolean have_gtk, XpadSettings *xpad_settings)
+static void
+xpad_app_init (int  argc,
+	       char **argv)
 {
-	GError *error = NULL;
-	GOptionContext *context;
-	
-	option_new = FALSE;
-	option_files = NULL;
-	option_quit = FALSE;
-	option_smid = NULL;
-	option_hide = FALSE;
-	option_show = FALSE;
-	option_toggle = FALSE;
-	
-	context = g_option_context_new (NULL);
-	g_option_context_set_ignore_unknown_options (context, TRUE);
-	g_option_context_set_help_enabled (context, FALSE);
-	g_option_context_add_main_entries (context, remote_options, GETTEXT_PACKAGE);
-	if (g_option_context_parse (context, argc, argv, &error))
+	gboolean first_time;
+	gboolean have_gtk;
+
+	/* Set up support different languages */
+#ifdef ENABLE_NLS
+	bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
+#endif
+
+	have_gtk = gtk_init_check (&argc, &argv);
+	xpad_argc = argc;
+	xpad_argv = argv;
+	output = stdout;
+	
+	/* Set up config directory. */
+	first_time = !config_dir_exists ();
+	config_dir = make_config_dir ();
+	
+	/* create master socket name */
+	server_filename = g_build_filename (xpad_app_get_config_dir (), "server", NULL);
+	
+	if (!have_gtk)
 	{
-		if (have_gtk && option_smid)
-			xpad_session_manager_set_id (option_smid);
-		
-		if (!option_new)
-			g_object_get (settings, "autostart-new-pad", &option_new, NULL);
-
-		if (have_gtk && option_new)
+		/* We don't have GTK+, but we can still do
+		   --version or --help and such.  Plus, we
+		   can pass commands to a remote instance. */
+		process_local_args (&xpad_argc, &xpad_argv);
+		if (!xpad_app_pass_args ())
 		{
+			process_remote_args (&xpad_argc, &xpad_argv, FALSE, settings);
+			fprintf (output, "%s\n", _("Xpad is a graphical program.  Please run it from your desktop."));
+		}
+		exit (0);
+	}
+	
+	g_set_application_name (_("Xpad"));
+	gdk_set_program_class (PACKAGE);
+
+	/* Set up program path. */
+	if (xpad_argc > 0)
+		program_path = g_find_program_in_path (xpad_argv[0]);
+	else
+		program_path = NULL;
+	
+	process_local_args (&xpad_argc, &xpad_argv);
+	
+	if (xpad_app_pass_args ())
+		exit (0);
+
+	/* Race condition here, between calls */
+	xpad_app_open_proc_file ();
+	
+	register_stock_icons ();
+	gtk_window_set_default_icon_name (PACKAGE);
+	
+	/* Read the Xpad configuration file from disk (if exists) */
+	settings = xpad_settings_new ();
+
+	/* Delay program startup, if user configured it, to wait for example for the loading of the systray. */
+	guint autostart_delay;
+	g_object_get (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, settings);
+	
+	xpad_tray_init (settings);
+	xpad_session_manager_init ();
+
+	/* Initialize Xpad-periodic module */
+	xpad_periodic_init ();
+	xpad_periodic_set_callback ("save-content", (XpadPeriodicFunc) xpad_pad_save_content);
+	xpad_periodic_set_callback ("save-info", (XpadPeriodicFunc) xpad_pad_save_info);
+	
+	/* load all pads */
+	pads_loaded_on_start = xpad_app_load_pads ();
+	if (pads_loaded_on_start == 0 && !option_new) {
+		if (!option_nonew) {
 			GtkWidget *pad = xpad_pad_new (pad_group, settings);
 			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 (have_gtk && option_files)
-		{
-			int i;
-			for (i = 0; option_files[i]; i++)
-			{
-				GtkWidget *pad = xpad_pad_new_from_file (pad_group, settings, option_files[i]);
-				if (pad)
-					gtk_widget_show (pad);
-			}
-		}
-		
-		if (option_quit)
-		{
-			if (have_gtk && gtk_main_level () > 0)
-				xpad_app_quit ();
-			else
-				exit (0);
-		}
-	}
-	else
-	{
-		fprintf (output, "%s\n", error->message);
-		/* Don't quit.  Bad options passed to the main xpad program by other
-		   iterations shouldn't close the main one. */
-	}
-	
-	g_option_context_free (context);
-	
-	return(option_new || option_quit || option_smid || option_files ||
-	       option_hide || option_show || option_toggle);
+	}
+
+	/* Since all pads have been loaded, reprocess the show/hide/toggle option for all pads */
+	if (have_gtk && (option_show))
+		xpad_pad_group_show_all (pad_group);
+	if (have_gtk && (option_hide))
+		xpad_pad_group_close_all (pad_group);
+	if (have_gtk && option_toggle)
+		xpad_pad_group_toggle_hide (pad_group);
+	
+	g_idle_add ((GSourceFunc)xpad_app_first_idle_check, pad_group);
+	
+	if (first_time)
+		show_help ();
+	
+	g_free (server_filename);
+	server_filename = NULL;
+}
+
+gint main (gint  argc,
+	   gchar **argv)
+{
+	xpad_app_init (argc, argv);
+
+	gtk_main ();
+	
+	return 0;
 }
 
=== modified file 'src/xpad-grip-tool-item.c'
--- src/xpad-grip-tool-item.c	2014-06-17 18:22:49 +0000
+++ src/xpad-grip-tool-item.c	2014-09-08 13:22:52 +0000
@@ -20,6 +20,7 @@
 */
 
 #include "../config.h"
+
 #include "xpad-grip-tool-item.h"
 
 struct XpadGripToolItemPrivate
@@ -29,45 +30,9 @@
 
 G_DEFINE_TYPE_WITH_PRIVATE(XpadGripToolItem, xpad_grip_tool_item, GTK_TYPE_TOOL_ITEM)
 
-static gboolean xpad_grip_tool_item_event_box_draw (GtkWidget *widget, cairo_t *cr);
-static void xpad_grip_tool_item_event_box_realize (GtkWidget *widget);
-static gboolean xpad_grip_tool_item_button_pressed_event (GtkWidget *widget, GdkEventButton *event);
-
-GtkToolItem *
-xpad_grip_tool_item_new (void)
-{
-	return GTK_TOOL_ITEM (g_object_new (XPAD_TYPE_GRIP_TOOL_ITEM, NULL));
-}
-
-static void
-xpad_grip_tool_item_class_init (XpadGripToolItemClass *klass)
-{
-}
-
-static void
-xpad_grip_tool_item_init (XpadGripToolItem *grip)
-{
-	GtkWidget *alignment;
-	gboolean right;
-	
-	grip->priv = xpad_grip_tool_item_get_instance_private(grip);
-	
-	grip->priv->drawbox = gtk_drawing_area_new ();
-	gtk_widget_add_events (grip->priv->drawbox, GDK_BUTTON_PRESS_MASK | GDK_EXPOSURE_MASK);
-	g_signal_connect (grip->priv->drawbox, "button-press-event", G_CALLBACK (xpad_grip_tool_item_button_pressed_event), NULL);
-	g_signal_connect (grip->priv->drawbox, "realize", G_CALLBACK (xpad_grip_tool_item_event_box_realize), NULL);
-	g_signal_connect (grip->priv->drawbox, "draw", G_CALLBACK (xpad_grip_tool_item_event_box_draw), NULL);
-	gtk_widget_set_size_request (grip->priv->drawbox, 18, 18);
-	
-	right =	gtk_widget_get_direction (grip->priv->drawbox) == GTK_TEXT_DIR_LTR;
-	alignment = gtk_alignment_new (right ? 1 : 0, 1, 0, 0);
-	
-	gtk_container_add (GTK_CONTAINER (alignment), grip->priv->drawbox);
-	gtk_container_add (GTK_CONTAINER (grip), alignment);
-}
-
 static gboolean
-xpad_grip_tool_item_button_pressed_event (GtkWidget *widget, GdkEventButton *event)
+xpad_grip_tool_item_button_pressed_event (GtkWidget      *widget,
+                                          GdkEventButton *event)
 {
 	if (event->button == 1)
 	{
@@ -105,7 +70,8 @@
 }
 
 static gboolean
-xpad_grip_tool_item_event_box_draw (GtkWidget *widget, cairo_t *cr)
+xpad_grip_tool_item_event_box_draw (GtkWidget *widget,
+                                    cairo_t   *cr)
 {
 	gtk_render_handle(gtk_widget_get_style_context(widget),
 			cr,
@@ -115,3 +81,36 @@
 	
 	return FALSE;
 }
+
+static void
+xpad_grip_tool_item_class_init (XpadGripToolItemClass *klass)
+{
+}
+
+static void
+xpad_grip_tool_item_init (XpadGripToolItem *grip)
+{
+	GtkWidget *alignment;
+	gboolean right;
+	
+	grip->priv = xpad_grip_tool_item_get_instance_private(grip);
+	
+	grip->priv->drawbox = gtk_drawing_area_new ();
+	gtk_widget_add_events (grip->priv->drawbox, GDK_BUTTON_PRESS_MASK | GDK_EXPOSURE_MASK);
+	g_signal_connect (grip->priv->drawbox, "button-press-event", G_CALLBACK (xpad_grip_tool_item_button_pressed_event), NULL);
+	g_signal_connect (grip->priv->drawbox, "realize", G_CALLBACK (xpad_grip_tool_item_event_box_realize), NULL);
+	g_signal_connect (grip->priv->drawbox, "draw", G_CALLBACK (xpad_grip_tool_item_event_box_draw), NULL);
+	gtk_widget_set_size_request (grip->priv->drawbox, 18, 18);
+	
+	right =	gtk_widget_get_direction (grip->priv->drawbox) == GTK_TEXT_DIR_LTR;
+	alignment = gtk_alignment_new (right ? 1 : 0, 1, 0, 0);
+	
+	gtk_container_add (GTK_CONTAINER (alignment), grip->priv->drawbox);
+	gtk_container_add (GTK_CONTAINER (grip), alignment);
+}
+
+GtkToolItem *
+xpad_grip_tool_item_new (void)
+{
+	return GTK_TOOL_ITEM (g_object_new (XPAD_TYPE_GRIP_TOOL_ITEM, NULL));
+}
 
=== modified file 'src/xpad-pad-group.c'
--- src/xpad-pad-group.c	2014-07-23 10:03:02 +0000
+++ src/xpad-pad-group.c	2014-09-08 13:22:52 +0000
@@ -21,6 +21,7 @@
 */
 
 #include "../config.h"
+
 #include "xpad-pad-group.h"
 #include "xpad-pad.h"
 
@@ -31,8 +32,6 @@
 
 G_DEFINE_TYPE_WITH_PRIVATE (XpadPadGroup, xpad_pad_group, G_TYPE_OBJECT)
 
-static void xpad_pad_group_save_unsaved_all (XpadPadGroup *group);
-
 enum {
 	PROP_0
 };
@@ -75,7 +74,7 @@
 		              G_TYPE_NONE,
 		              1,
 		              GTK_TYPE_WIDGET);
-	
+
 	signals[PAD_REMOVED] =
 		g_signal_new ("pad_removed",
 		              G_OBJECT_CLASS_TYPE (object_class),
@@ -96,10 +95,11 @@
 
 /* Add a pad to this group */
 void
-xpad_pad_group_add (XpadPadGroup *group, GtkWidget *pad)
+xpad_pad_group_add (XpadPadGroup *group,
+		    GtkWidget    *pad)
 {
 	g_object_ref(pad);
-	
+
 	group->priv->pads = g_slist_append (group->priv->pads, XPAD_PAD (pad));
 	g_signal_connect_swapped (pad, "destroy", G_CALLBACK (xpad_pad_group_remove), group);
 	
@@ -108,7 +108,8 @@
 
 /* Remove a pad from this group */
 void
-xpad_pad_group_remove (XpadPadGroup *group, GtkWidget *pad)
+xpad_pad_group_remove (XpadPadGroup *group,
+		       GtkWidget    *pad)
 {
 	group->priv->pads = g_slist_remove (group->priv->pads, XPAD_PAD (pad));
 	g_object_unref(pad);
@@ -117,6 +118,13 @@
 	g_signal_emit (group, signals[PAD_REMOVED], 0, pad);
 }
 
+static void
+xpad_pad_group_save_unsaved_all (XpadPadGroup *group)
+{
+	if (group)
+		g_slist_foreach (group->priv->pads, (GFunc) xpad_pad_save_unsaved, NULL);
+}
+
 /* Delete all the current pads in the group */
 void
 xpad_pad_group_destroy_pads (XpadPadGroup *group)
@@ -146,14 +154,10 @@
 		}
 		g_slist_free(i);
 	}
+
 	return num;
 }
 
-static void xpad_pad_group_save_unsaved_all (XpadPadGroup *group) {
-	if (group)
-		g_slist_foreach (group->priv->pads, (GFunc) xpad_pad_save_unsaved, NULL);
-}
-
 void
 xpad_pad_group_close_all (XpadPadGroup *group)
 {
 
=== modified file 'src/xpad-pad-properties.c'
--- src/xpad-pad-properties.c	2014-06-19 12:35:19 +0000
+++ src/xpad-pad-properties.c	2014-09-08 13:22:52 +0000
@@ -21,44 +21,35 @@
 
 #include "../config.h"
 #include "xpad-pad-properties.h"
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
 struct XpadPadPropertiesPrivate 
 {
 	GtkWidget *fontcheck;
 	GtkWidget *colorcheck;
 	GtkWidget *colorbox;
-	
+
 	GtkWidget *textbutton;
 	GdkRGBA texttmp;
-	
+
 	GtkWidget *backbutton;
 	GdkRGBA backtmp;
-	
+
 	GtkWidget *fontbutton;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (XpadPadProperties, xpad_pad_properties, GTK_TYPE_DIALOG)
 
-static void xpad_pad_properties_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void xpad_pad_properties_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void xpad_pad_properties_response (GtkDialog *dialog, gint response);
-static void change_color_check (GtkToggleButton *button, XpadPadProperties *prop);
-static void change_font_check (GtkToggleButton *button, XpadPadProperties *prop);
-static void change_text_color (XpadPadProperties *prop);
-static void change_back_color (XpadPadProperties *prop);
-static void change_font_face (XpadPadProperties *prop);
-
 enum
 {
-  PROP_0,
-  PROP_FOLLOW_FONT_STYLE,
-  PROP_FOLLOW_COLOR_STYLE,
-  PROP_BACK_COLOR,
-  PROP_TEXT_COLOR,
-  PROP_FONTNAME,
-  N_PROPERTIES
+	PROP_0,
+	PROP_FOLLOW_FONT_STYLE,
+	PROP_FOLLOW_COLOR_STYLE,
+	PROP_BACK_COLOR,
+	PROP_TEXT_COLOR,
+	PROP_FONTNAME,
+	N_PROPERTIES
 };
 
 static GParamSpec *obj_prop[N_PROPERTIES] = { NULL, };
@@ -69,6 +60,125 @@
 	return g_object_new (XPAD_TYPE_PAD_PROPERTIES, NULL);
 }
 
+
+static void
+xpad_pad_properties_response (GtkDialog *dialog,
+			      gint      response)
+{
+	if (response == GTK_RESPONSE_CLOSE)
+		gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static void
+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");
+}
+
+static void
+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");
+}
+
+static void
+change_text_color (XpadPadProperties *prop)
+{
+	g_object_notify (G_OBJECT (prop), "text-color");
+}
+
+static void
+change_back_color (XpadPadProperties *prop)
+{
+	g_object_notify (G_OBJECT (prop), "back-color");
+}
+
+static void
+change_font_face (XpadPadProperties *prop)
+{
+	g_object_notify (G_OBJECT (prop), "fontname");
+}
+
+static void
+xpad_pad_properties_set_property (GObject      *object,
+				  guint        prop_id,
+				  const GValue *value,
+				  GParamSpec   *pspec)
+{
+	XpadPadProperties *prop = XPAD_PAD_PROPERTIES (object);
+
+	switch (prop_id)
+	{
+	case PROP_FOLLOW_FONT_STYLE:
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prop->priv->fontcheck), !g_value_get_boolean (value));
+		break;
+
+	case PROP_FOLLOW_COLOR_STYLE:
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prop->priv->colorcheck), !g_value_get_boolean (value));
+		break;
+
+	case PROP_BACK_COLOR:
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (prop->priv->backbutton), g_value_get_boxed (value));
+		break;
+
+	case PROP_TEXT_COLOR:
+		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (prop->priv->textbutton), g_value_get_boxed (value));
+		break;
+
+	case PROP_FONTNAME:
+		gtk_font_button_set_font_name (GTK_FONT_BUTTON (prop->priv->fontbutton), g_value_get_string (value));
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+xpad_pad_properties_get_property (GObject    *object,
+				  guint      prop_id,
+				  GValue     *value,
+				  GParamSpec *pspec)
+{
+	XpadPadProperties *prop = XPAD_PAD_PROPERTIES (object);
+
+	switch (prop_id)
+	{
+	case PROP_FOLLOW_FONT_STYLE:
+		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, !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prop->priv->colorcheck)));
+		break;
+
+	case PROP_BACK_COLOR:
+		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:
+		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, gtk_font_button_get_font_name (GTK_FONT_BUTTON (prop->priv->fontbutton)));
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
 static void
 xpad_pad_properties_class_init (XpadPadPropertiesClass *klass)
 {
@@ -93,9 +203,9 @@
 	GtkBox *hbox, *font_hbox, *vbox, *appearance_vbox;
 	GtkWidget *font_radio, *color_radio, *label, *appearance_frame, *alignment;
 	GtkSizeGroup *size_group_labels = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-	
+
 	prop->priv = xpad_pad_properties_get_instance_private (prop);
-	
+
 	text = g_strconcat ("<b>", _("Appearance"), "</b>", NULL);
 	label = GTK_WIDGET (g_object_new (GTK_TYPE_LABEL,
 		"label", text,
@@ -119,7 +229,7 @@
 		"child", alignment,
 		"border-width", 6,
 		NULL));
-	
+
 	prop->priv->fontbutton = gtk_font_button_new ();
 	prop->priv->textbutton = gtk_color_button_new ();
 	prop->priv->backbutton = gtk_color_button_new ();
@@ -133,7 +243,7 @@
 
 	gtk_box_pack_start (font_hbox, prop->priv->fontcheck, FALSE, FALSE, 0);
 	gtk_box_pack_start (font_hbox, prop->priv->fontbutton, TRUE, TRUE, 0);
-	
+
 	prop->priv->colorbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 
 	hbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12));
@@ -143,7 +253,7 @@
 	gtk_box_pack_start (hbox, label, FALSE, FALSE, 0);
 	gtk_box_pack_start (hbox, prop->priv->textbutton, TRUE, TRUE, 0);
 	g_object_set (G_OBJECT (prop->priv->colorbox), "child", hbox, NULL);
-	
+
 	hbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12));
 	label = gtk_label_new_with_mnemonic (_("Background:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
@@ -151,22 +261,22 @@
 	gtk_box_pack_start (hbox, label, FALSE, FALSE, 0);
 	gtk_box_pack_start (hbox, prop->priv->backbutton, TRUE, TRUE, 0);
 	g_object_set (G_OBJECT (prop->priv->colorbox), "child", hbox, NULL);
-	
+
 	alignment = gtk_alignment_new (1, 1, 1, 1);
 	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0);
 	gtk_container_add (GTK_CONTAINER (alignment), prop->priv->colorbox);
-	
+
 	gtk_dialog_add_button (GTK_DIALOG (prop), "gtk-close", GTK_RESPONSE_CLOSE);
 	gtk_dialog_set_default_response (GTK_DIALOG (prop), GTK_RESPONSE_CLOSE);
 	g_signal_connect (prop, "response", G_CALLBACK (xpad_pad_properties_response), NULL);
-	
+
 	gtk_color_chooser_set_use_alpha (GTK_COLOR_CHOOSER (prop->priv->textbutton), FALSE);
 	gtk_color_chooser_set_use_alpha (GTK_COLOR_CHOOSER (prop->priv->backbutton), TRUE);
-	
+
 	gtk_color_button_set_title (GTK_COLOR_BUTTON (prop->priv->textbutton), _("Set Foreground Color"));
 	gtk_color_button_set_title (GTK_COLOR_BUTTON (prop->priv->backbutton), _("Set Background Color"));
 	gtk_font_button_set_title (GTK_FONT_BUTTON (prop->priv->fontbutton), _("Set Font"));
-	
+
 	vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 6));
 	hbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12));
 
@@ -180,131 +290,22 @@
 	gtk_box_pack_start (vbox, prop->priv->colorcheck, FALSE, FALSE, 0);
 	gtk_box_pack_start (vbox, alignment, FALSE, FALSE, 0);
 	gtk_box_pack_start (appearance_vbox, GTK_WIDGET (vbox), FALSE, FALSE, 0);
-	
+
 	g_signal_connect (prop->priv->fontcheck, "toggled", G_CALLBACK (change_font_check), prop);
 	g_signal_connect (prop->priv->colorcheck, "toggled", G_CALLBACK (change_color_check), prop);
 	g_signal_connect_swapped (prop->priv->fontbutton, "font-set", G_CALLBACK (change_font_face), prop);
 	g_signal_connect_swapped (prop->priv->textbutton, "color-set", G_CALLBACK (change_text_color), prop);
 	g_signal_connect_swapped (prop->priv->backbutton, "color-set", G_CALLBACK (change_back_color), prop);
-	
+
 	/* Setup initial state, which should never be seen, but just in case client doesn't set them itself, we'll be consistent. */
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (font_radio), TRUE);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (color_radio), TRUE);
 	gtk_widget_set_sensitive (prop->priv->colorbox, FALSE);
 	gtk_widget_set_sensitive (prop->priv->fontbutton, FALSE);
-	
+
 	g_object_unref (size_group_labels);
-	
+
 	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (prop))), appearance_frame);
 
 	gtk_widget_show_all (gtk_dialog_get_content_area (GTK_DIALOG (prop)));
 }
-
-static void
-xpad_pad_properties_response (GtkDialog *dialog, gint response)
-{
-	if (response == GTK_RESPONSE_CLOSE)
-		gtk_widget_destroy (GTK_WIDGET (dialog));
-}
-
-static void
-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");
-}
-
-static void
-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");
-}
-
-static void
-change_text_color (XpadPadProperties *prop)
-{
-	g_object_notify (G_OBJECT (prop), "text-color");
-}
-
-static void
-change_back_color (XpadPadProperties *prop)
-{
-	g_object_notify (G_OBJECT (prop), "back-color");
-}
-
-static void
-change_font_face (XpadPadProperties *prop)
-{
-	g_object_notify (G_OBJECT (prop), "fontname");
-}
-
-static void
-xpad_pad_properties_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-	XpadPadProperties *prop = XPAD_PAD_PROPERTIES (object);
-	
-	switch (prop_id)
-	{
-	case PROP_FOLLOW_FONT_STYLE:
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prop->priv->fontcheck), !g_value_get_boolean (value));
-		break;
-	
-	case PROP_FOLLOW_COLOR_STYLE:
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prop->priv->colorcheck), !g_value_get_boolean (value));
-		break;
-	
-	case PROP_BACK_COLOR:
-		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (prop->priv->backbutton), g_value_get_boxed (value));
-		break;
-	
-	case PROP_TEXT_COLOR:
-		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (prop->priv->textbutton), g_value_get_boxed (value));
-		break;
-	
-	case PROP_FONTNAME:
-		gtk_font_button_set_font_name (GTK_FONT_BUTTON (prop->priv->fontbutton), g_value_get_string (value));
-		break;
-	
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-xpad_pad_properties_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-	XpadPadProperties *prop = XPAD_PAD_PROPERTIES (object);
-	
-	switch (prop_id)
-	{
-	case PROP_FOLLOW_FONT_STYLE:
-		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, !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prop->priv->colorcheck)));
-		break;
-	
-	case PROP_BACK_COLOR:
-		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:
-		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, gtk_font_button_get_font_name (GTK_FONT_BUTTON (prop->priv->fontbutton)));
-		break;
-	
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
 
=== modified file 'src/xpad-pad.c'
--- src/xpad-pad.c	2014-08-30 18:36:57 +0000
+++ src/xpad-pad.c	2014-09-08 13:22:52 +0000
@@ -24,9 +24,8 @@
 */
 
 #include "../config.h"
+
 #include "xpad-pad.h"
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
 #include "fio.h"
 #include "help.h"
 #include "xpad-app.h"
@@ -38,6 +37,9 @@
 #include "xpad-toolbar.h"
 #include "xpad-tray.h"
 
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+
 struct XpadPadPrivate
 {
 	/* saved values */
@@ -97,509 +99,105 @@
 static GParamSpec *obj_prop[N_PROPERTIES] = { NULL, };
 static guint signals[LAST_SIGNAL] = { 0 };
 
-static void xpad_pad_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void xpad_pad_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void xpad_pad_constructed (GObject *object);
-static void xpad_pad_dispose (GObject *object);
-static void xpad_pad_finalize (GObject *object);
-static void xpad_pad_load_info (XpadPad *pad, gboolean *show);
-static GtkWidget *menu_get_popup_highlight (XpadPad *pad, GtkAccelGroup *accel_group);
-static GtkWidget *menu_get_popup_no_highlight (XpadPad *pad, GtkAccelGroup *accel_group);
-static void xpad_pad_show (XpadPad *pad);
-static gboolean xpad_pad_configure_event (XpadPad *pad, GdkEventConfigure *event);
-static gboolean xpad_pad_toolbar_size_allocate (XpadPad *pad, GtkAllocation *event);
-static gboolean xpad_pad_delete_event (XpadPad *pad, GdkEvent *event);
-static gboolean xpad_pad_popup_menu (XpadPad *pad);
-static void menu_popup (XpadPad *pad);
-static void menu_popdown (XpadPad *pad);
-static gboolean xpad_pad_button_press_event (XpadPad *pad, GdkEventButton *event);
-static void xpad_pad_text_changed (XpadPad *pad, GtkTextBuffer *buffer);
-static void xpad_pad_notify_has_scrollbar (XpadPad *pad);
-static void xpad_pad_notify_has_decorations (XpadPad *pad);
-static void xpad_pad_notify_has_toolbar (XpadPad *pad);
-static void xpad_pad_notify_autohide_toolbar (XpadPad *pad);
-static void xpad_pad_hide_toolbar (XpadPad *pad);
-static void xpad_pad_show_toolbar (XpadPad *pad);
-static void xpad_pad_popup (XpadPad *pad, GdkEventButton *event);
-static void xpad_pad_spawn (XpadPad *pad);
-static void xpad_pad_clear (XpadPad *pad);
-static void xpad_pad_undo (XpadPad *pad);
-static void xpad_pad_redo (XpadPad *pad);
-static void xpad_pad_cut (XpadPad *pad);
-static void xpad_pad_copy (XpadPad *pad);
-static void xpad_pad_paste (XpadPad *pad);
-static void xpad_pad_delete (XpadPad *pad);
-static void xpad_pad_open_properties (XpadPad *pad);
-static void xpad_pad_open_preferences (XpadPad *pad);
-static void xpad_pad_close_all (XpadPad *pad);
-static void xpad_pad_sync_title (XpadPad *pad);
-static gboolean xpad_pad_leave_notify_event (GtkWidget *pad, GdkEventCrossing *event);
-static gboolean xpad_pad_enter_notify_event (GtkWidget *pad, GdkEventCrossing *event);
-
 /* Create a new empty pad. */
 GtkWidget *
-xpad_pad_new (XpadPadGroup *group, XpadSettings *settings)
+xpad_pad_new (XpadPadGroup *group,
+	      XpadSettings *settings)
 {
 	return GTK_WIDGET (g_object_new (XPAD_TYPE_PAD, "group", group, "settings", settings, NULL));
 }
 
-/* Create a new pad based on the provided info-xxxxx file from the config directory and return this pad */
-GtkWidget *
-xpad_pad_new_with_info (XpadPadGroup *group, XpadSettings *settings, const gchar *info_filename, gboolean *show)
-{
-	GtkWidget *pad = xpad_pad_new (group, settings);
-	
-	XPAD_PAD (pad)->priv->infoname = g_strdup (info_filename);
-	xpad_pad_load_info (XPAD_PAD (pad), show);
-	xpad_pad_load_content (XPAD_PAD (pad));
-	gtk_window_set_role (GTK_WINDOW (pad), XPAD_PAD (pad)->priv->infoname);
-	
-	return pad;
-}
-
-/* Create a new pad based on the provided filename from the command line */
-GtkWidget *
-xpad_pad_new_from_file (XpadPadGroup *group, XpadSettings *settings, const gchar *filename)
-{
-	GtkWidget *pad = NULL;
-	gchar *content;
-	
-	content = fio_get_file (filename);
-	
-	if (!content)
-	{
-		gchar *usertext = g_strdup_printf (_("Could not read file %s."), filename);
-		xpad_app_error (NULL, usertext, NULL);
-		g_free (usertext);
-	}
-	else
-	{
-		GtkTextBuffer *buffer;
-		
-		xpad_periodic_init ();
-               xpad_periodic_set_callback ("save-content", (XpadPeriodicFunc) xpad_pad_save_content);
-		
-		pad = xpad_pad_new (group, settings);
-		buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (XPAD_PAD (pad)->priv->textview));
-
-		xpad_text_buffer_freeze_undo (XPAD_TEXT_BUFFER (buffer));
-		g_signal_handlers_block_by_func (buffer, xpad_pad_text_changed, pad);
-		
-		xpad_text_buffer_set_text_with_tags (XPAD_TEXT_BUFFER (buffer), content ? content : "");
-		g_free (content);
-		
-		g_signal_handlers_unblock_by_func (buffer, xpad_pad_text_changed, pad);
-		xpad_text_buffer_thaw_undo (XPAD_TEXT_BUFFER (buffer));
-
-		xpad_pad_text_changed(XPAD_PAD(pad), buffer);
-	}
-	
-	return pad;
-}
-
-/* Class pad - constructor */
-static void
-xpad_pad_class_init (XpadPadClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-	gobject_class->constructed = xpad_pad_constructed;
-	gobject_class->set_property = xpad_pad_set_property;
-	gobject_class->get_property = xpad_pad_get_property;
-	gobject_class->dispose = xpad_pad_dispose;
-	gobject_class->finalize = xpad_pad_finalize;
-
-	signals[CLOSED] =
-		g_signal_new ("closed",
-						  G_OBJECT_CLASS_TYPE (gobject_class),
-						  G_SIGNAL_RUN_FIRST,
-						  G_STRUCT_OFFSET (XpadPadClass, closed),
-						  NULL, NULL,
-						  g_cclosure_marshal_VOID__VOID,
-						  G_TYPE_NONE,
-						  0);
-
-	/* Properties */
-	obj_prop[PROP_GROUP] = g_param_spec_pointer ("group", "Pad group", "Pad group for this pad", G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
-	obj_prop[PROP_SETTINGS] = g_param_spec_pointer ("settings", "Xpad settings", "Xpad global settings", G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
-
-	g_object_class_install_properties (gobject_class, N_PROPERTIES, obj_prop);
-}
-
-static void
-xpad_pad_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-	XpadPad *pad = XPAD_PAD (object);
-
-	switch (prop_id)
-	{
-	case PROP_GROUP:
-		pad->priv->group = g_value_get_pointer (value);
-		g_object_ref (pad->priv->group);
-		if (pad->priv->group)
-			xpad_pad_group_add (pad->priv->group, GTK_WIDGET (pad));
-		break;
-
-	case PROP_SETTINGS:
-		pad->priv->settings = g_value_get_pointer (value);
-		g_object_ref (pad->priv->settings);
-		break;
-
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-xpad_pad_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-	XpadPad *pad = XPAD_PAD (object);
-
-	switch (prop_id)
-	{
-	case PROP_GROUP:
-		g_value_set_pointer (value, pad->priv->group);
-		break;
-
-	case PROP_SETTINGS:
-		g_value_set_pointer (value, pad->priv->settings);
-		break;
-
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-/* Class pad - initializer */
-static void
-xpad_pad_init (XpadPad *pad)
-{
-	pad->priv = xpad_pad_get_instance_private (pad);
-
-	pad->priv->x = 0;
-	pad->priv->y = 0;
-	pad->priv->location_valid = FALSE;
-	pad->priv->infoname = NULL;
-	pad->priv->contentname = NULL;
-	pad->priv->textview = NULL;
-	pad->priv->scrollbar = NULL;
-	pad->priv->toolbar = NULL;
-	pad->priv->toolbar_timeout = 0;
-	pad->priv->toolbar_height = 0;
-	pad->priv->toolbar_expanded = FALSE;
-	pad->priv->toolbar_pad_resized = TRUE;
-	pad->priv->properties = NULL;
-	pad->priv->unsaved_content = FALSE;
-	pad->priv->unsaved_info = FALSE;
-}
-
-static void xpad_pad_constructed (GObject *object)
-{
-	XpadPad *pad = XPAD_PAD (object);
-
-	gboolean decorations;
-	GtkBox *vbox;
-
-	g_object_get (pad->priv->settings,
-			"width", &pad->priv->width,
-			"height", &pad->priv->height,
-			"autostart-sticky", &pad->priv->sticky, NULL);
-
-	GtkWindow *pad_window = GTK_WINDOW (pad);
-
-	pad->priv->textview = GTK_WIDGET (XPAD_TEXT_VIEW (xpad_text_view_new (pad->priv->settings, pad)));
-
-	pad->priv->scrollbar = GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW,
-		"hadjustment", NULL,
-		"hscrollbar-policy", GTK_POLICY_NEVER,
-		"shadow-type", GTK_SHADOW_NONE,
-		"vadjustment", NULL,
-		"vscrollbar-policy", GTK_POLICY_NEVER,
-		"child", pad->priv->textview,
-		NULL));
-
-	pad->priv->toolbar = GTK_WIDGET (xpad_toolbar_new (pad));
-
-	pad->priv->accel_group = gtk_accel_group_new ();
-	gtk_window_add_accel_group (pad_window, pad->priv->accel_group);
-	pad->priv->menu = menu_get_popup_no_highlight (pad, pad->priv->accel_group);
-	pad->priv->highlight_menu = menu_get_popup_highlight (pad, pad->priv->accel_group);
-	gtk_accel_group_connect (pad->priv->accel_group, GDK_KEY_Q, GDK_CONTROL_MASK, 0, g_cclosure_new_swap (G_CALLBACK (xpad_app_quit), pad, NULL));
-
-	vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 0));
-	gtk_box_set_homogeneous (vbox, FALSE);
-	gtk_box_pack_start (vbox, pad->priv->scrollbar, TRUE, TRUE, 0);
-	gtk_box_pack_start (vbox, pad->priv->toolbar, FALSE, FALSE, 0);
-
-	gtk_container_child_set (GTK_CONTAINER (vbox), pad->priv->toolbar, "expand", FALSE, NULL);
-
-	g_object_get (pad->priv->settings, "has-decorations", &decorations, NULL);
-	gtk_window_set_decorated (pad_window, decorations);
-	gtk_window_set_default_size (pad_window, (gint) pad->priv->width, (gint) pad->priv->height);
-	gtk_window_set_gravity (pad_window, GDK_GRAVITY_STATIC); /* static gravity makes saving pad x,y work */
-	gtk_window_set_skip_pager_hint (pad_window, decorations);
-	gtk_window_set_skip_taskbar_hint (pad_window, !decorations);
-	gtk_window_set_position (pad_window, GTK_WIN_POS_MOUSE);
-
-	g_object_set (G_OBJECT (pad), "child", vbox, NULL);
-
-	xpad_pad_notify_has_scrollbar (pad);
-	xpad_pad_notify_has_selection (pad);
-	xpad_pad_notify_clipboard_owner_changed (pad);
-	xpad_pad_notify_undo_redo_changed (pad);
-
- 	pad->priv->clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-
-	if (pad->priv->sticky)
-		gtk_window_stick (pad_window);
-	else
-		gtk_window_unstick (pad_window);
-
+static void
+xpad_pad_sync_title (XpadPad *pad)
+{
+	GtkTextBuffer *buffer;
+	GtkTextIter s, e;
+	gchar *content, *end;
+	
+	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
+	gtk_text_buffer_get_bounds (buffer, &s, &e);
+	content = gtk_text_buffer_get_text (buffer, &s, &e, FALSE);
+	end = g_utf8_strchr (content, -1, '\n');
+	if (end)
+		*end = '\0';
+	
+	gtk_window_set_title (GTK_WINDOW (pad), g_strstrip (content));
+	
+	g_free (content);
+}
+
+static void
+xpad_pad_text_changed (XpadPad       *pad,
+		       GtkTextBuffer *buffer)
+{
+	/* A dirty way to silence the compiler for these unused variables. */
+	(void) buffer;
+
+	/* set title */
 	xpad_pad_sync_title (pad);
-
-	gtk_widget_show_all (GTK_WIDGET (vbox));
-
-	gtk_widget_hide (pad->priv->toolbar);
-	xpad_pad_notify_has_toolbar (pad);
-
-	/* Set up signals */
-	gtk_widget_add_events (GTK_WIDGET (pad), GDK_BUTTON_PRESS_MASK | GDK_PROPERTY_CHANGE_MASK);
-	gtk_widget_add_events (pad->priv->toolbar, GDK_ALL_EVENTS_MASK);
-	g_signal_connect_swapped (pad->priv->textview, "button-press-event", G_CALLBACK (xpad_pad_button_press_event), pad);
-	g_signal_connect_swapped (pad->priv->textview, "popup-menu", G_CALLBACK (xpad_pad_popup_menu), pad);
-	g_signal_connect_swapped (pad->priv->toolbar, "size-allocate", G_CALLBACK (xpad_pad_toolbar_size_allocate), pad);
-	g_signal_connect (pad, "button-press-event", G_CALLBACK (xpad_pad_button_press_event), NULL);
-	g_signal_connect (pad, "configure-event", G_CALLBACK (xpad_pad_configure_event), NULL);
-	g_signal_connect (pad, "delete-event", G_CALLBACK (xpad_pad_delete_event), NULL);
-	g_signal_connect (pad, "popup-menu", G_CALLBACK (xpad_pad_popup_menu), NULL);
-	g_signal_connect (pad, "show", G_CALLBACK (xpad_pad_show), NULL);
-	g_signal_connect_swapped (gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)), "changed", G_CALLBACK (xpad_pad_text_changed), pad);
-
-	g_signal_connect (pad, "enter-notify-event", G_CALLBACK (xpad_pad_enter_notify_event), NULL);
-	g_signal_connect (pad, "leave-notify-event", G_CALLBACK (xpad_pad_leave_notify_event), NULL);
-
-	g_signal_connect_swapped (pad->priv->settings, "notify::has-decorations", G_CALLBACK (xpad_pad_notify_has_decorations), pad);
-	g_signal_connect_swapped (pad->priv->settings, "notify::has-toolbar", G_CALLBACK (xpad_pad_notify_has_toolbar), pad);
-	g_signal_connect_swapped (pad->priv->settings, "notify::autohide-toolbar", G_CALLBACK (xpad_pad_notify_autohide_toolbar), pad);
-	g_signal_connect_swapped (pad->priv->settings, "notify::has-scrollbar", G_CALLBACK (xpad_pad_notify_has_scrollbar), pad);
-	g_signal_connect_swapped (gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)), "notify::has-selection", G_CALLBACK (xpad_pad_notify_has_selection), pad);
-	g_signal_connect_swapped (pad->priv->clipboard, "owner-change", G_CALLBACK (xpad_pad_notify_clipboard_owner_changed), pad);
-
-	g_signal_connect_swapped (pad->priv->toolbar, "activate-new", G_CALLBACK (xpad_pad_spawn), pad);
-	g_signal_connect_swapped (pad->priv->toolbar, "activate-clear", G_CALLBACK (xpad_pad_clear), pad);
-	g_signal_connect_swapped (pad->priv->toolbar, "activate-close", G_CALLBACK (xpad_pad_close), pad);
-	g_signal_connect_swapped (pad->priv->toolbar, "activate-undo", G_CALLBACK (xpad_pad_undo), pad);
-	g_signal_connect_swapped (pad->priv->toolbar, "activate-redo", G_CALLBACK (xpad_pad_redo), pad);
-	g_signal_connect_swapped (pad->priv->toolbar, "activate-cut", G_CALLBACK (xpad_pad_cut), pad);
-	g_signal_connect_swapped (pad->priv->toolbar, "activate-copy", G_CALLBACK (xpad_pad_copy), pad);
-	g_signal_connect_swapped (pad->priv->toolbar, "activate-paste", G_CALLBACK (xpad_pad_paste), pad);
-	g_signal_connect_swapped (pad->priv->toolbar, "activate-delete", G_CALLBACK (xpad_pad_delete), pad);
-	g_signal_connect_swapped (pad->priv->toolbar, "activate-properties", G_CALLBACK (xpad_pad_open_properties), pad);
-	g_signal_connect_swapped (pad->priv->toolbar, "activate-preferences", G_CALLBACK (xpad_pad_open_preferences), pad);
-	g_signal_connect_swapped (pad->priv->toolbar, "activate-quit", G_CALLBACK (xpad_pad_close_all), pad);
-
-	g_signal_connect_swapped (pad->priv->toolbar, "popup", G_CALLBACK (menu_popup), pad);
-	g_signal_connect_swapped (pad->priv->toolbar, "popdown", G_CALLBACK (menu_popdown), pad);
-
-	g_signal_connect_swapped (pad->priv->menu, "deactivate", G_CALLBACK (menu_popdown), pad);
-	g_signal_connect_swapped (pad->priv->highlight_menu, "deactivate", G_CALLBACK (menu_popdown), pad);
-}
-
-static void
-xpad_pad_dispose (GObject *object)
-{
-	XpadPad *pad = XPAD_PAD (object);
-
-	if (pad->priv->group) {
-		g_object_unref(pad->priv->group);
-		pad->priv->group = NULL;
-	}
-
-	if (GTK_IS_WIDGET(pad->priv->menu)) {
-		gtk_widget_destroy (pad->priv->menu);
-		pad->priv->menu = NULL;
-	}
-
-	if (GTK_IS_WIDGET(pad->priv->highlight_menu)) {
-		gtk_widget_destroy (pad->priv->highlight_menu);
-		pad->priv->highlight_menu = NULL;
-	}
-
-	if (XPAD_IS_PAD_PROPERTIES (pad->priv->properties)) {
-		gtk_widget_destroy (pad->priv->properties);
-		pad->priv->properties = NULL;
-	}
-
-	gtk_clipboard_clear (pad->priv->clipboard);
-
-	/* For some reason the toolbar handler does not get automatically disconnected (or not at the right moment), leading to errors after deleting a pad. This manual disconnect prevents this error. */
-	if (XPAD_IS_TOOLBAR (pad->priv->toolbar)) {
-		g_signal_handlers_disconnect_matched (pad->priv->toolbar, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pad);
-		gtk_widget_destroy(pad->priv->toolbar);
-		pad->priv->toolbar = NULL;
-	}
-
-	G_OBJECT_CLASS (xpad_pad_parent_class)->dispose (object);
-}
-
-static void
-xpad_pad_finalize (GObject *object)
-{
-	XpadPad *pad = XPAD_PAD (object);
-
-	if (pad->priv->settings) {
-		g_signal_handlers_disconnect_matched (pad->priv->settings, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pad);
-		g_object_unref(pad->priv->settings);
-		pad->priv->settings = NULL;
-	}
-
-	g_free (pad->priv->infoname);
-	g_free (pad->priv->contentname);
-	
-	G_OBJECT_CLASS (xpad_pad_parent_class)->finalize (object);
-}
-
-static void
-xpad_pad_show (XpadPad *pad)
-{
-	/*
-	 * Some wm's might not acknowledge our request for a specific
-	 * location before we are shown.  What we do here is a little gimpy
-	 * and not very respectful of wms' sovereignty, but it has the effect
-	 * of making pads' locations very dependable.  We just move the pad
-	 * again here after being shown.  This may create a visual effect if
-	 * the wm did ignore us, but is better than being in the wrong
-	 * place, I guess.
-	 */
-	if (pad->priv->location_valid)
-		gtk_window_move (GTK_WINDOW (pad), pad->priv->x, pad->priv->y);
-
-	if (pad->priv->sticky)
-		gtk_window_stick (GTK_WINDOW (pad));
-	else
-		gtk_window_unstick (GTK_WINDOW (pad));
-}
-
-static gboolean toolbar_timeout (XpadPad *pad)
-{
-	if (!pad || !pad->priv || !pad->priv->toolbar_timeout)
-		return FALSE;
-
-	gboolean has_toolbar, autohide_toolbar;
-	g_object_get (pad->priv->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;
-
-	return FALSE;
-}
-
-static void
-xpad_pad_notify_has_decorations (XpadPad *pad)
-{
-	GtkWidget *pad_widget = GTK_WIDGET (pad);
-	GtkWindow *pad_window = GTK_WINDOW (pad);
-	gboolean decorations;
-	g_object_get (pad->priv->settings, "has-decorations", &decorations, NULL);
-	
-	/* Update pad menu with the new status */
-	GtkWidget *menu_item = g_object_get_data (G_OBJECT (pad->priv->menu), "has-decorations");
-	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), decorations);
-
-	/*
-	 *  There are two modes of operation:  a normal mode and a 'stealth' mode.
-	 *  If decorations are disabled, we also don't show up in the taskbar or pager. 
-	 */
-	gtk_window_set_decorated (pad_window, decorations);
-	gtk_window_set_skip_taskbar_hint (pad_window, !decorations);
-	gtk_window_set_skip_pager_hint (pad_window, !decorations);
-	
-	/*
-	 * reshow_with_initial_size() seems to set the window back to a never-shown state.
-	 * This is good, as some WMs don't like us changing the above parameters mid-run,
-	 * even if we do a hide/show cycle.
-	 */
-	gtk_window_set_default_size (pad_window, (gint) pad->priv->width, (gint) pad->priv->height);
-	gtk_widget_hide (pad_widget);
-	gtk_widget_unrealize (pad_widget);
-	gtk_widget_show (pad_widget);
-}
-
-static void
-xpad_pad_notify_has_toolbar (XpadPad *pad)
-{
-	gboolean has_toolbar, autohide_toolbar;
-	g_object_get (pad->priv->settings, "has-toolbar", &has_toolbar, "autohide-toolbar", &autohide_toolbar, NULL);
-
-	/* Update pad menu with the new status */
-	GtkWidget *menu_item = g_object_get_data (G_OBJECT (pad->priv->menu), "has-toolbar");
-	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), has_toolbar);
-	menu_item = g_object_get_data (G_OBJECT (pad->priv->menu), "has-autohide-toolbar");
-	gtk_widget_set_sensitive (menu_item, has_toolbar);
-
-	if (has_toolbar && !autohide_toolbar)
-		xpad_pad_show_toolbar (pad);
-	else
-		xpad_pad_hide_toolbar (pad);
-}
-
-static void
-xpad_pad_notify_autohide_toolbar (XpadPad *pad)
-{
-	gboolean autohide_toolbar;
-	g_object_get (pad->priv->settings, "autohide-toolbar", &autohide_toolbar, NULL);
-
-	/* Update pad menu with the new status */
-	GtkWidget *menu_item = g_object_get_data (G_OBJECT (pad->priv->menu), "has-autohide-toolbar");
-	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), autohide_toolbar);
-
-	if (autohide_toolbar)
-	{
-		/* Likely not to be in pad when turning setting on */
-		if (!pad->priv->toolbar_timeout)
-			pad->priv->toolbar_timeout = g_timeout_add (1000, (GSourceFunc) toolbar_timeout, pad);
-	}
-	else
-	{
-		gboolean has_toolbar;
-		g_object_get (pad->priv->settings, "has-toolbar", &has_toolbar, NULL);
-
-		if (has_toolbar)
-			xpad_pad_show_toolbar(pad);
-	}
-}
-
-static void
-xpad_pad_notify_has_scrollbar (XpadPad *pad)
-{
-	gboolean has_scrollbar;
-	g_object_get (pad->priv->settings, "has-scrollbar", &has_scrollbar, NULL);
-
-	/* Update pad menu with the new status */
-	GtkWidget *menu_item = g_object_get_data (G_OBJECT (pad->priv->menu), "has-scrollbar");
-	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), has_scrollbar);
-
-	if (has_scrollbar)
-		gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pad->priv->scrollbar),
-			GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	else
-	{
-		GtkAdjustment *v, *h;
-
-		gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pad->priv->scrollbar),
-			GTK_POLICY_NEVER, GTK_POLICY_NEVER);
-
-		/* now we need to adjust view so that user can see whole pad */
-		h = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (pad->priv->scrollbar));
-		v = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (pad->priv->scrollbar));
-
-		gtk_adjustment_set_value (h, 0);
-		gtk_adjustment_set_value (v, 0);
-	}
+	
+	/* record change */
+	xpad_pad_save_content_delayed(pad);
+}
+
+void
+xpad_pad_load_content (XpadPad *pad)
+{
+	g_return_if_fail (pad);
+
+	gchar *content;
+	GtkTextBuffer *buffer;
+	
+	if (!pad->priv->contentname)
+		return;
+	
+	content = fio_get_file (pad->priv->contentname);
+	
+	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
+	
+	xpad_text_buffer_freeze_undo (XPAD_TEXT_BUFFER (buffer));
+	g_signal_handlers_block_by_func (buffer, xpad_pad_text_changed, pad);
+	
+	xpad_text_buffer_set_text_with_tags (XPAD_TEXT_BUFFER (buffer), content ? content : "");
+	g_free (content);
+	
+	g_signal_handlers_unblock_by_func (buffer, xpad_pad_text_changed, pad);
+	xpad_text_buffer_thaw_undo (XPAD_TEXT_BUFFER (buffer));
+
+	xpad_pad_text_changed(pad, buffer);
+	pad->priv->unsaved_content = FALSE;
+}
+
+void
+xpad_pad_save_content (XpadPad *pad)
+{
+	g_return_if_fail (pad);
+
+	gchar *content;
+	GtkTextBuffer *buffer;
+	
+	if (!pad->priv->unsaved_content)
+		return;
+
+	/* create content file if it doesn't exist yet */
+	if (!pad->priv->contentname)
+	{
+		pad->priv->contentname = fio_unique_name ("content-");
+		if (!pad->priv->contentname)
+			return;
+	}
+
+	if (GTK_IS_TEXT_VIEW(pad->priv->textview)) {
+		buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
+		content = xpad_text_buffer_get_text_with_tags (XPAD_TEXT_BUFFER (buffer));
+	}
+	else
+		g_warning("There is a problem in the program Xpad. In function 'xpad_pad_save_content' the variable 'pad->priv->textview' is not of type textview. Please send a bugreport to https://bugs.launchpad.net/xpad/+filebug to help improve Xpad.");
+	
+	fio_set_file (pad->priv->contentname, content);
+
+	pad->priv->unsaved_content = FALSE;
+	g_free (content);
 }
 
 static guint
@@ -629,6 +227,28 @@
 }
 
 static void
+xpad_pad_hide_toolbar (XpadPad *pad)
+{
+	if (gtk_widget_get_visible (pad->priv->toolbar))
+	{
+		GtkWidget *pad_widget = GTK_WIDGET (pad);
+		if (gtk_widget_get_window (pad_widget))
+			gdk_window_freeze_updates (gtk_widget_get_window (pad_widget));
+		gtk_widget_hide (pad->priv->toolbar);
+		
+		if (pad->priv->toolbar_expanded ||
+			 (pad->priv->toolbar_pad_resized && xpad_pad_text_and_toolbar_height (pad) >= pad->priv->height))
+		{
+				pad->priv->height -= pad->priv->toolbar_height;
+				gtk_window_resize (GTK_WINDOW (pad), (gint) pad->priv->width, (gint) pad->priv->height);
+				pad->priv->toolbar_expanded = FALSE;
+		}
+		if (gtk_widget_get_window (pad_widget))
+			gdk_window_thaw_updates (gtk_widget_get_window (pad_widget));
+	}
+}
+
+static void
 xpad_pad_show_toolbar (XpadPad *pad)
 {
 	if (!gtk_widget_get_visible (pad->priv->toolbar))
@@ -669,558 +289,10 @@
 	}
 }
 
-static void
-xpad_pad_hide_toolbar (XpadPad *pad)
-{
-	if (gtk_widget_get_visible (pad->priv->toolbar))
-	{
-		GtkWidget *pad_widget = GTK_WIDGET (pad);
-		if (gtk_widget_get_window (pad_widget))
-			gdk_window_freeze_updates (gtk_widget_get_window (pad_widget));
-		gtk_widget_hide (pad->priv->toolbar);
-		
-		if (pad->priv->toolbar_expanded ||
-			 (pad->priv->toolbar_pad_resized && xpad_pad_text_and_toolbar_height (pad) >= pad->priv->height))
-		{
-				pad->priv->height -= pad->priv->toolbar_height;
-				gtk_window_resize (GTK_WINDOW (pad), (gint) pad->priv->width, (gint) pad->priv->height);
-				pad->priv->toolbar_expanded = FALSE;
-		}
-		if (gtk_widget_get_window (pad_widget))
-			gdk_window_thaw_updates (gtk_widget_get_window (pad_widget));
-	}
-}
-
-void
-xpad_pad_notify_has_selection (XpadPad *pad)
-{
-	g_return_if_fail (pad);
-
-	GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
-	gboolean has_selection = gtk_text_buffer_get_has_selection (buffer);
-
-	XpadToolbar *toolbar = XPAD_TOOLBAR (pad->priv->toolbar);
-	if (toolbar == NULL)
-		return;
-
-	xpad_toolbar_enable_cut_button (toolbar, has_selection);
-	xpad_toolbar_enable_copy_button (toolbar, has_selection);
-}
-
-void
-xpad_pad_notify_clipboard_owner_changed (XpadPad *pad)
-{
-	g_return_if_fail (pad);
-
-	/* safe cast to toolbar */
-	if (XPAD_IS_TOOLBAR (pad->priv->toolbar)) {
-		XpadToolbar *toolbar = XPAD_TOOLBAR (pad->priv->toolbar);
-		g_return_if_fail (toolbar);
-
-		GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-		xpad_toolbar_enable_paste_button (toolbar, gtk_clipboard_wait_is_text_available (clipboard));
-	}
-}
-
-void
-xpad_pad_notify_undo_redo_changed (XpadPad *pad)
-{
-	g_return_if_fail (pad);
-
-	XpadTextBuffer *buffer = NULL;
-	buffer = XPAD_TEXT_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)));
-	g_return_if_fail (buffer);
-
-	XpadToolbar *toolbar = NULL;
-	toolbar = XPAD_TOOLBAR (pad->priv->toolbar);
-	g_return_if_fail (toolbar);
-
-	xpad_toolbar_enable_undo_button (toolbar, xpad_text_buffer_undo_available (buffer));
-	xpad_toolbar_enable_redo_button (toolbar, xpad_text_buffer_redo_available (buffer));
-}
-
-static gboolean
-xpad_pad_enter_notify_event (GtkWidget *pad, GdkEventCrossing *event)
-{
-	gboolean has_toolbar, autohide_toolbar;
-	g_object_get (XPAD_PAD (pad)->priv->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)
-	{
-		XPAD_PAD (pad)->priv->toolbar_timeout = 0;
-		xpad_pad_show_toolbar (XPAD_PAD (pad));
-	}
-	
-	return FALSE;
-}
-
-static gboolean
-xpad_pad_leave_notify_event (GtkWidget *pad, GdkEventCrossing *event)
-{
-	gboolean has_toolbar, autohide_toolbar;
-	g_object_get (XPAD_PAD (pad)->priv->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)
-	{
-		if (!XPAD_PAD (pad)->priv->toolbar_timeout)
-			XPAD_PAD (pad)->priv->toolbar_timeout = g_timeout_add (1000, (GSourceFunc) toolbar_timeout, pad);
-	}
-	
-	return FALSE;
-}
-
-static void
-xpad_pad_spawn (XpadPad *pad)
-{
-	GtkWidget *newpad = xpad_pad_new (pad->priv->group, pad->priv->settings);
-	gtk_widget_show (newpad);
-}
-
-static void
-xpad_pad_clear (XpadPad *pad)
-{
-	GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
-	gtk_text_buffer_set_text (buffer, "", -1);
-}
-
-void
-xpad_pad_close (XpadPad *pad)
-{
-	gtk_widget_hide (GTK_WIDGET (pad));
-	
-	/*
-	 * If no tray and this is the last pad, we don't want to record this
-	 * pad as closed, we want to start with just this pad next open.  So
-	 * quit before we record.
-	 */
-	if (!xpad_tray_is_open () &&
-		 xpad_pad_group_num_visible_pads (pad->priv->group) == 0)
-	{
-		xpad_app_quit ();
-		return;
-	}
-	
-	if (pad->priv->properties)
-		gtk_widget_destroy (pad->priv->properties);
-	
-	xpad_pad_save_info (pad);
-	
-	g_signal_emit (pad, signals[CLOSED], 0);
-}
-
-void
-xpad_pad_toggle(XpadPad *pad)
-{
-	 if (gtk_widget_get_visible (GTK_WIDGET(pad)))
-		  xpad_pad_close (pad);
-	 else
-		  gtk_widget_show (GTK_WIDGET (pad));
-}
-
-static gboolean
-should_confirm_delete (XpadPad *pad)
-{
-	GtkTextBuffer *buffer;
-	GtkTextIter s, e;
-	gchar *content;
-	gboolean confirm;
-	
-	g_object_get (pad->priv->settings, "confirm-destroy", &confirm, NULL);
-	if (!confirm)
-		return FALSE;
-	
-	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
-	gtk_text_buffer_get_bounds (buffer, &s, &e);
-	content = gtk_text_buffer_get_text (buffer, &s, &e, FALSE);
-	
-	confirm = strcmp (g_strstrip (content), "") != 0;
-	
-	g_free (content);
-	
-	return confirm;
-}
-
-static void
-xpad_pad_delete (XpadPad *pad)
-{
-	g_return_if_fail (pad);
-
-	/* With the delayed saving functionality, it is necessary to clear the unsaved flags to prevent usage of non-existing object information. */
-	pad->priv->unsaved_info = FALSE;
-	pad->priv->unsaved_content = FALSE;
-
-	if (should_confirm_delete (pad))
-	{
-		GtkWidget *dialog;
-		gint response;
-
-		dialog = xpad_app_alert_dialog (GTK_WINDOW (pad), "dialog-warning", _("Delete this pad?"), _("All text of this pad will be irrevocably lost."));
-		
-		if (!dialog)
-			return;
-
-		gtk_dialog_add_buttons (GTK_DIALOG (dialog), _("_Delete"), GTK_RESPONSE_ACCEPT, _("_Cancel"), GTK_RESPONSE_REJECT, NULL);
-
-		response = gtk_dialog_run (GTK_DIALOG (dialog));
-		
-		gtk_widget_destroy (dialog);
-		
-		if (response != GTK_RESPONSE_ACCEPT)
-			return;
-	}
-	
-	/* These two if statements actually erase the pad on the harddisk. */
-	if (pad->priv->infoname)
-		fio_remove_file (pad->priv->infoname);
-	if (pad->priv->contentname)
-		fio_remove_file (pad->priv->contentname);
-	
-	/* Remove the pad from the group and destroy it. */
-	gtk_widget_destroy (GTK_WIDGET (pad));
-}
-
-static void
-pad_properties_sync_title (XpadPad *pad)
-{
-	gchar *title;
-	
-	if (!pad->priv->properties)
-		return;
-	
-	title = g_strdup_printf (_("'%s' Properties"), gtk_window_get_title (GTK_WINDOW (pad)));
-	gtk_window_set_title (GTK_WINDOW (pad->priv->properties), title);
-	g_free (title);
-}
-
-static void
-pad_properties_destroyed (XpadPad *pad)
-{
-	if (!pad->priv->properties)
-		return;
-	
-	g_signal_handlers_disconnect_by_func (pad, (gpointer) pad_properties_sync_title, NULL);
-	pad->priv->properties = NULL;
-}
-
-static void
-prop_notify_font (XpadPad *pad)
-{
-	XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties);
-
-	gboolean follow_font_style;
-	g_object_get (prop, "follow-font-style", &follow_font_style, NULL);
-	g_object_set (XPAD_TEXT_VIEW (pad->priv->textview), "follow-font-style", follow_font_style, NULL);
-	
-	if (!follow_font_style)
-	{
-		const gchar *font;
-		g_object_get (prop, "fontname", &font, NULL);
-		PangoFontDescription *fontdesc;
-		
-		fontdesc = font ? pango_font_description_from_string (font) : NULL;
-		gtk_widget_override_font (pad->priv->textview, fontdesc);
-		if (fontdesc)
-			pango_font_description_free (fontdesc);
-	}
-	
-	xpad_pad_save_info_delayed (pad);
-}
-
-static void
-prop_notify_colors (XpadPad *pad)
-{
-	XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties);
-	
-	gboolean follow_color_style;
-	const GdkRGBA *text_color, *back_color;
-
-	g_object_get (prop, "follow-color-style", &follow_color_style, NULL);
-	g_object_set (XPAD_TEXT_VIEW (pad->priv->textview), "follow-color-style", follow_color_style, NULL);
-
-	if (follow_color_style)
-		/* Set the colors to the global preferences colors */
-		g_object_get (pad->priv->settings, "text-color", &text_color, "back-color", &back_color, NULL);
-	else
-		/* Set the color to the individual pad properties colors */
-		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);
-	gtk_widget_override_background_color (pad->priv->textview, GTK_STATE_FLAG_NORMAL, back_color);
-
-	/* Inverse the text and background colors for selected text, so it is likely to be visible by any choice of the colors. */
-	gtk_widget_override_color (pad->priv->textview, GTK_STATE_FLAG_SELECTED, back_color);
-	gtk_widget_override_background_color (pad->priv->textview, GTK_STATE_FLAG_SELECTED, text_color);
-
-	xpad_pad_save_info_delayed (pad);
-}
-
-static void
-xpad_pad_open_properties (XpadPad *pad)
-{
-	gboolean follow_font_style, follow_color_style;
-	GtkStyleContext *style = NULL;
-	PangoFontDescription *font;
-	GdkRGBA widget_text_color = {0, 0, 0, 0};
-	GdkRGBA widget_background_color = {0, 0, 0, 0};
-	
-	if (pad->priv->properties)
-	{
-		gtk_window_present (GTK_WINDOW (pad->priv->properties));
-		return;
-	}
-	
-	pad->priv->properties = xpad_pad_properties_new ();
-	
-	gtk_window_set_transient_for (GTK_WINDOW (pad->priv->properties), GTK_WINDOW (pad));
-	gtk_window_set_resizable (GTK_WINDOW (pad->priv->properties), FALSE);
-	
-	g_signal_connect_swapped (pad->priv->properties, "destroy", G_CALLBACK (pad_properties_destroyed), pad);
-	g_signal_connect (pad, "notify::title", G_CALLBACK (pad_properties_sync_title), NULL);
-
-	style = gtk_widget_get_style_context (pad->priv->textview);
-	gtk_style_context_get(style, GTK_STATE_FLAG_NORMAL, GTK_STYLE_PROPERTY_FONT, &font, NULL);
-	gtk_style_context_get_color (style, GTK_STATE_FLAG_NORMAL, &widget_text_color);
-	gtk_style_context_get_background_color (style, GTK_STATE_FLAG_NORMAL, &widget_background_color);
-
-	g_object_get (XPAD_TEXT_VIEW (pad->priv->textview), "follow-font-style", &follow_font_style, "follow-color-style", &follow_color_style, NULL);
-	g_object_set (G_OBJECT (pad->priv->properties),
-		"follow-font-style", follow_font_style,
-		"follow-color-style", follow_color_style,
-		"text-color", &widget_text_color,
-		"back-color", &widget_background_color,
-		"fontname", pango_font_description_to_string(font),
-		NULL);
-	pango_font_description_free (font);
-	
-	g_signal_connect_swapped (pad->priv->properties, "notify::follow-font-style", G_CALLBACK (prop_notify_font), pad);
-	g_signal_connect_swapped (pad->priv->properties, "notify::follow-color-style", G_CALLBACK (prop_notify_colors), pad);
-	g_signal_connect_swapped (pad->priv->properties, "notify::text-color", G_CALLBACK (prop_notify_colors), pad);
-	g_signal_connect_swapped (pad->priv->properties, "notify::back-color", G_CALLBACK (prop_notify_colors), pad);
-	g_signal_connect_swapped (pad->priv->properties, "notify::fontname", G_CALLBACK (prop_notify_font), pad);
-	
-	pad_properties_sync_title (pad);
-	
-	gtk_widget_show (pad->priv->properties);
-}
-
-static void
-xpad_pad_open_preferences (XpadPad *pad)
-{
-	xpad_preferences_open (pad->priv->settings);
-}
-
-static void
-xpad_pad_text_changed (XpadPad *pad, GtkTextBuffer *buffer)
-{
-	/* A dirty way to silence the compiler for these unused variables. */
-	(void) buffer;
-
-	/* set title */
-	xpad_pad_sync_title (pad);
-	
-	/* record change */
-	xpad_pad_save_content_delayed(pad);
-}
-
-static gboolean
-xpad_pad_toolbar_size_allocate (XpadPad *pad, GtkAllocation *event)
-{
-	/* safe cast from gint to guint */
-	if (event->height >= 0) {
-		pad->priv->toolbar_height = (guint) event->height;
-	}
-	else {
-		g_warning("There is a problem in the program Xpad. In function 'xpad_pad_toolbar_size_allocate' the variable 'event->height' is not a postive number. Please send a bugreport to https://bugs.launchpad.net/xpad/+filebug to help improve Xpad.");
-		pad->priv->toolbar_height = 0;
-	}
-	return FALSE;
-}
-
-static gboolean
-xpad_pad_configure_event (XpadPad *pad, GdkEventConfigure *event)
-{
-	if (!gtk_widget_get_visible (GTK_WIDGET(pad)))
-		return FALSE;
-
-	int eWidth = event->width;
-	int eHeight = event->height;
-	
-	/* safe cast from gint to guint */
-	if (eWidth >= 0 && eHeight >=0 ) {
-		if (pad->priv->width != (guint) eWidth || pad->priv->height != (guint) eHeight)
-			pad->priv->toolbar_pad_resized = TRUE;
-
-		pad->priv->width = (guint) event->width;
-		pad->priv->height = (guint) event->height;
-	}
-	else {
-		g_warning("There is a problem in the program Xpad. In function 'xpad_pad_configure_event' the variable 'event->width' or 'event->height' is not a postive number. Please send a bugreport to https://bugs.launchpad.net/xpad/+filebug to help improve Xpad.");
-	}
-	
-	pad->priv->x = event->x;
-	pad->priv->y = event->y;
-	pad->priv->location_valid = TRUE;
-	
-	xpad_pad_save_info_delayed(pad);
-	
-	/*
-	 * Sometimes when moving, if the toolbar tries to hide itself,
-	 * the window manager will not resize it correctly.  So, we make
-	 * sure not to end the timeout while moving.
-	 */
-	if (pad->priv->toolbar_timeout)
-	{
-		g_source_remove (pad->priv->toolbar_timeout);
-		pad->priv->toolbar_timeout = g_timeout_add (1000, (GSourceFunc) toolbar_timeout, pad);
-	}
-	
-	return FALSE;
-}
-
-static gboolean
-xpad_pad_delete_event (XpadPad *pad, GdkEvent *event)
-{
-	/* A dirty way to silence the compiler for these unused variables. */
-	(void) event;
-
-	xpad_pad_close (pad);
-	
-	return TRUE;
-}
-
-static gboolean
-xpad_pad_popup_menu (XpadPad *pad)
-{
-	xpad_pad_popup (pad, NULL);
-	
-	return TRUE;
-}
-
-static gboolean
-xpad_pad_button_press_event (XpadPad *pad, GdkEventButton *event)
-{
-	if (event->type == GDK_BUTTON_PRESS)
-	{
-		switch (event->button)
-		{
-		case 1:
-			if ((event->state & gtk_accelerator_get_default_mod_mask ()) == GDK_CONTROL_MASK)
-			{
-				gtk_window_begin_move_drag (GTK_WINDOW (pad), (gint) event->button, (gint) event->x_root, (gint) event->y_root, event->time);
-				return TRUE;
-			}
-			break;
-
-		case 3:
-			if ((event->state & gtk_accelerator_get_default_mod_mask ()) == GDK_CONTROL_MASK)
-			{
-				GdkWindowEdge edge;
-
-				if (gtk_widget_get_direction (GTK_WIDGET (pad)) == GTK_TEXT_DIR_LTR)
-					edge = GDK_WINDOW_EDGE_SOUTH_EAST;
-				else
-					edge = GDK_WINDOW_EDGE_SOUTH_WEST;
-
-				gtk_window_begin_resize_drag (GTK_WINDOW (pad), edge, (gint) event->button, (gint) event->x_root, (gint) event->y_root, event->time);
-			}
-			else
-			{
-				xpad_pad_popup (pad, event);
-			}
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-static void
-xpad_pad_sync_title (XpadPad *pad)
-{
-	GtkTextBuffer *buffer;
-	GtkTextIter s, e;
-	gchar *content, *end;
-	
-	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
-	gtk_text_buffer_get_bounds (buffer, &s, &e);
-	content = gtk_text_buffer_get_text (buffer, &s, &e, FALSE);
-	end = g_utf8_strchr (content, -1, '\n');
-	if (end)
-		*end = '\0';
-	
-	gtk_window_set_title (GTK_WINDOW (pad), g_strstrip (content));
-	
-	g_free (content);
-}
-
-void
-xpad_pad_load_content (XpadPad *pad)
-{
-	g_return_if_fail (pad);
-
-	gchar *content;
-	GtkTextBuffer *buffer;
-	
-	if (!pad->priv->contentname)
-		return;
-	
-	content = fio_get_file (pad->priv->contentname);
-	
-	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
-	
-	xpad_text_buffer_freeze_undo (XPAD_TEXT_BUFFER (buffer));
-	g_signal_handlers_block_by_func (buffer, xpad_pad_text_changed, pad);
-	
-	xpad_text_buffer_set_text_with_tags (XPAD_TEXT_BUFFER (buffer), content ? content : "");
-	g_free (content);
-	
-	g_signal_handlers_unblock_by_func (buffer, xpad_pad_text_changed, pad);
-	xpad_text_buffer_thaw_undo (XPAD_TEXT_BUFFER (buffer));
-
-	xpad_pad_text_changed(pad, buffer);
-	pad->priv->unsaved_content = FALSE;
-}
-
-void
-xpad_pad_save_content (XpadPad *pad)
-{
-	g_return_if_fail (pad);
-
-	gchar *content;
-	GtkTextBuffer *buffer;
-	
-	if (!pad->priv->unsaved_content)
-		return;
-
-	/* create content file if it doesn't exist yet */
-	if (!pad->priv->contentname)
-	{
-		pad->priv->contentname = fio_unique_name ("content-");
-		if (!pad->priv->contentname)
-			return;
-	}
-
-	if (GTK_IS_TEXT_VIEW(pad->priv->textview)) {
-		buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
-		content = xpad_text_buffer_get_text_with_tags (XPAD_TEXT_BUFFER (buffer));
-	}
-	else
-		g_warning("There is a problem in the program Xpad. In function 'xpad_pad_save_content' the variable 'pad->priv->textview' is not of type textview. Please send a bugreport to https://bugs.launchpad.net/xpad/+filebug to help improve Xpad.");
-	
-	fio_set_file (pad->priv->contentname, content);
-
-	pad->priv->unsaved_content = FALSE;
-	g_free (content);
-}
-
 /* Extract all the metadata of a single pad from its info-xxxxx file and store it in the pad object */
 static void
-xpad_pad_load_info (XpadPad *pad, gboolean *show)
+xpad_pad_load_info (XpadPad  *pad,
+		    gboolean *show)
 {
 	gboolean locked = FALSE, follow_font = TRUE, follow_color = TRUE, hidden = FALSE;
 	gboolean has_toolbar, autohide_toolbar;
@@ -1406,29 +478,142 @@
 	pad->priv->unsaved_info = FALSE;
 }
 
-static void
-menu_about (XpadPad *pad)
-{
-	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-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");
-	const gchar *website = "https://launchpad.net/xpad";
-	
-	gtk_show_about_dialog (GTK_WINDOW (pad),
-		"artists", artists,
-		"authors", authors,
-		"comments", comments,
-		"copyright", copyright,
-		"license-type", GTK_LICENSE_GPL_3_0,
-		"logo-icon-name", PACKAGE,
-		"translator-credits", translator_credits,
-		"version", VERSION,
-		"website", website,
-		NULL);
+/* Create a new pad based on the provided info-xxxxx file from the config directory and return this pad */
+GtkWidget *
+xpad_pad_new_with_info (XpadPadGroup *group,
+		        XpadSettings *settings,
+		        const gchar  *info_filename,
+		        gboolean     *show)
+{
+	GtkWidget *pad = xpad_pad_new (group, settings);
+	
+	XPAD_PAD (pad)->priv->infoname = g_strdup (info_filename);
+	xpad_pad_load_info (XPAD_PAD (pad), show);
+	xpad_pad_load_content (XPAD_PAD (pad));
+	gtk_window_set_role (GTK_WINDOW (pad), XPAD_PAD (pad)->priv->infoname);
+	
+	return pad;
+}
+
+/* Create a new pad based on the provided filename from the command line */
+GtkWidget *
+xpad_pad_new_from_file (XpadPadGroup *group,
+		        XpadSettings *settings,
+		        const gchar  *filename)
+{
+	GtkWidget *pad = NULL;
+	gchar *content;
+	
+	content = fio_get_file (filename);
+	
+	if (!content)
+	{
+		gchar *usertext = g_strdup_printf (_("Could not read file %s."), filename);
+		xpad_app_error (NULL, usertext, NULL);
+		g_free (usertext);
+	}
+	else
+	{
+		GtkTextBuffer *buffer;
+		
+		xpad_periodic_init ();
+               xpad_periodic_set_callback ("save-content", (XpadPeriodicFunc) xpad_pad_save_content);
+		
+		pad = xpad_pad_new (group, settings);
+		buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (XPAD_PAD (pad)->priv->textview));
+
+		xpad_text_buffer_freeze_undo (XPAD_TEXT_BUFFER (buffer));
+		g_signal_handlers_block_by_func (buffer, xpad_pad_text_changed, pad);
+		
+		xpad_text_buffer_set_text_with_tags (XPAD_TEXT_BUFFER (buffer), content ? content : "");
+		g_free (content);
+		
+		g_signal_handlers_unblock_by_func (buffer, xpad_pad_text_changed, pad);
+		xpad_text_buffer_thaw_undo (XPAD_TEXT_BUFFER (buffer));
+
+		xpad_pad_text_changed(XPAD_PAD(pad), buffer);
+	}
+	
+	return pad;
+}
+
+static void
+xpad_pad_set_property (GObject      *object,
+		       guint        prop_id,
+		       const GValue *value,
+		       GParamSpec   *pspec)
+{
+	XpadPad *pad = XPAD_PAD (object);
+
+	switch (prop_id)
+	{
+	case PROP_GROUP:
+		pad->priv->group = g_value_get_pointer (value);
+		g_object_ref (pad->priv->group);
+		if (pad->priv->group)
+			xpad_pad_group_add (pad->priv->group, GTK_WIDGET (pad));
+		break;
+
+	case PROP_SETTINGS:
+		pad->priv->settings = g_value_get_pointer (value);
+		g_object_ref (pad->priv->settings);
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+xpad_pad_get_property (GObject    *object,
+		       guint      prop_id,
+		       GValue     *value,
+		       GParamSpec *pspec)
+{
+	XpadPad *pad = XPAD_PAD (object);
+
+	switch (prop_id)
+	{
+	case PROP_GROUP:
+		g_value_set_pointer (value, pad->priv->group);
+		break;
+
+	case PROP_SETTINGS:
+		g_value_set_pointer (value, pad->priv->settings);
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+xpad_pad_spawn (XpadPad *pad)
+{
+	GtkWidget *newpad = xpad_pad_new (pad->priv->group, pad->priv->settings);
+	gtk_widget_show (newpad);
+}
+
+static void
+xpad_pad_undo (XpadPad *pad)
+{
+	g_return_if_fail (pad->priv->textview);
+	XpadTextBuffer *buffer = NULL;
+	buffer = XPAD_TEXT_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)));
+	g_return_if_fail (buffer);
+	xpad_text_buffer_undo (buffer);
+}
+
+static void
+xpad_pad_redo (XpadPad *pad)
+{
+	g_return_if_fail (pad->priv->textview);
+	XpadTextBuffer *buffer = NULL;
+	buffer = XPAD_TEXT_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)));
+	g_return_if_fail (buffer);
+	xpad_text_buffer_redo (buffer);
 }
 
 static void
@@ -1459,26 +644,6 @@
 }
 
 static void
-xpad_pad_undo (XpadPad *pad)
-{
-	g_return_if_fail (pad->priv->textview);
-	XpadTextBuffer *buffer = NULL;
-	buffer = XPAD_TEXT_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)));
-	g_return_if_fail (buffer);
-	xpad_text_buffer_undo (buffer);
-}
-
-static void
-xpad_pad_redo (XpadPad *pad)
-{
-	g_return_if_fail (pad->priv->textview);
-	XpadTextBuffer *buffer = NULL;
-	buffer = XPAD_TEXT_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)));
-	g_return_if_fail (buffer);
-	xpad_text_buffer_redo (buffer);
-}
-
-static void
 xpad_pad_show_all (XpadPad *pad)
 {
 	xpad_pad_group_show_all (pad->priv->group);
@@ -1502,8 +667,202 @@
 		xpad_app_quit ();
 }
 
-static void
-menu_toggle_tag (XpadPad *pad, const gchar *name)
+static gboolean
+should_confirm_delete (XpadPad *pad)
+{
+	GtkTextBuffer *buffer;
+	GtkTextIter s, e;
+	gchar *content;
+	gboolean confirm;
+	
+	g_object_get (pad->priv->settings, "confirm-destroy", &confirm, NULL);
+	if (!confirm)
+		return FALSE;
+	
+	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
+	gtk_text_buffer_get_bounds (buffer, &s, &e);
+	content = gtk_text_buffer_get_text (buffer, &s, &e, FALSE);
+	
+	confirm = strcmp (g_strstrip (content), "") != 0;
+	
+	g_free (content);
+	
+	return confirm;
+}
+
+static void
+xpad_pad_delete (XpadPad *pad)
+{
+	g_return_if_fail (pad);
+
+	/* With the delayed saving functionality, it is necessary to clear the unsaved flags to prevent usage of non-existing object information. */
+	pad->priv->unsaved_info = FALSE;
+	pad->priv->unsaved_content = FALSE;
+
+	if (should_confirm_delete (pad))
+	{
+		GtkWidget *dialog;
+		gint response;
+
+		dialog = xpad_app_alert_dialog (GTK_WINDOW (pad), "dialog-warning", _("Delete this pad?"), _("All text of this pad will be irrevocably lost."));
+		
+		if (!dialog)
+			return;
+
+		gtk_dialog_add_buttons (GTK_DIALOG (dialog), _("_Delete"), GTK_RESPONSE_ACCEPT, _("_Cancel"), GTK_RESPONSE_REJECT, NULL);
+
+		response = gtk_dialog_run (GTK_DIALOG (dialog));
+		
+		gtk_widget_destroy (dialog);
+		
+		if (response != GTK_RESPONSE_ACCEPT)
+			return;
+	}
+	
+	/* These two if statements actually erase the pad on the harddisk. */
+	if (pad->priv->infoname)
+		fio_remove_file (pad->priv->infoname);
+	if (pad->priv->contentname)
+		fio_remove_file (pad->priv->contentname);
+	
+	/* Remove the pad from the group and destroy it. */
+	gtk_widget_destroy (GTK_WIDGET (pad));
+}
+
+static void
+pad_properties_sync_title (XpadPad *pad)
+{
+	gchar *title;
+	
+	if (!pad->priv->properties)
+		return;
+	
+	title = g_strdup_printf (_("'%s' Properties"), gtk_window_get_title (GTK_WINDOW (pad)));
+	gtk_window_set_title (GTK_WINDOW (pad->priv->properties), title);
+	g_free (title);
+}
+
+static void
+pad_properties_destroyed (XpadPad *pad)
+{
+	if (!pad->priv->properties)
+		return;
+	
+	g_signal_handlers_disconnect_by_func (pad, (gpointer) pad_properties_sync_title, NULL);
+	pad->priv->properties = NULL;
+}
+
+static void
+prop_notify_font (XpadPad *pad)
+{
+	XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties);
+
+	gboolean follow_font_style;
+	g_object_get (prop, "follow-font-style", &follow_font_style, NULL);
+	g_object_set (XPAD_TEXT_VIEW (pad->priv->textview), "follow-font-style", follow_font_style, NULL);
+	
+	if (!follow_font_style)
+	{
+		const gchar *font;
+		g_object_get (prop, "fontname", &font, NULL);
+		PangoFontDescription *fontdesc;
+		
+		fontdesc = font ? pango_font_description_from_string (font) : NULL;
+		gtk_widget_override_font (pad->priv->textview, fontdesc);
+		if (fontdesc)
+			pango_font_description_free (fontdesc);
+	}
+	
+	xpad_pad_save_info_delayed (pad);
+}
+
+static void
+prop_notify_colors (XpadPad *pad)
+{
+	XpadPadProperties *prop = XPAD_PAD_PROPERTIES (pad->priv->properties);
+	
+	gboolean follow_color_style;
+	const GdkRGBA *text_color, *back_color;
+
+	g_object_get (prop, "follow-color-style", &follow_color_style, NULL);
+	g_object_set (XPAD_TEXT_VIEW (pad->priv->textview), "follow-color-style", follow_color_style, NULL);
+
+	if (follow_color_style)
+		/* Set the colors to the global preferences colors */
+		g_object_get (pad->priv->settings, "text-color", &text_color, "back-color", &back_color, NULL);
+	else
+		/* Set the color to the individual pad properties colors */
+		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);
+	gtk_widget_override_background_color (pad->priv->textview, GTK_STATE_FLAG_NORMAL, back_color);
+
+	/* Inverse the text and background colors for selected text, so it is likely to be visible by any choice of the colors. */
+	gtk_widget_override_color (pad->priv->textview, GTK_STATE_FLAG_SELECTED, back_color);
+	gtk_widget_override_background_color (pad->priv->textview, GTK_STATE_FLAG_SELECTED, text_color);
+
+	xpad_pad_save_info_delayed (pad);
+}
+
+static void
+xpad_pad_open_properties (XpadPad *pad)
+{
+	gboolean follow_font_style, follow_color_style;
+	GtkStyleContext *style = NULL;
+	PangoFontDescription *font;
+	GdkRGBA widget_text_color = {0, 0, 0, 0};
+	GdkRGBA widget_background_color = {0, 0, 0, 0};
+	
+	if (pad->priv->properties)
+	{
+		gtk_window_present (GTK_WINDOW (pad->priv->properties));
+		return;
+	}
+	
+	pad->priv->properties = xpad_pad_properties_new ();
+	
+	gtk_window_set_transient_for (GTK_WINDOW (pad->priv->properties), GTK_WINDOW (pad));
+	gtk_window_set_resizable (GTK_WINDOW (pad->priv->properties), FALSE);
+	
+	g_signal_connect_swapped (pad->priv->properties, "destroy", G_CALLBACK (pad_properties_destroyed), pad);
+	g_signal_connect (pad, "notify::title", G_CALLBACK (pad_properties_sync_title), NULL);
+
+	style = gtk_widget_get_style_context (pad->priv->textview);
+	gtk_style_context_get(style, GTK_STATE_FLAG_NORMAL, GTK_STYLE_PROPERTY_FONT, &font, NULL);
+	gtk_style_context_get_color (style, GTK_STATE_FLAG_NORMAL, &widget_text_color);
+	gtk_style_context_get_background_color (style, GTK_STATE_FLAG_NORMAL, &widget_background_color);
+
+	g_object_get (XPAD_TEXT_VIEW (pad->priv->textview), "follow-font-style", &follow_font_style, "follow-color-style", &follow_color_style, NULL);
+	g_object_set (G_OBJECT (pad->priv->properties),
+		"follow-font-style", follow_font_style,
+		"follow-color-style", follow_color_style,
+		"text-color", &widget_text_color,
+		"back-color", &widget_background_color,
+		"fontname", pango_font_description_to_string(font),
+		NULL);
+	pango_font_description_free (font);
+	
+	g_signal_connect_swapped (pad->priv->properties, "notify::follow-font-style", G_CALLBACK (prop_notify_font), pad);
+	g_signal_connect_swapped (pad->priv->properties, "notify::follow-color-style", G_CALLBACK (prop_notify_colors), pad);
+	g_signal_connect_swapped (pad->priv->properties, "notify::text-color", G_CALLBACK (prop_notify_colors), pad);
+	g_signal_connect_swapped (pad->priv->properties, "notify::back-color", G_CALLBACK (prop_notify_colors), pad);
+	g_signal_connect_swapped (pad->priv->properties, "notify::fontname", G_CALLBACK (prop_notify_font), pad);
+	
+	pad_properties_sync_title (pad);
+	
+	gtk_widget_show (pad->priv->properties);
+}
+
+static void
+xpad_pad_open_preferences (XpadPad *pad)
+{
+	xpad_preferences_open (pad->priv->settings);
+}
+
+static void
+menu_toggle_tag (XpadPad     *pad,
+	         const gchar *name)
 {
 	g_return_if_fail (pad->priv->textview);
 	XpadTextBuffer *buffer = NULL;
@@ -1541,7 +900,8 @@
  * because this function has been probably been called, because of a menu toggle.
  */
 static void
-menu_sticky (GtkCheckMenuItem *check, XpadPad *pad)
+menu_sticky (GtkCheckMenuItem *check,
+	     XpadPad          *pad)
 {
 	pad->priv->sticky = gtk_check_menu_item_get_active (check);
 	if (pad->priv->sticky)
@@ -1552,31 +912,36 @@
 }
 
 static void
-menu_toolbar (GtkCheckMenuItem *check, XpadPad *pad)
+menu_toolbar (GtkCheckMenuItem *check,
+	      XpadPad          *pad)
 {
 	g_object_set (pad->priv->settings, "has-toolbar", gtk_check_menu_item_get_active (check), NULL);
 }
 
 static void
-menu_scrollbar (GtkCheckMenuItem *check, XpadPad *pad)
+menu_scrollbar (GtkCheckMenuItem *check,
+	        XpadPad          *pad)
 {
 	g_object_set (pad->priv->settings, "has-scrollbar", gtk_check_menu_item_get_active (check), NULL);
 }
 
 static void
-menu_autohide (GtkCheckMenuItem *check, XpadPad *pad)
+menu_autohide (GtkCheckMenuItem *check,
+	       XpadPad          *pad)
 {
 	g_object_set (pad->priv->settings, "autohide-toolbar", gtk_check_menu_item_get_active (check), NULL);
 }
 
 static void
-menu_decorated (GtkCheckMenuItem *check, XpadPad *pad)
+menu_decorated (GtkCheckMenuItem *check,
+	        XpadPad          *pad)
 {
 	g_object_set (pad->priv->settings, "has-decorations", gtk_check_menu_item_get_active (check), NULL);
 }
 
 static gint
-menu_title_compare (GtkWindow *a, GtkWindow *b)
+menu_title_compare (GtkWindow *a,
+		    GtkWindow *b)
 {
 	gchar *title_a = g_utf8_casefold (gtk_window_get_title (a), -1);
 	gchar *title_b = g_utf8_casefold (gtk_window_get_title (b), -1);
@@ -1589,6 +954,31 @@
 	return rv;
 }
 
+static void
+menu_about (XpadPad *pad)
+{
+	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-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");
+	const gchar *website = "https://launchpad.net/xpad";
+	
+	gtk_show_about_dialog (GTK_WINDOW (pad),
+		"artists", artists,
+		"authors", authors,
+		"comments", comments,
+		"copyright", copyright,
+		"license-type", GTK_LICENSE_GPL_3_0,
+		"logo-icon-name", PACKAGE,
+		"translator-credits", translator_credits,
+		"version", VERSION,
+		"website", website,
+		NULL);
+}
+
 /* FIXME: Accelerators are working but not visible for menu items with an image (icon). */
 #define MENU_ADD(mnemonic, image, key, mask, callback) {\
 	if (image) {\
@@ -1621,7 +1011,32 @@
 	}
 
 static GtkWidget *
-menu_get_popup_no_highlight (XpadPad *pad, GtkAccelGroup *accel_group)
+menu_get_popup_highlight (XpadPad       *pad,
+			  GtkAccelGroup *accel_group)
+{
+	GtkWidget *menu, *item;
+	
+	menu = gtk_menu_new ();
+	gtk_menu_set_accel_group (GTK_MENU (menu), accel_group);
+	
+	MENU_ADD (_("Cu_t"), "edit-cut", 0, 0, xpad_pad_cut);
+	MENU_ADD (_("_Copy"), "edit-copy", 0, 0, xpad_pad_copy);
+	MENU_ADD (_("_Paste"), "edit-paste", 0, 0, xpad_pad_paste);
+	g_object_set_data (G_OBJECT (menu), "paste", item);
+	MENU_ADD_SEP ();
+	MENU_ADD (_("_Bold"), "format-text-bold", GDK_KEY_b, GDK_CONTROL_MASK, menu_bold);
+	MENU_ADD (_("_Italic"), "format-text-italic", GDK_KEY_i, GDK_CONTROL_MASK, menu_italic);
+	MENU_ADD (_("_Underline"), "format-text-underline", GDK_KEY_u, GDK_CONTROL_MASK, menu_underline);
+	MENU_ADD (_("_Strikethrough"), "format-text-strikethrough", 0, 0, menu_strikethrough);
+	
+	gtk_widget_show_all (menu);
+	
+	return menu;
+}
+
+static GtkWidget *
+menu_get_popup_no_highlight (XpadPad       *pad,
+			     GtkAccelGroup *accel_group)
 {
 	GtkWidget *uppermenu, *menu, *item;
 	gboolean has_toolbar, autohide_toolbar, has_scrollbar, decorations;
@@ -1693,7 +1108,7 @@
 	gtk_container_add (GTK_CONTAINER (uppermenu), item);
 	menu = gtk_menu_new ();
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
-	MENU_ADD (_("_Help"), "help-browser", GDK_KEY_F1, 0, show_help);	
+	MENU_ADD (_("_Help"), "help-browser", GDK_KEY_F1, 0, show_help);
 	MENU_ADD (_("_About"), "help-about", 0, 0, menu_about);
 	
 	gtk_widget_show_all (uppermenu);
@@ -1702,7 +1117,139 @@
 }
 
 static void
-menu_prep_popup_no_highlight (XpadPad *pad, GtkWidget *uppermenu)
+xpad_pad_show (XpadPad *pad)
+{
+	/*
+	 * Some wm's might not acknowledge our request for a specific
+	 * location before we are shown.  What we do here is a little gimpy
+	 * and not very respectful of wms' sovereignty, but it has the effect
+	 * of making pads' locations very dependable.  We just move the pad
+	 * again here after being shown.  This may create a visual effect if
+	 * the wm did ignore us, but is better than being in the wrong
+	 * place, I guess.
+	 */
+	if (pad->priv->location_valid)
+		gtk_window_move (GTK_WINDOW (pad), pad->priv->x, pad->priv->y);
+
+	if (pad->priv->sticky)
+		gtk_window_stick (GTK_WINDOW (pad));
+	else
+		gtk_window_unstick (GTK_WINDOW (pad));
+}
+
+static gboolean toolbar_timeout (XpadPad *pad)
+{
+	if (!pad || !pad->priv || !pad->priv->toolbar_timeout)
+		return FALSE;
+
+	gboolean has_toolbar, autohide_toolbar;
+	g_object_get (pad->priv->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;
+
+	return FALSE;
+}
+
+static gboolean
+xpad_pad_configure_event (XpadPad           *pad,
+		          GdkEventConfigure *event)
+{
+	if (!gtk_widget_get_visible (GTK_WIDGET(pad)))
+		return FALSE;
+
+	int eWidth = event->width;
+	int eHeight = event->height;
+	
+	/* safe cast from gint to guint */
+	if (eWidth >= 0 && eHeight >=0 ) {
+		if (pad->priv->width != (guint) eWidth || pad->priv->height != (guint) eHeight)
+			pad->priv->toolbar_pad_resized = TRUE;
+
+		pad->priv->width = (guint) event->width;
+		pad->priv->height = (guint) event->height;
+	}
+	else {
+		g_warning("There is a problem in the program Xpad. In function 'xpad_pad_configure_event' the variable 'event->width' or 'event->height' is not a postive number. Please send a bugreport to https://bugs.launchpad.net/xpad/+filebug to help improve Xpad.");
+	}
+	
+	pad->priv->x = event->x;
+	pad->priv->y = event->y;
+	pad->priv->location_valid = TRUE;
+	
+	xpad_pad_save_info_delayed(pad);
+	
+	/*
+	 * Sometimes when moving, if the toolbar tries to hide itself,
+	 * the window manager will not resize it correctly.  So, we make
+	 * sure not to end the timeout while moving.
+	 */
+	if (pad->priv->toolbar_timeout)
+	{
+		g_source_remove (pad->priv->toolbar_timeout);
+		pad->priv->toolbar_timeout = g_timeout_add (1000, (GSourceFunc) toolbar_timeout, pad);
+	}
+	
+	return FALSE;
+}
+
+static gboolean
+xpad_pad_toolbar_size_allocate (XpadPad       *pad,
+			        GtkAllocation *event)
+{
+	/* safe cast from gint to guint */
+	if (event->height >= 0) {
+		pad->priv->toolbar_height = (guint) event->height;
+	}
+	else {
+		g_warning("There is a problem in the program Xpad. In function 'xpad_pad_toolbar_size_allocate' the variable 'event->height' is not a postive number. Please send a bugreport to https://bugs.launchpad.net/xpad/+filebug to help improve Xpad.");
+		pad->priv->toolbar_height = 0;
+	}
+	return FALSE;
+}
+
+static gboolean
+xpad_pad_delete_event (XpadPad  *pad,
+		       GdkEvent *event)
+{
+	/* A dirty way to silence the compiler for these unused variables. */
+	(void) event;
+
+	xpad_pad_close (pad);
+	
+	return TRUE;
+}
+
+static gboolean
+xpad_pad_leave_notify_event (GtkWidget        *pad,
+			     GdkEventCrossing *event)
+{
+	gboolean has_toolbar, autohide_toolbar;
+	g_object_get (XPAD_PAD (pad)->priv->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)
+	{
+		if (!XPAD_PAD (pad)->priv->toolbar_timeout)
+			XPAD_PAD (pad)->priv->toolbar_timeout = g_timeout_add (1000, (GSourceFunc) toolbar_timeout, pad);
+	}
+	
+	return FALSE;
+}
+
+static void
+menu_popup (XpadPad *pad)
+{
+	g_signal_handlers_block_matched (pad, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, (gpointer) xpad_pad_leave_notify_event, NULL);
+	pad->priv->toolbar_timeout = 0;
+}
+
+static void
+menu_prep_popup_no_highlight (XpadPad   *pad,
+			      GtkWidget *uppermenu)
 {
 	GtkWidget *menu, *item;
 
@@ -1747,6 +1294,495 @@
 	gtk_widget_show_all (menu);
 }
 
+static void
+menu_prep_popup_highlight (XpadPad   *pad,
+			   GtkWidget *menu)
+{
+	/* A dirty way to silence the compiler for these unused variables. */
+	(void) pad;
+
+	GtkWidget *item;
+	GtkClipboard *clipboard;
+	
+	clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+	
+	item = g_object_get_data (G_OBJECT (menu), "paste");
+	if (item)
+		gtk_widget_set_sensitive (item, gtk_clipboard_wait_is_text_available (clipboard));
+}
+
+static void
+xpad_pad_popup (XpadPad        *pad,
+	        GdkEventButton *event)
+{
+	GtkTextBuffer *buffer;
+	GtkWidget *menu;
+	
+	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
+	
+	if (gtk_text_buffer_get_selection_bounds (buffer, NULL, NULL))
+	{
+		menu = pad->priv->highlight_menu;
+		menu_prep_popup_highlight (pad, menu);
+	}
+	else
+	{
+		menu = pad->priv->menu;
+		menu_prep_popup_no_highlight (pad, menu);
+	}
+
+	if (!menu)
+		return;
+
+	menu_popup (pad);
+	
+	if (event)
+		gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, event->time);
+	else
+		gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time ());
+}
+
+static gboolean
+xpad_pad_popup_menu (XpadPad *pad)
+{
+	xpad_pad_popup (pad, NULL);
+	
+	return TRUE;
+}
+
+static void
+menu_popdown (XpadPad *pad)
+{
+	cairo_rectangle_int_t rect;
+
+	/* We must check if we disabled off of pad and start the timeout if so. */
+	rect.x = 10;
+	rect.y = 10;
+	rect.width = 1;
+	rect.height = 1;
+	
+	if (!pad->priv->toolbar_timeout && !gtk_widget_intersect (GTK_WIDGET (pad), &rect, NULL))
+		pad->priv->toolbar_timeout = g_timeout_add (1000, (GSourceFunc) toolbar_timeout, pad);
+
+	g_signal_handlers_unblock_matched (pad, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, (gpointer) xpad_pad_leave_notify_event, NULL);
+}
+
+static gboolean
+xpad_pad_button_press_event (XpadPad        *pad,
+			     GdkEventButton *event)
+{
+	if (event->type == GDK_BUTTON_PRESS)
+	{
+		switch (event->button)
+		{
+		case 1:
+			if ((event->state & gtk_accelerator_get_default_mod_mask ()) == GDK_CONTROL_MASK)
+			{
+				gtk_window_begin_move_drag (GTK_WINDOW (pad), (gint) event->button, (gint) event->x_root, (gint) event->y_root, event->time);
+				return TRUE;
+			}
+			break;
+
+		case 3:
+			if ((event->state & gtk_accelerator_get_default_mod_mask ()) == GDK_CONTROL_MASK)
+			{
+				GdkWindowEdge edge;
+
+				if (gtk_widget_get_direction (GTK_WIDGET (pad)) == GTK_TEXT_DIR_LTR)
+					edge = GDK_WINDOW_EDGE_SOUTH_EAST;
+				else
+					edge = GDK_WINDOW_EDGE_SOUTH_WEST;
+
+				gtk_window_begin_resize_drag (GTK_WINDOW (pad), edge, (gint) event->button, (gint) event->x_root, (gint) event->y_root, event->time);
+			}
+			else
+			{
+				xpad_pad_popup (pad, event);
+			}
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+static void
+xpad_pad_notify_has_scrollbar (XpadPad *pad)
+{
+	gboolean has_scrollbar;
+	g_object_get (pad->priv->settings, "has-scrollbar", &has_scrollbar, NULL);
+
+	/* Update pad menu with the new status */
+	GtkWidget *menu_item = g_object_get_data (G_OBJECT (pad->priv->menu), "has-scrollbar");
+	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), has_scrollbar);
+
+	if (has_scrollbar)
+		gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pad->priv->scrollbar),
+			GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	else
+	{
+		GtkAdjustment *v, *h;
+
+		gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pad->priv->scrollbar),
+			GTK_POLICY_NEVER, GTK_POLICY_NEVER);
+
+		/* now we need to adjust view so that user can see whole pad */
+		h = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (pad->priv->scrollbar));
+		v = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (pad->priv->scrollbar));
+
+		gtk_adjustment_set_value (h, 0);
+		gtk_adjustment_set_value (v, 0);
+	}
+}
+
+static void
+xpad_pad_notify_has_decorations (XpadPad *pad)
+{
+	GtkWidget *pad_widget = GTK_WIDGET (pad);
+	GtkWindow *pad_window = GTK_WINDOW (pad);
+	gboolean decorations;
+	g_object_get (pad->priv->settings, "has-decorations", &decorations, NULL);
+	
+	/* Update pad menu with the new status */
+	GtkWidget *menu_item = g_object_get_data (G_OBJECT (pad->priv->menu), "has-decorations");
+	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), decorations);
+
+	/*
+	 *  There are two modes of operation:  a normal mode and a 'stealth' mode.
+	 *  If decorations are disabled, we also don't show up in the taskbar or pager. 
+	 */
+	gtk_window_set_decorated (pad_window, decorations);
+	gtk_window_set_skip_taskbar_hint (pad_window, !decorations);
+	gtk_window_set_skip_pager_hint (pad_window, !decorations);
+	
+	/*
+	 * reshow_with_initial_size() seems to set the window back to a never-shown state.
+	 * This is good, as some WMs don't like us changing the above parameters mid-run,
+	 * even if we do a hide/show cycle.
+	 */
+	gtk_window_set_default_size (pad_window, (gint) pad->priv->width, (gint) pad->priv->height);
+	gtk_widget_hide (pad_widget);
+	gtk_widget_unrealize (pad_widget);
+	gtk_widget_show (pad_widget);
+}
+
+static void
+xpad_pad_notify_has_toolbar (XpadPad *pad)
+{
+	gboolean has_toolbar, autohide_toolbar;
+	g_object_get (pad->priv->settings, "has-toolbar", &has_toolbar, "autohide-toolbar", &autohide_toolbar, NULL);
+
+	/* Update pad menu with the new status */
+	GtkWidget *menu_item = g_object_get_data (G_OBJECT (pad->priv->menu), "has-toolbar");
+	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), has_toolbar);
+	menu_item = g_object_get_data (G_OBJECT (pad->priv->menu), "has-autohide-toolbar");
+	gtk_widget_set_sensitive (menu_item, has_toolbar);
+
+	if (has_toolbar && !autohide_toolbar)
+		xpad_pad_show_toolbar (pad);
+	else
+		xpad_pad_hide_toolbar (pad);
+}
+
+static void
+xpad_pad_notify_autohide_toolbar (XpadPad *pad)
+{
+	gboolean autohide_toolbar;
+	g_object_get (pad->priv->settings, "autohide-toolbar", &autohide_toolbar, NULL);
+
+	/* Update pad menu with the new status */
+	GtkWidget *menu_item = g_object_get_data (G_OBJECT (pad->priv->menu), "has-autohide-toolbar");
+	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), autohide_toolbar);
+
+	if (autohide_toolbar)
+	{
+		/* Likely not to be in pad when turning setting on */
+		if (!pad->priv->toolbar_timeout)
+			pad->priv->toolbar_timeout = g_timeout_add (1000, (GSourceFunc) toolbar_timeout, pad);
+	}
+	else
+	{
+		gboolean has_toolbar;
+		g_object_get (pad->priv->settings, "has-toolbar", &has_toolbar, NULL);
+
+		if (has_toolbar)
+			xpad_pad_show_toolbar(pad);
+	}
+}
+
+static void
+xpad_pad_clear (XpadPad *pad)
+{
+	GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
+	gtk_text_buffer_set_text (buffer, "", -1);
+}
+
+static gboolean
+xpad_pad_enter_notify_event (GtkWidget        *pad,
+	                     GdkEventCrossing *event)
+{
+	gboolean has_toolbar, autohide_toolbar;
+	g_object_get (XPAD_PAD (pad)->priv->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)
+	{
+		XPAD_PAD (pad)->priv->toolbar_timeout = 0;
+		xpad_pad_show_toolbar (XPAD_PAD (pad));
+	}
+	
+	return FALSE;
+}
+
+static void xpad_pad_constructed (GObject *object)
+{
+	XpadPad *pad = XPAD_PAD (object);
+
+	gboolean decorations;
+	GtkBox *vbox;
+
+	g_object_get (pad->priv->settings,
+			"width", &pad->priv->width,
+			"height", &pad->priv->height,
+			"autostart-sticky", &pad->priv->sticky, NULL);
+
+	GtkWindow *pad_window = GTK_WINDOW (pad);
+
+	pad->priv->textview = GTK_WIDGET (XPAD_TEXT_VIEW (xpad_text_view_new (pad->priv->settings, pad)));
+
+	pad->priv->scrollbar = GTK_WIDGET (g_object_new (GTK_TYPE_SCROLLED_WINDOW,
+		"hadjustment", NULL,
+		"hscrollbar-policy", GTK_POLICY_NEVER,
+		"shadow-type", GTK_SHADOW_NONE,
+		"vadjustment", NULL,
+		"vscrollbar-policy", GTK_POLICY_NEVER,
+		"child", pad->priv->textview,
+		NULL));
+
+	pad->priv->toolbar = GTK_WIDGET (xpad_toolbar_new (pad));
+
+	pad->priv->accel_group = gtk_accel_group_new ();
+	gtk_window_add_accel_group (pad_window, pad->priv->accel_group);
+	pad->priv->menu = menu_get_popup_no_highlight (pad, pad->priv->accel_group);
+	pad->priv->highlight_menu = menu_get_popup_highlight (pad, pad->priv->accel_group);
+	gtk_accel_group_connect (pad->priv->accel_group, GDK_KEY_Q, GDK_CONTROL_MASK, 0, g_cclosure_new_swap (G_CALLBACK (xpad_app_quit), pad, NULL));
+
+	vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 0));
+	gtk_box_set_homogeneous (vbox, FALSE);
+	gtk_box_pack_start (vbox, pad->priv->scrollbar, TRUE, TRUE, 0);
+	gtk_box_pack_start (vbox, pad->priv->toolbar, FALSE, FALSE, 0);
+
+	gtk_container_child_set (GTK_CONTAINER (vbox), pad->priv->toolbar, "expand", FALSE, NULL);
+
+	g_object_get (pad->priv->settings, "has-decorations", &decorations, NULL);
+	gtk_window_set_decorated (pad_window, decorations);
+	gtk_window_set_default_size (pad_window, (gint) pad->priv->width, (gint) pad->priv->height);
+	gtk_window_set_gravity (pad_window, GDK_GRAVITY_STATIC); /* static gravity makes saving pad x,y work */
+	gtk_window_set_skip_pager_hint (pad_window, decorations);
+	gtk_window_set_skip_taskbar_hint (pad_window, !decorations);
+	gtk_window_set_position (pad_window, GTK_WIN_POS_MOUSE);
+
+	g_object_set (G_OBJECT (pad), "child", vbox, NULL);
+
+	xpad_pad_notify_has_scrollbar (pad);
+	xpad_pad_notify_has_selection (pad);
+	xpad_pad_notify_clipboard_owner_changed (pad);
+	xpad_pad_notify_undo_redo_changed (pad);
+
+	pad->priv->clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+
+	if (pad->priv->sticky)
+		gtk_window_stick (pad_window);
+	else
+		gtk_window_unstick (pad_window);
+
+	xpad_pad_sync_title (pad);
+
+	gtk_widget_show_all (GTK_WIDGET (vbox));
+
+	gtk_widget_hide (pad->priv->toolbar);
+	xpad_pad_notify_has_toolbar (pad);
+
+	/* Set up signals */
+	gtk_widget_add_events (GTK_WIDGET (pad), GDK_BUTTON_PRESS_MASK | GDK_PROPERTY_CHANGE_MASK);
+	gtk_widget_add_events (pad->priv->toolbar, GDK_ALL_EVENTS_MASK);
+	g_signal_connect_swapped (pad->priv->textview, "button-press-event", G_CALLBACK (xpad_pad_button_press_event), pad);
+	g_signal_connect_swapped (pad->priv->textview, "popup-menu", G_CALLBACK (xpad_pad_popup_menu), pad);
+	g_signal_connect_swapped (pad->priv->toolbar, "size-allocate", G_CALLBACK (xpad_pad_toolbar_size_allocate), pad);
+	g_signal_connect (pad, "button-press-event", G_CALLBACK (xpad_pad_button_press_event), NULL);
+	g_signal_connect (pad, "configure-event", G_CALLBACK (xpad_pad_configure_event), NULL);
+	g_signal_connect (pad, "delete-event", G_CALLBACK (xpad_pad_delete_event), NULL);
+	g_signal_connect (pad, "popup-menu", G_CALLBACK (xpad_pad_popup_menu), NULL);
+	g_signal_connect (pad, "show", G_CALLBACK (xpad_pad_show), NULL);
+	g_signal_connect_swapped (gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)), "changed", G_CALLBACK (xpad_pad_text_changed), pad);
+
+	g_signal_connect (pad, "enter-notify-event", G_CALLBACK (xpad_pad_enter_notify_event), NULL);
+	g_signal_connect (pad, "leave-notify-event", G_CALLBACK (xpad_pad_leave_notify_event), NULL);
+
+	g_signal_connect_swapped (pad->priv->settings, "notify::has-decorations", G_CALLBACK (xpad_pad_notify_has_decorations), pad);
+	g_signal_connect_swapped (pad->priv->settings, "notify::has-toolbar", G_CALLBACK (xpad_pad_notify_has_toolbar), pad);
+	g_signal_connect_swapped (pad->priv->settings, "notify::autohide-toolbar", G_CALLBACK (xpad_pad_notify_autohide_toolbar), pad);
+	g_signal_connect_swapped (pad->priv->settings, "notify::has-scrollbar", G_CALLBACK (xpad_pad_notify_has_scrollbar), pad);
+	g_signal_connect_swapped (gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)), "notify::has-selection", G_CALLBACK (xpad_pad_notify_has_selection), pad);
+	g_signal_connect_swapped (pad->priv->clipboard, "owner-change", G_CALLBACK (xpad_pad_notify_clipboard_owner_changed), pad);
+
+	g_signal_connect_swapped (pad->priv->toolbar, "activate-new", G_CALLBACK (xpad_pad_spawn), pad);
+	g_signal_connect_swapped (pad->priv->toolbar, "activate-clear", G_CALLBACK (xpad_pad_clear), pad);
+	g_signal_connect_swapped (pad->priv->toolbar, "activate-close", G_CALLBACK (xpad_pad_close), pad);
+	g_signal_connect_swapped (pad->priv->toolbar, "activate-undo", G_CALLBACK (xpad_pad_undo), pad);
+	g_signal_connect_swapped (pad->priv->toolbar, "activate-redo", G_CALLBACK (xpad_pad_redo), pad);
+	g_signal_connect_swapped (pad->priv->toolbar, "activate-cut", G_CALLBACK (xpad_pad_cut), pad);
+	g_signal_connect_swapped (pad->priv->toolbar, "activate-copy", G_CALLBACK (xpad_pad_copy), pad);
+	g_signal_connect_swapped (pad->priv->toolbar, "activate-paste", G_CALLBACK (xpad_pad_paste), pad);
+	g_signal_connect_swapped (pad->priv->toolbar, "activate-delete", G_CALLBACK (xpad_pad_delete), pad);
+	g_signal_connect_swapped (pad->priv->toolbar, "activate-properties", G_CALLBACK (xpad_pad_open_properties), pad);
+	g_signal_connect_swapped (pad->priv->toolbar, "activate-preferences", G_CALLBACK (xpad_pad_open_preferences), pad);
+	g_signal_connect_swapped (pad->priv->toolbar, "activate-quit", G_CALLBACK (xpad_pad_close_all), pad);
+
+	g_signal_connect_swapped (pad->priv->toolbar, "popup", G_CALLBACK (menu_popup), pad);
+	g_signal_connect_swapped (pad->priv->toolbar, "popdown", G_CALLBACK (menu_popdown), pad);
+
+	g_signal_connect_swapped (pad->priv->menu, "deactivate", G_CALLBACK (menu_popdown), pad);
+	g_signal_connect_swapped (pad->priv->highlight_menu, "deactivate", G_CALLBACK (menu_popdown), pad);
+}
+
+static void
+xpad_pad_dispose (GObject *object)
+{
+	XpadPad *pad = XPAD_PAD (object);
+
+	if (pad->priv->group) {
+		g_object_unref(pad->priv->group);
+		pad->priv->group = NULL;
+	}
+
+	if (GTK_IS_WIDGET(pad->priv->menu)) {
+		gtk_widget_destroy (pad->priv->menu);
+		pad->priv->menu = NULL;
+	}
+
+	if (GTK_IS_WIDGET(pad->priv->highlight_menu)) {
+		gtk_widget_destroy (pad->priv->highlight_menu);
+		pad->priv->highlight_menu = NULL;
+	}
+
+	if (XPAD_IS_PAD_PROPERTIES (pad->priv->properties)) {
+		gtk_widget_destroy (pad->priv->properties);
+		pad->priv->properties = NULL;
+	}
+
+	gtk_clipboard_clear (pad->priv->clipboard);
+
+	/* For some reason the toolbar handler does not get automatically disconnected (or not at the right moment), leading to errors after deleting a pad. This manual disconnect prevents this error. */
+	if (XPAD_IS_TOOLBAR (pad->priv->toolbar)) {
+		g_signal_handlers_disconnect_matched (pad->priv->toolbar, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pad);
+		gtk_widget_destroy(pad->priv->toolbar);
+		pad->priv->toolbar = NULL;
+	}
+
+	G_OBJECT_CLASS (xpad_pad_parent_class)->dispose (object);
+}
+
+static void
+xpad_pad_finalize (GObject *object)
+{
+	XpadPad *pad = XPAD_PAD (object);
+
+	if (pad->priv->settings) {
+		g_signal_handlers_disconnect_matched (pad->priv->settings, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pad);
+		g_object_unref(pad->priv->settings);
+		pad->priv->settings = NULL;
+	}
+
+	g_free (pad->priv->infoname);
+	g_free (pad->priv->contentname);
+	
+	G_OBJECT_CLASS (xpad_pad_parent_class)->finalize (object);
+}
+
+void
+xpad_pad_notify_has_selection (XpadPad *pad)
+{
+	g_return_if_fail (pad);
+
+	GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
+	gboolean has_selection = gtk_text_buffer_get_has_selection (buffer);
+
+	XpadToolbar *toolbar = XPAD_TOOLBAR (pad->priv->toolbar);
+	if (toolbar == NULL)
+		return;
+
+	xpad_toolbar_enable_cut_button (toolbar, has_selection);
+	xpad_toolbar_enable_copy_button (toolbar, has_selection);
+}
+
+void
+xpad_pad_notify_clipboard_owner_changed (XpadPad *pad)
+{
+	g_return_if_fail (pad);
+
+	/* safe cast to toolbar */
+	if (XPAD_IS_TOOLBAR (pad->priv->toolbar)) {
+		XpadToolbar *toolbar = XPAD_TOOLBAR (pad->priv->toolbar);
+		g_return_if_fail (toolbar);
+
+		GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+		xpad_toolbar_enable_paste_button (toolbar, gtk_clipboard_wait_is_text_available (clipboard));
+	}
+}
+
+void
+xpad_pad_notify_undo_redo_changed (XpadPad *pad)
+{
+	g_return_if_fail (pad);
+
+	XpadTextBuffer *buffer = NULL;
+	buffer = XPAD_TEXT_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview)));
+	g_return_if_fail (buffer);
+
+	XpadToolbar *toolbar = NULL;
+	toolbar = XPAD_TOOLBAR (pad->priv->toolbar);
+	g_return_if_fail (toolbar);
+
+	xpad_toolbar_enable_undo_button (toolbar, xpad_text_buffer_undo_available (buffer));
+	xpad_toolbar_enable_redo_button (toolbar, xpad_text_buffer_redo_available (buffer));
+}
+
+void
+xpad_pad_close (XpadPad *pad)
+{
+	gtk_widget_hide (GTK_WIDGET (pad));
+	
+	/*
+	 * If no tray and this is the last pad, we don't want to record this
+	 * pad as closed, we want to start with just this pad next open.  So
+	 * quit before we record.
+	 */
+	if (!xpad_tray_is_open () &&
+		 xpad_pad_group_num_visible_pads (pad->priv->group) == 0)
+	{
+		xpad_app_quit ();
+		return;
+	}
+	
+	if (pad->priv->properties)
+		gtk_widget_destroy (pad->priv->properties);
+	
+	xpad_pad_save_info (pad);
+	
+	g_signal_emit (pad, signals[CLOSED], 0);
+}
+
+void
+xpad_pad_toggle(XpadPad *pad)
+{
+	if (gtk_widget_get_visible (GTK_WIDGET(pad)))
+		xpad_pad_close (pad);
+	else
+		gtk_widget_show (GTK_WIDGET (pad));
+}
+
 void xpad_pad_append_pad_titles_to_menu (GtkWidget *menu)
 {
 	GSList *pads, *l;
@@ -1782,114 +1818,75 @@
 	g_slist_free (pads);
 }
 
-static GtkWidget *
-menu_get_popup_highlight (XpadPad *pad, GtkAccelGroup *accel_group)
-{
-	GtkWidget *menu, *item;
-	
-	menu = gtk_menu_new ();
-	gtk_menu_set_accel_group (GTK_MENU (menu), accel_group);
-	
-	MENU_ADD (_("Cu_t"), "edit-cut", 0, 0, xpad_pad_cut);
-	MENU_ADD (_("_Copy"), "edit-copy", 0, 0, xpad_pad_copy);
-	MENU_ADD (_("_Paste"), "edit-paste", 0, 0, xpad_pad_paste);
-	g_object_set_data (G_OBJECT (menu), "paste", item);
-	MENU_ADD_SEP ();
-	MENU_ADD (_("_Bold"), "format-text-bold", GDK_KEY_b, GDK_CONTROL_MASK, menu_bold);	
-	MENU_ADD (_("_Italic"), "format-text-italic", GDK_KEY_i, GDK_CONTROL_MASK, menu_italic);	
-	MENU_ADD (_("_Underline"), "format-text-underline", GDK_KEY_u, GDK_CONTROL_MASK, menu_underline);
-	MENU_ADD (_("_Strikethrough"), "format-text-strikethrough", 0, 0, menu_strikethrough);	
-	
-	gtk_widget_show_all (menu);
-	
-	return menu;
-}
-
-static void
-menu_prep_popup_highlight (XpadPad *pad, GtkWidget *menu)
-{
-	/* A dirty way to silence the compiler for these unused variables. */
-	(void) pad;
-
-	GtkWidget *item;
-	GtkClipboard *clipboard;
-	
-	clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-	
-	item = g_object_get_data (G_OBJECT (menu), "paste");
-	if (item)
-		gtk_widget_set_sensitive (item, gtk_clipboard_wait_is_text_available (clipboard));
-}
-
-static void
-menu_popup (XpadPad *pad)
-{
-	g_signal_handlers_block_matched (pad, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, (gpointer) xpad_pad_leave_notify_event, NULL);
-	pad->priv->toolbar_timeout = 0;
-}
-
-static void
-menu_popdown (XpadPad *pad)
-{
-	cairo_rectangle_int_t rect;
-
-	/* We must check if we disabled off of pad and start the timeout if so. */
-	rect.x = 10;
-	rect.y = 10;
-	rect.width = 1;
-	rect.height = 1;
-	
-	if (!pad->priv->toolbar_timeout && !gtk_widget_intersect (GTK_WIDGET (pad), &rect, NULL))
-		pad->priv->toolbar_timeout = g_timeout_add (1000, (GSourceFunc) toolbar_timeout, pad);
-
-	g_signal_handlers_unblock_matched (pad, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, (gpointer) xpad_pad_leave_notify_event, NULL);
-}
-
-static void
-xpad_pad_popup (XpadPad *pad, GdkEventButton *event)
-{
-	GtkTextBuffer *buffer;
-	GtkWidget *menu;
-	
-	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (pad->priv->textview));
-	
-	if (gtk_text_buffer_get_selection_bounds (buffer, NULL, NULL))
-	{
-		menu = pad->priv->highlight_menu;
-		menu_prep_popup_highlight (pad, menu);
-	}
-	else
-	{
-		menu = pad->priv->menu;
-		menu_prep_popup_no_highlight (pad, menu);
-	}
-
-	if (!menu)
-		return;
-
-	menu_popup (pad);
-	
-	if (event)
-		gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, event->time);
-	else
-		gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time ());
-}
-
 /* These functions below are used to reduce the amounts of writes, hence improve the performance. */
 void xpad_pad_save_content_delayed (XpadPad *pad)
 {
-   pad->priv->unsaved_content = TRUE;
-   xpad_periodic_save_content_delayed (pad);
+	pad->priv->unsaved_content = TRUE;
+	xpad_periodic_save_content_delayed (pad);
 }
+
 void xpad_pad_save_info_delayed (XpadPad *pad)
 {
-   pad->priv->unsaved_info = TRUE;
-   xpad_periodic_save_info_delayed (pad);
+	pad->priv->unsaved_info = TRUE;
+	xpad_periodic_save_info_delayed (pad);
 }
+
 void xpad_pad_save_unsaved (XpadPad *pad)
 {
-   if (pad->priv->unsaved_content)
-      xpad_pad_save_content (pad);
-   if (pad->priv->unsaved_info)
-	   xpad_pad_save_info (pad);
+	if (pad->priv->unsaved_content)
+		xpad_pad_save_content (pad);
+	if (pad->priv->unsaved_info)
+		xpad_pad_save_info (pad);
+}
+
+/* Class pad - constructor */
+static void
+xpad_pad_class_init (XpadPadClass *klass)
+{
+	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+	gobject_class->constructed = xpad_pad_constructed;
+	gobject_class->set_property = xpad_pad_set_property;
+	gobject_class->get_property = xpad_pad_get_property;
+	gobject_class->dispose = xpad_pad_dispose;
+	gobject_class->finalize = xpad_pad_finalize;
+
+	signals[CLOSED] =
+		g_signal_new ("closed",
+			      G_OBJECT_CLASS_TYPE (gobject_class),
+			      G_SIGNAL_RUN_FIRST,
+			      G_STRUCT_OFFSET (XpadPadClass, closed),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__VOID,
+			      G_TYPE_NONE,
+			      0);
+
+	/* Properties */
+	obj_prop[PROP_GROUP] = g_param_spec_pointer ("group", "Pad group", "Pad group for this pad", G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+	obj_prop[PROP_SETTINGS] = g_param_spec_pointer ("settings", "Xpad settings", "Xpad global settings", G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+
+	g_object_class_install_properties (gobject_class, N_PROPERTIES, obj_prop);
+}
+
+/* Class pad - initializer */
+static void
+xpad_pad_init (XpadPad *pad)
+{
+	pad->priv = xpad_pad_get_instance_private (pad);
+
+	pad->priv->x = 0;
+	pad->priv->y = 0;
+	pad->priv->location_valid = FALSE;
+	pad->priv->infoname = NULL;
+	pad->priv->contentname = NULL;
+	pad->priv->textview = NULL;
+	pad->priv->scrollbar = NULL;
+	pad->priv->toolbar = NULL;
+	pad->priv->toolbar_timeout = 0;
+	pad->priv->toolbar_height = 0;
+	pad->priv->toolbar_expanded = FALSE;
+	pad->priv->toolbar_pad_resized = TRUE;
+	pad->priv->properties = NULL;
+	pad->priv->unsaved_content = FALSE;
+	pad->priv->unsaved_info = FALSE;
 }
 
=== modified file 'src/xpad-periodic.c'
--- src/xpad-periodic.c	2014-06-19 09:08:49 +0000
+++ src/xpad-periodic.c	2014-09-08 13:22:52 +0000
@@ -20,246 +20,269 @@
 */
 
 #include "../config.h"
+
 #include "xpad-periodic.h"
-#include <glib/gi18n.h>
+
 #include <stdlib.h>
 #include <string.h>
 
+#include <glib/gi18n.h>
+
 #ifdef SHOW_DEBUG
 #   define G_PRINT_DBG g_print
 #else
 #   define G_PRINT_DBG gprint_ignore
 #endif
 
-#define TIMEOUT_SECONDS     4
+#define TIMEOUT_SECONDS	4
 
 struct sigref_ {
-    const char *        signame;
-    XpadPeriodicFunc    func_ptr;
-    gpointer            data;
+	const char        *signame;
+	XpadPeriodicFunc  func_ptr;
+	gpointer          data;
 };
 
 typedef struct sigref_ Xpadsigref;
 
 typedef struct {
-    /************************
-    count = a clock tick count
-    after_id = the timeout id
-    ************************/
-    int                 count;
-    int                 after_id;
+	/************************
+	count = a clock tick count
+	after_id = the timeout id
+	************************/
+	int count;
+	int after_id;
 
-    /************************
-    template = a list of signal names and function pointers
-    template_len = the length of 'template'
-    sigs = a list of signal names, function pointers and data
-    sigs_len = the length of 'sigs'
-    ************************/
-    Xpadsigref *        template;
-    int                 template_len;
-    Xpadsigref *        sigs;
-    int                 sigs_len;
+	/************************
+	template = a list of signal names and function pointers
+	template_len = the length of 'template'
+	sigs = a list of signal names, function pointers and data
+	sigs_len = the length of 'sigs'
+	************************/
+	Xpadsigref *template;
+	int        template_len;
+	Xpadsigref *sigs;
+	int        sigs_len;
 } XpadPeriodic;
 
-
-/* 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 gboolean str_equal (const char *, const char *);
 
 /* global variables */
 static XpadPeriodic xpptr [1];
 
 /* Functions start here */
 
-gboolean xpad_periodic_init (void)
-{
-    memset(xpptr, 0, sizeof(*xpptr));
-    xpptr->after_id = (gint) g_timeout_add_seconds(TIMEOUT_SECONDS, xppd_intercept, xpptr);
-
-    /* Allocate space for the signal references. */
-    int tlen = xpptr->template_len = 5;
-    int slen = xpptr->sigs_len = 20;
-    xpptr->template = g_malloc0((gsize) tlen * sizeof(Xpadsigref));
-    xpptr->sigs = g_malloc0((gsize) slen * sizeof(Xpadsigref));
-
-    return TRUE;
-}
-
-void    xpad_periodic_close (void)
-{
-    if (xpptr->after_id) { g_source_remove((guint) xpptr->after_id); }
-    /* Free the signal references memory. */
-    g_free(xpptr->template);
-    g_free(xpptr->sigs);
-    /* Signal that this structure is now cleared. */
-    memset(xpptr, 0, sizeof(*xpptr));
-}
-
-/************************
-xppd_intercept - intercepts a timer tick
-
-    This function intercepts a timer tick and iterates
-    over the signal references. Any signal references that
-    are fully stocked with signal names, function pointers
-    and data pointers are invoked.
-
-    IOW (In other words), the function pointer is called with the
-    right data pointer.
-************************/
-gint xppd_intercept (gpointer cdata)
+void
+xpad_periodic_close (void)
+{
+	if (xpptr->after_id) { g_source_remove((guint) xpptr->after_id); }
+	/* Free the signal references memory. */
+	g_free(xpptr->template);
+	g_free(xpptr->sigs);
+	/* Signal that this structure is now cleared. */
+	memset(xpptr, 0, sizeof(*xpptr));
+}
+
+	/************************
+	xppd_intercept - intercepts a timer tick
+
+	This function intercepts a timer tick and iterates
+	over the signal references. Any signal references that
+	are fully stocked with signal names, function pointers
+	and data pointers are invoked.
+
+	IOW (In other words), the function pointer is called with the
+	right data pointer.
+	************************/
+gint
+xppd_intercept (gpointer cdata)
 {
 	/* A dirty way to silence the compiler for these unused variables. */
 	(void) cdata;
 
-    int cnt=0;
-    XpadPeriodicFunc fnptr=0;
-    xpptr->count++; /* increment tick count */
-
-    G_PRINT_DBG("xppd tick: %4d\n", xpptr->count);
-
-    for (cnt = 0; cnt < xpptr->sigs_len; ++cnt) {
-        Xpadsigref * sig_item = xpptr->sigs + cnt;
-        if (sig_item->signame && sig_item->func_ptr && sig_item->data) {
-            fnptr = sig_item->func_ptr;
-            (*fnptr)(sig_item->data);
-            G_PRINT_DBG("invoked %s : %p : %p\n", sig_item->signame,
-                sig_item->func_ptr, sig_item->data);
-            memset(sig_item, 0, sizeof(*sig_item));
-        }
-    }
-
-    return TRUE;
-}
-
-/************************
-    Xpad_periodic_set_callback():
-    This function prepares a callback function to be invoked
-    for an event name such as "save-content" or "save-info".
-
-    cbname :        event name (or callback function name)
-    func :          function address
-
-    Returns true if a callback was registered.
-************************/
-gboolean    xpad_periodic_set_callback (
-    const char * cbname,
-    XpadPeriodicFunc func)
-{
-    int index = 0;
-    gboolean isdone=FALSE;
-    if (0 == func) { return FALSE; }
-    if (0 == cbname || 0==*cbname) { return FALSE; }
-
-    /* Find an open slot for signal (callback) references and
-    insert this one. */
-    for (index = 0; index < xpptr->template_len; ++index) {
-        /* Store a pointer to the current signal item. */
-        Xpadsigref * sig_item = xpptr->template + index;
-
-        /* If it's empty, set it. */
-        if (0 == sig_item->signame) {
-            sig_item->signame = cbname;
-            sig_item->func_ptr = func;
-            isdone = TRUE;
-            break;
-        }
-    }
-
-    if (! isdone) {
-        g_print("Failed to install signal callback: %s\n", cbname);
-        exit(1);
-    }
-
-    return isdone;
-}
-
-void xpad_periodic_save_info_delayed (void * xpad_pad)
-{
-    xpad_periodic_signal("save-info", xpad_pad);
-}
-
-void xpad_periodic_save_content_delayed (void * xpad_pad)
-{
-    xpad_periodic_signal("save-content", 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;
-    Xpadsigref * sig_item = 0;
-
-    if (0 == cbname || 0==*cbname) { return; }
-    if (0 == xpad_pad) { return; }
-
-    /* Get the callback function address */
-    for (tnx = 0; tnx < xpptr->template_len; ++tnx) {
-        if (str_equal(xpptr->template[tnx].signame, cbname)) {
-            func_ptr = xpptr->template[tnx].func_ptr;
-            break;
-        }
-    }
-
-    /* If there is no callback address, we can't continue. */
-    if (! func_ptr) {
-        xpad_periodic_error_exit("Can't find signal function address: %s\n", cbname);
-    }
-
-    /* Check that this event is not already present. 
-    If it is present, don't do anything more. */
-    for (snx = 0; snx < xpptr->sigs_len; ++snx) {
-        sig_item = xpptr->sigs + snx;
-        if (str_equal(sig_item->signame,cbname) &&
-            (xpad_pad == sig_item->data)) {
-            G_PRINT_DBG("Already got signal: %s\n", cbname);
-            return;
-        }
-    }
-
-    /* Find a suitable slot for the signal reference and set it. */
-    for (snx = 0; snx < xpptr->sigs_len; ++snx) {
-        gint doadd = 0;
-        sig_item = xpptr->sigs + snx;
-
-        doadd += (str_equal(sig_item->signame, cbname));
-        doadd += (0 == sig_item->signame);
-
-        if (doadd) {
-            sig_item->signame = cbname;
-            sig_item->func_ptr = func_ptr;
-            sig_item->data = xpad_pad;
-            isdone = TRUE;
-            break;
-        }
-    }
-
-    if (! isdone) {
-        xpad_periodic_error_exit("Could not schedule event: %s\n", cbname);
-    }
-}
-
-gboolean str_equal (const char * s1, const char * s2) {
-    if (0 == s1 || 0==s2) { return FALSE; }
-    if (s1 == s2) { return TRUE; }
-    return (0 == strcmp(s1, s2));
-}
-
-gint gprint_ignore (const char * fmt, ...)
+	int cnt=0;
+	XpadPeriodicFunc fnptr=0;
+	xpptr->count++; /* increment tick count */
+
+	G_PRINT_DBG ("xppd tick: %4d\n", xpptr->count);
+
+	for (cnt = 0; cnt < xpptr->sigs_len; ++cnt)
+	{
+		Xpadsigref * sig_item = xpptr->sigs + cnt;
+		if (sig_item->signame && sig_item->func_ptr && sig_item->data)
+		{
+			fnptr = sig_item->func_ptr;
+			(*fnptr)(sig_item->data);
+			G_PRINT_DBG ("invoked %s : %p : %p\n", sig_item->signame,
+				     sig_item->func_ptr, sig_item->data);
+			memset(sig_item, 0, sizeof(*sig_item));
+		}
+	}
+
+	return TRUE;
+}
+
+	/************************
+	Xpad_periodic_set_callback():
+	This function prepares a callback function to be invoked
+	for an event name such as "save-content" or "save-info".
+
+	cbname :        event name (or callback function name)
+	func :          function address
+
+	Returns true if a callback was registered.
+	************************/
+gboolean
+xpad_periodic_set_callback (const char       * cbname,
+			    XpadPeriodicFunc func)
+{
+	int index = 0;
+	gboolean isdone=FALSE;
+	if (0 == func) { return FALSE; }
+	if (0 == cbname || 0==*cbname) { return FALSE; }
+
+	/* Find an open slot for signal (callback) references and
+	insert this one. */
+	for (index = 0; index < xpptr->template_len; ++index)
+	{
+		/* Store a pointer to the current signal item. */
+		Xpadsigref * sig_item = xpptr->template + index;
+
+		/* If it's empty, set it. */
+		if (0 == sig_item->signame)
+		{
+			sig_item->signame = cbname;
+			sig_item->func_ptr = func;
+			isdone = TRUE;
+			break;
+		}
+	}
+
+	if (! isdone)
+	{
+		g_print ("Failed to install signal callback: %s\n", cbname);
+		exit (1);
+	}
+
+	return isdone;
+}
+
+gboolean
+xpad_periodic_init (void)
+{
+	memset(xpptr, 0, sizeof(*xpptr));
+	xpptr->after_id = (gint) g_timeout_add_seconds(TIMEOUT_SECONDS, xppd_intercept, xpptr);
+
+	/* Allocate space for the signal references. */
+	int tlen = xpptr->template_len = 5;
+	int slen = xpptr->sigs_len = 20;
+	xpptr->template = g_malloc0((gsize) tlen * sizeof(Xpadsigref));
+	xpptr->sigs = g_malloc0((gsize) slen * sizeof(Xpadsigref));
+
+	return TRUE;
+}
+
+static void
+xpad_periodic_error_exit (const char * fmt, ...)
+{
+	va_list app;
+	va_start (app, fmt);
+	g_print (fmt, app);
+	va_end (app);
+	exit (1);
+}
+
+static void
+xpad_periodic_signal (const char * cbname,
+		      void       * xpad_pad)
+{
+	int isdone = 0;
+	int tnx=0, snx=0;
+	XpadPeriodicFunc func_ptr = 0;
+	Xpadsigref * sig_item = 0;
+
+	if (0 == cbname || 0==*cbname) { return; }
+	if (0 == xpad_pad) { return; }
+
+	/* Get the callback function address */
+	for (tnx = 0; tnx < xpptr->template_len; ++tnx)
+	{
+		if (str_equal (xpptr->template[tnx].signame, cbname))
+		{
+			func_ptr = xpptr->template[tnx].func_ptr;
+			break;
+		}
+	}
+
+	/* If there is no callback address, we can't continue. */
+	if (! func_ptr)
+	{
+		xpad_periodic_error_exit ("Can't find signal function address: %s\n", cbname);
+	}
+
+	/* Check that this event is not already present. 
+	If it is present, don't do anything more. */
+	for (snx = 0; snx < xpptr->sigs_len; ++snx)
+	{
+		sig_item = xpptr->sigs + snx;
+		if (str_equal(sig_item->signame,cbname) &&
+		(xpad_pad == sig_item->data))
+		{
+			G_PRINT_DBG ("Already got signal: %s\n", cbname);
+			return;
+		}
+	}
+
+	/* Find a suitable slot for the signal reference and set it. */
+	for (snx = 0; snx < xpptr->sigs_len; ++snx)
+	{
+		gint doadd = 0;
+		sig_item = xpptr->sigs + snx;
+
+		doadd += (str_equal (sig_item->signame, cbname));
+		doadd += (0 == sig_item->signame);
+
+		if (doadd)
+		{
+			sig_item->signame = cbname;
+			sig_item->func_ptr = func_ptr;
+			sig_item->data = xpad_pad;
+			isdone = TRUE;
+			break;
+		}
+	}
+
+	if (! isdone)
+	{
+		xpad_periodic_error_exit ("Could not schedule event: %s\n", cbname);
+	}
+}
+
+void
+xpad_periodic_save_info_delayed (void * xpad_pad)
+{
+	xpad_periodic_signal ("save-info", xpad_pad);
+}
+
+void
+xpad_periodic_save_content_delayed (void * xpad_pad)
+{
+	xpad_periodic_signal ("save-content", xpad_pad);
+}
+
+gboolean 
+str_equal (const char * s1,
+	   const char * s2)
+{
+	if (0 == s1 || 0==s2) { return FALSE; }
+	if (s1 == s2) { return TRUE; }
+	return (0 == strcmp(s1, s2));
+}
+
+gint
+gprint_ignore (const char * fmt, ...)
 {
 	/* A dirty way to silence the compiler for these unused variables. */
 	(void) fmt;
 
-    return 0;
-}
-
-static void xpad_periodic_error_exit (const char * fmt, ...) {
-    va_list app;
-    va_start(app, fmt);
-    g_print(fmt, app);
-    va_end(app);
-    exit(1);
+	return 0;
 }
 
=== modified file 'src/xpad-periodic.h'
--- src/xpad-periodic.h	2014-06-19 09:08:49 +0000
+++ src/xpad-periodic.h	2014-09-08 13:22:52 +0000
@@ -19,11 +19,13 @@
 
 */
 
-#ifndef XPAD_PERIODIC_H
-#define XPAD_PERIODIC_H
+#ifndef __XPAD_PERIODIC_H__
+#define __XPAD_PERIODIC_H__
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 typedef void (*XpadPeriodicFunc)(void *);
 
 /* Callback function codes: save-content, save-info */
@@ -51,4 +53,6 @@
 void	xpad_periodic_save_content_delayed (void * xpad_pad);
 void	xpad_periodic_save_info_delayed (void * xpad_pad);
 
-#endif /* XPAD_PERIODIC_H */
+G_END_DECLS
+
+#endif /* __XPAD_PERIODIC_H__ */
 
=== modified file 'src/xpad-preferences.c'
--- src/xpad-preferences.c	2014-07-20 16:36:07 +0000
+++ src/xpad-preferences.c	2014-09-08 13:22:52 +0000
@@ -20,10 +20,12 @@
 */
 
 #include "../config.h"
+
 #include "xpad-preferences.h"
+#include "xpad-app.h"
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include "xpad-app.h"
 
 struct XpadPreferencesPrivate 
 {
@@ -36,12 +38,12 @@
 	GtkWidget *fontbutton;
 	GtkWidget *colorcheck;
 	GtkWidget *anticolorcheck;
-	GtkWidget *colorbox;	
+	GtkWidget *colorbox;
 	GtkWidget *textbutton;
 	GtkWidget *backbutton;
 	GtkWidget *autostart_xpad;
 	GtkWidget *autostart_wait_systray;
-	GtkWidget *autostart_delay;	
+	GtkWidget *autostart_delay;
 	GtkWidget *autostart_new_pad;
 	GtkWidget *autostart_sticky;
 	GtkWidget *autostart_display_pads;
@@ -50,7 +52,7 @@
 	GtkWidget *editcheck;
 	GtkWidget *confirmcheck;
 
-	gulong fontcheck_handler;	
+	gulong fontcheck_handler;
 	gulong font_handler;
 	gulong colorcheck_handler;
 	gulong text_handler;
@@ -60,7 +62,7 @@
 	gulong autostart_delay_handler;
 	gulong autostart_new_pad_handler;
 	gulong autostart_sticky_handler;
-	gulong autostart_display_pads_handler;	
+	gulong autostart_display_pads_handler;
 	gulong tray_enabled_handler;
 	gulong tray_click_handler;
 	gulong editcheck_handler;
@@ -83,51 +85,13 @@
 
 G_DEFINE_TYPE_WITH_PRIVATE (XpadPreferences, xpad_preferences, GTK_TYPE_DIALOG)
 
-static void xpad_preferences_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void xpad_preferences_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void xpad_preferences_constructed (GObject *object);
-static void xpad_preferences_finalize (GObject *object);
-static void xpad_preferences_response (GtkDialog *dialog, gint response);
-
-static void change_font_check (GtkToggleButton *button, XpadPreferences *pref);
-static void change_font_face (GtkFontButton *button, XpadPreferences *pref);
-static void change_color_check (GtkToggleButton *button, XpadPreferences *pref);
-static void change_text_color (GtkColorChooser *chooser, XpadPreferences *pref);
-static void change_back_color (GtkColorChooser *chooser, XpadPreferences *pref);
-static void change_autostart_xpad (GtkToggleButton *button, XpadPreferences *pref);
-static void change_autostart_wait_systray (GtkToggleButton *button, XpadPreferences *pref);
-static void change_autostart_delay (GtkComboBox *box, XpadPreferences *pref);
-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_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);
-
-static GtkWidget * create_label (const gchar *label_text);
-
 static GtkWidget *_xpad_preferences = NULL;
 
 enum
 {
-  PROP_0,
-  PROP_SETTINGS,
-  N_PROPERTIES
+	PROP_0,
+	PROP_SETTINGS,
+	N_PROPERTIES
 };
 
 static GParamSpec *obj_prop[N_PROPERTIES] = { NULL, };
@@ -144,25 +108,447 @@
 	gtk_window_present (GTK_WINDOW (_xpad_preferences));
 }
 
-static void
-xpad_preferences_class_init (XpadPreferencesClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-	gobject_class->constructed = xpad_preferences_constructed;
-	gobject_class->set_property = xpad_preferences_set_property;
-	gobject_class->get_property = xpad_preferences_get_property;
-	gobject_class->finalize = xpad_preferences_finalize;
-
-	obj_prop[PROP_SETTINGS] = g_param_spec_pointer ("settings", "Xpad settings", "Xpad global settings", G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
-
-	g_object_class_install_properties (gobject_class, N_PROPERTIES, obj_prop);
-}	
-
-static void
-xpad_preferences_init (XpadPreferences *pref)
-{
-	pref->priv = xpad_preferences_get_instance_private (pref);
+static GtkWidget * create_label (const gchar *label_text)
+{
+	GtkWidget *label = GTK_WIDGET (g_object_new (GTK_TYPE_LABEL,
+		"label", g_strconcat ("<b>", label_text, "</b>", NULL),
+		"use-markup", TRUE,
+		"xalign", 0.0,
+		NULL));
+	return label;
+}
+
+static void
+xpad_preferences_set_property (GObject      *object,
+			       guint        prop_id,
+			       const GValue *value,
+			       GParamSpec   *pspec)
+{
+	XpadPreferences *pref = XPAD_PREFERENCES (object);
+
+	switch (prop_id)
+	{
+	case PROP_SETTINGS:
+		pref->priv->settings = g_value_get_pointer (value);
+		g_object_ref (pref->priv->settings);
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+xpad_preferences_get_property (GObject    *object,
+			       guint      prop_id,
+			       GValue     *value,
+			       GParamSpec *pspec)
+{
+	XpadPreferences *pref = XPAD_PREFERENCES (object);
+
+	switch (prop_id)
+	{
+	case PROP_SETTINGS:
+		g_value_set_pointer (value, pref->priv->settings);
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+xpad_preferences_finalize (GObject *object)
+{
+	XpadPreferences *pref = XPAD_PREFERENCES (object);
+
+	if (pref->priv->settings)
+		g_signal_handlers_disconnect_matched (pref->priv->settings, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pref);
+
+	G_OBJECT_CLASS (xpad_preferences_parent_class)->finalize (object);
+}
+
+static void
+xpad_preferences_response (GtkDialog *dialog,
+			   gint      response)
+{
+	if (response == GTK_RESPONSE_CLOSE)
+		gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static void
+change_font_check (GtkToggleButton *button,
+		   XpadPreferences *pref)
+{
+	g_signal_handler_block (pref->priv->settings, pref->priv->notify_font_handler);
+	if (!gtk_toggle_button_get_active (button))
+		g_object_set (pref->priv->settings, "fontname", NULL, NULL);
+	else
+		g_object_set (pref->priv->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));
+	g_signal_handler_unblock (pref->priv->settings, pref->priv->notify_font_handler);
+}
+
+static void
+change_font_face (GtkFontButton   *button,
+		  XpadPreferences *pref)
+{
+	g_signal_handler_block (pref->priv->settings, pref->priv->notify_font_handler);
+	g_object_set (pref->priv->settings, "fontname", gtk_font_button_get_font_name (button), NULL);
+	g_signal_handler_unblock (pref->priv->settings, pref->priv->notify_font_handler);
+}
+
+static void
+change_color_check (GtkToggleButton *button,
+		    XpadPreferences *pref)
+{
+	g_signal_handler_block (pref->priv->settings, pref->priv->notify_text_handler);
+	g_signal_handler_block (pref->priv->settings, pref->priv->notify_back_handler);
+
+	if (!gtk_toggle_button_get_active (button))
+		g_object_set (pref->priv->settings, "text-color", NULL, "back-color", NULL, NULL);
+	else
+	{
+		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 (pref->priv->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 (pref->priv->settings, pref->priv->notify_text_handler);
+	g_signal_handler_unblock (pref->priv->settings, pref->priv->notify_back_handler);
+}
+
+static void
+change_text_color (GtkColorChooser *chooser,
+		   XpadPreferences *pref)
+{
+	GdkRGBA text_color = {0, 0, 0, 0};
+	gtk_color_chooser_get_rgba (chooser, &text_color);
+
+	g_signal_handler_block (pref->priv->settings, pref->priv->notify_text_handler);
+	g_object_set (pref->priv->settings, "text-color", &text_color, NULL);
+	g_signal_handler_unblock (pref->priv->settings, pref->priv->notify_text_handler);
+}
+
+static void
+change_back_color (GtkColorChooser *chooser,
+		   XpadPreferences *pref)
+{
+	GdkRGBA back_color = {0, 0, 0, 0};
+	gtk_color_chooser_get_rgba (chooser, &back_color);
+
+	g_signal_handler_block (pref->priv->settings, pref->priv->notify_back_handler);
+	g_object_set (pref->priv->settings, "back-color", &back_color, NULL);
+	g_signal_handler_unblock (pref->priv->settings, pref->priv->notify_back_handler);
+}
+
+static void
+change_autostart_xpad (GtkToggleButton *button,
+		       XpadPreferences *pref)
+{
+	g_object_set (pref->priv->settings, "autostart-xpad", gtk_toggle_button_get_active (button), NULL);
+}
+
+static void
+change_autostart_wait_systray (GtkToggleButton *button,
+			       XpadPreferences *pref)
+{
+	GKeyFile *keyfile;
+	GKeyFileFlags flags;
+	GError *error = NULL;
+	char *filename;
+	gboolean wait_systray;
+
+	wait_systray = gtk_toggle_button_get_active (button);
+
+	/* Create a new GKeyFile object and a bitwise list of flags. */
+	keyfile = g_key_file_new ();
+	filename = g_strdup_printf ("%s/.config/autostart/xpad.desktop", g_get_home_dir());
+	flags = G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS;
+
+	/* Load the GKeyFile from xpad.desktop or show an error message. */
+	if (!g_key_file_load_from_file (keyfile, filename, flags, &error)) {
+		gchar *errtext;
+		errtext = g_strdup_printf (_("Could not load %s\n%s"), filename, error->message);
+		xpad_app_error (NULL, _("Error changing wait for systray setting"), errtext);
+		g_free (errtext);
+
+		gtk_toggle_button_set_active (button, !wait_systray);
+		return;
+	}
+
+	g_key_file_set_boolean (keyfile, "Desktop Entry", "X-LXQt-Need-Tray", wait_systray);
+
+	if (!g_key_file_save_to_file (keyfile, filename, &error)) {
+		gchar *errtext;
+		errtext = g_strdup_printf (_("Could not save %s\n%s"), filename, error->message);
+		xpad_app_error (NULL, _("Error changing wait for systray setting"), errtext);
+		g_free (errtext);
+
+		gtk_toggle_button_set_active (button, !wait_systray);
+		return;
+	}
+
+	g_signal_handler_block (pref->priv->settings, pref->priv->notify_autostart_wait_systray_handler);
+	g_object_set (pref->priv->settings, "autostart-wait-systray", wait_systray, NULL);
+	g_signal_handler_unblock (pref->priv->settings, pref->priv->notify_autostart_wait_systray_handler);
+}
+
+static void
+change_autostart_new_pad (GtkToggleButton *button,
+			  XpadPreferences *pref)
+{
+	g_signal_handler_block (pref->priv->settings, pref->priv->notify_autostart_new_pad_handler);
+	g_object_set (pref->priv->settings, "autostart-new-pad", gtk_toggle_button_get_active (button), NULL);
+	g_signal_handler_unblock (pref->priv->settings, pref->priv->notify_autostart_new_pad_handler);
+}
+
+static void
+change_autostart_sticky (GtkToggleButton *button,
+		         XpadPreferences *pref)
+{
+	g_signal_handler_block (pref->priv->settings, pref->priv->notify_autostart_sticky_handler);
+	g_object_set (pref->priv->settings, "autostart-sticky", gtk_toggle_button_get_active (button), NULL);
+	g_signal_handler_unblock (pref->priv->settings, pref->priv->notify_autostart_sticky_handler);
+}
+
+static void
+change_autostart_delay (GtkComboBox     *box,
+		        XpadPreferences *pref)
+{
+	g_signal_handler_block(pref->priv->settings, pref->priv->notify_autostart_delay_handler);
+	g_object_set (pref->priv->settings, "autostart-delay", (guint) gtk_combo_box_get_active (box), NULL);
+	g_signal_handler_unblock (pref->priv->settings, pref->priv->notify_autostart_delay_handler);
+}
+
+static void
+change_autostart_display_pads (GtkComboBox     *box,
+			       XpadPreferences *pref)
+{
+	g_signal_handler_block (pref->priv->settings, pref->priv->notify_autostart_display_pads_handler);
+	g_object_set (pref->priv->settings, "autostart-display-pads", (guint) gtk_combo_box_get_active (box), NULL);
+	g_signal_handler_unblock(pref->priv->settings, pref->priv->notify_autostart_display_pads_handler);
+}
+
+static void
+change_tray_enabled (GtkToggleButton *button,
+		     XpadPreferences *pref)
+{
+	g_object_set (pref->priv->settings, "tray-enabled", gtk_toggle_button_get_active (button), NULL);
+}
+
+static void
+change_tray_click (GtkComboBox     *box,
+		   XpadPreferences *pref)
+{
+	g_signal_handler_block(pref->priv->settings, pref->priv->notify_tray_click_handler);
+	g_object_set (pref->priv->settings, "tray-click-configuration", (guint) gtk_combo_box_get_active (box), NULL);
+	g_signal_handler_unblock (pref->priv->settings, pref->priv->notify_tray_click_handler);
+}
+
+static void
+change_edit_check (GtkToggleButton *button, XpadPreferences *pref)
+{
+	g_signal_handler_block (pref->priv->settings, pref->priv->notify_edit_handler);
+	g_object_set (pref->priv->settings, "edit-lock", gtk_toggle_button_get_active (button), NULL);
+	g_signal_handler_unblock (pref->priv->settings, pref->priv->notify_edit_handler);
+}
+
+static void
+change_confirm_check (GtkToggleButton *button,
+		      XpadPreferences *pref)
+{
+	g_signal_handler_block (pref->priv->settings, pref->priv->notify_confirm_handler);
+	g_object_set (pref->priv->settings, "confirm-destroy", gtk_toggle_button_get_active (button), NULL);
+	g_signal_handler_unblock (pref->priv->settings, pref->priv->notify_confirm_handler);
+}
+
+static void
+notify_fontname (XpadPreferences *pref)
+{
+	const gchar *fontname;
+	g_object_get (pref->priv->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);
+
+	if (fontname)
+	{
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->fontcheck), TRUE);
+		gtk_widget_set_sensitive (pref->priv->fontbutton, TRUE);
+		gtk_font_button_set_font_name (GTK_FONT_BUTTON (pref->priv->fontbutton), fontname);
+	}
+	else
+	{
+		gtk_widget_set_sensitive (pref->priv->fontbutton, FALSE);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->antifontcheck), TRUE);
+	}
+
+	g_signal_handler_unblock (pref->priv->fontcheck, pref->priv->fontcheck_handler);
+	g_signal_handler_unblock (pref->priv->fontbutton, pref->priv->font_handler);
+}
+
+static void
+notify_text_color (XpadPreferences *pref)
+{
+	const GdkRGBA *text_color;
+	g_object_get (pref->priv->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 (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), text_color);
+
+	}
+	else
+	{
+		gtk_widget_set_sensitive (pref->priv->colorbox, FALSE);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->anticolorcheck), TRUE);
+	}
+
+	g_signal_handler_unblock (pref->priv->colorcheck, pref->priv->colorcheck_handler);
+	g_signal_handler_unblock (pref->priv->textbutton, pref->priv->text_handler);
+}
+
+static void
+notify_back_color (XpadPreferences *pref)
+{
+	const GdkRGBA *back_color;
+	g_object_get (pref->priv->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 (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), back_color);
+	}
+	else
+	{
+		gtk_widget_set_sensitive (pref->priv->colorbox, FALSE);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->anticolorcheck), TRUE);
+	}
+
+	g_signal_handler_unblock (pref->priv->colorcheck, pref->priv->colorcheck_handler);
+	g_signal_handler_unblock (pref->priv->backbutton, pref->priv->back_handler);
+}
+
+static void
+notify_autostart_xpad (XpadPreferences *pref)
+{
+	gboolean value;
+	g_object_get (pref->priv->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 (pref->priv->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), value);
+	g_signal_handler_unblock (pref->priv->autostart_wait_systray, pref->priv->autostart_wait_systray_handler);
+}
+
+static void
+notify_autostart_new_pad (XpadPreferences *pref)
+{
+	gboolean value;
+	g_object_get (pref->priv->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), 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 (pref->priv->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), 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 (pref->priv->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 (pref->priv->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), 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 (pref->priv->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 (pref->priv->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)
+{
+	guint value;
+	g_object_get (pref->priv->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 (pref->priv->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), value);
+	g_signal_handler_unblock (pref->priv->editcheck, pref->priv->editcheck_handler);
+}
+
+static void
+notify_confirm (XpadPreferences *pref)
+{
+	gboolean value;
+	g_object_get (pref->priv->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), value);
+	g_signal_handler_unblock (pref->priv->confirmcheck, pref->priv->confirmcheck_handler);
 }
 
 static void xpad_preferences_constructed (GObject *object)
@@ -263,10 +649,10 @@
 	else
 	{
 		PangoFontDescription *font;
-		
+
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pref->priv->antifontcheck), TRUE);
 		gtk_widget_set_sensitive (pref->priv->fontbutton, FALSE);
-		
+
 		gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL, GTK_STYLE_PROPERTY_FONT, &font, NULL);
 		gtk_font_button_set_font_name (GTK_FONT_BUTTON (pref->priv->fontbutton), pango_font_description_to_string(font));
 		pango_font_description_free (font);
@@ -288,17 +674,17 @@
 		gtk_widget_set_sensitive (pref->priv->colorbox, FALSE);
 		gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (pref->priv->backbutton), &theme_background_color);
 	}
-	
+
 	alignment = gtk_alignment_new (1, 1, 1, 1);
 	gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0);
 	gtk_container_add (GTK_CONTAINER (alignment), pref->priv->colorbox);
-	
+
 	vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 6));
 
 	gtk_box_pack_start (vbox, pref->priv->antifontcheck, FALSE, FALSE, 0);
 	gtk_box_pack_start (vbox, GTK_WIDGET (font_hbox), FALSE, FALSE, 0);
 	gtk_box_pack_start (appearance_vbox, GTK_WIDGET (vbox), FALSE, FALSE, 0);
-	
+
 	vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 6));
 
 	gtk_box_pack_start (vbox, pref->priv->anticolorcheck, FALSE, FALSE, 0);
@@ -358,7 +744,7 @@
 	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();	
+	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));
@@ -482,7 +868,7 @@
 	pref->priv->notify_confirm_handler = g_signal_connect_swapped (pref->priv->settings, "notify::confirm-destroy", G_CALLBACK (notify_confirm), pref);
 	pref->priv->notify_tray_enabled_handler = g_signal_connect_swapped (pref->priv->settings, "notify::tray-enabled", G_CALLBACK (notify_tray_enabled), pref);
 	pref->priv->notify_tray_click_handler = g_signal_connect_swapped (pref->priv->settings, "notify::tray-click-configuration", G_CALLBACK(notify_tray_click), pref);
-	
+
 	g_object_unref (size_group_labels);
 
 	/* Initiliaze the GUI logic */
@@ -498,423 +884,23 @@
 	g_object_set (G_OBJECT (pref), "default-width", (gint) (req.height * 0.8), NULL);
 }
 
-static GtkWidget * create_label (const gchar *label_text) {
-	GtkWidget *label = GTK_WIDGET (g_object_new (GTK_TYPE_LABEL,
-		"label", g_strconcat ("<b>", label_text, "</b>", NULL),
-		"use-markup", TRUE,
-		"xalign", 0.0,
-		NULL));
-	return label;
-}
-
-static void
-xpad_preferences_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-{
-	XpadPreferences *pref = XPAD_PREFERENCES (object);
-
-	switch (prop_id)
-	{
-	case PROP_SETTINGS:
-		pref->priv->settings = g_value_get_pointer (value);
-		g_object_ref (pref->priv->settings);
-		break;
-
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-xpad_preferences_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-	XpadPreferences *pref = XPAD_PREFERENCES (object);
-
-	switch (prop_id)
-	{
-	case PROP_SETTINGS:
-		g_value_set_pointer (value, pref->priv->settings);
-		break;
-
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-xpad_preferences_finalize (GObject *object)
-{
-	XpadPreferences *pref = XPAD_PREFERENCES (object);
-
-	if (pref->priv->settings)
-		g_signal_handlers_disconnect_matched (pref->priv->settings, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pref);
-	
-	G_OBJECT_CLASS (xpad_preferences_parent_class)->finalize (object);
-}