GNOME.org
 

[gnome-color-manager] Revert "Update the Free Software Foundation address"

commit 3cc9af5da6cbd08d8e111d2ee30e12b0847c4a55
Author: Richard Hughes <richard hughsie com>
Date:   Wed Jan 27 16:36:09 2010 +0000

    Revert "Update the Free Software Foundation address"
    
    This reverts commit eb161b3497e4c2fc5d7a160a1fb723611fd094fd.

 src/egg-debug.c               |    2 +-
 src/egg-debug.h               |    2 +-
 src/egg-test.c                |    2 +-
 src/egg-test.h                |    2 +-
 src/gcm-apply.c               |    2 +-
 src/gcm-brightness.c          |    2 +-
 src/gcm-brightness.h          |    2 +-
 src/gcm-calibrate-argyll.c    |  243 +++++++++++++----------------------------
 src/gcm-calibrate-argyll.h    |    2 +-
 src/gcm-calibrate-manual.c    |    2 +-
 src/gcm-calibrate-manual.h    |    2 +-
 src/gcm-calibrate.c           |    2 +-
 src/gcm-calibrate.h           |    2 +-
 src/gcm-cie-widget.c          |    2 +-
 src/gcm-cie-widget.h          |    2 +-
 src/gcm-client.c              |    2 +-
 src/gcm-client.h              |    2 +-
 src/gcm-clut.c                |    2 +-
 src/gcm-clut.h                |    2 +-
 src/gcm-color-device.c        |    2 +-
 src/gcm-color-device.h        |    2 +-
 src/gcm-dbus.c                |    2 +-
 src/gcm-dbus.h                |    2 +-
 src/gcm-device.c              |    2 +-
 src/gcm-device.h              |    2 +-
 src/gcm-dmi.c                 |    2 +-
 src/gcm-dmi.h                 |    2 +-
 src/gcm-dump-edid.c           |    2 +-
 src/gcm-dump-profile.c        |    2 +-
 src/gcm-edid.c                |    2 +-
 src/gcm-edid.h                |    2 +-
 src/gcm-enum.c                |    2 +-
 src/gcm-enum.h                |    2 +-
 src/gcm-fix-profile.c         |    2 +-
 src/gcm-gamma-widget.c        |    2 +-
 src/gcm-gamma-widget.h        |    2 +-
 src/gcm-image.c               |    2 +-
 src/gcm-image.h               |    2 +-
 src/gcm-import.c              |    2 +-
 src/gcm-inspect.c             |    2 +-
 src/gcm-install-system-wide.c |    2 +-
 src/gcm-prefs.c               |    2 +-
 src/gcm-profile-lcms1.c       |    2 +-
 src/gcm-profile-lcms1.h       |    2 +-
 src/gcm-profile-store.c       |    2 +-
 src/gcm-profile-store.h       |    2 +-
 src/gcm-profile.c             |    2 +-
 src/gcm-profile.h             |    2 +-
 src/gcm-screen.c              |    2 +-
 src/gcm-screen.h              |    2 +-
 src/gcm-self-test.c           |    2 +-
 src/gcm-session.c             |    2 +-
 src/gcm-tables.c              |    2 +-
 src/gcm-tables.h              |    2 +-
 src/gcm-trc-widget.c          |    2 +-
 src/gcm-trc-widget.h          |    2 +-
 src/gcm-utils.c               |    2 +-
 src/gcm-utils.h               |    2 +-
 src/gcm-xserver.c             |    2 +-
 src/gcm-xserver.h             |    2 +-
 src/gcm-xyz.c                 |    2 +-
 src/gcm-xyz.h                 |    2 +-
 62 files changed, 138 insertions(+), 227 deletions(-)
---
diff --git a/src/egg-debug.c b/src/egg-debug.c
index 64655a2..f734ee2 100644
--- a/src/egg-debug.c
+++ b/src/egg-debug.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/src/egg-debug.h b/src/egg-debug.h
index dcafaca..ac6728b 100644
--- a/src/egg-debug.h
+++ b/src/egg-debug.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __EGG_DEBUG_H
diff --git a/src/egg-test.c b/src/egg-test.c
index 1f62d64..ef4eef3 100644
--- a/src/egg-test.c
+++ b/src/egg-test.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include <stdlib.h>
diff --git a/src/egg-test.h b/src/egg-test.h
index 1b05092..ea4b94b 100644
--- a/src/egg-test.h
+++ b/src/egg-test.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __EGG_TEST_H
diff --git a/src/gcm-apply.c b/src/gcm-apply.c
index ec88bce..5c20ecb 100644
--- a/src/gcm-apply.c
+++ b/src/gcm-apply.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
diff --git a/src/gcm-brightness.c b/src/gcm-brightness.c
index 672ed40..7d23fa8 100644
--- a/src/gcm-brightness.c
+++ b/src/gcm-brightness.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/src/gcm-brightness.h b/src/gcm-brightness.h
index 6e86da1..0c98236 100644
--- a/src/gcm-brightness.h
+++ b/src/gcm-brightness.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_BRIGHTNESS_H
diff --git a/src/gcm-calibrate-argyll.c b/src/gcm-calibrate-argyll.c
index acab40c..74d7b05 100644
--- a/src/gcm-calibrate-argyll.c
+++ b/src/gcm-calibrate-argyll.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- * Copyright (C) 2009-2010 Richard Hughes <richard hughsie com>
+ * Copyright (C) 2009 Richard Hughes <richard hughsie com>
  *
  * Licensed under the GNU General Public License Version 2
  *
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
@@ -55,14 +55,6 @@ typedef enum {
 	GCM_CALIBRATE_ARGYLL_PRECISION_LAST
 } GcmCalibrateArgyllPrecision;
 
-typedef enum {
-	GCM_CALIBRATE_ARGYLL_STATE_IDLE,
-	GCM_CALIBRATE_ARGYLL_STATE_WAITING_FOR_STDIN,
-	GCM_CALIBRATE_ARGYLL_STATE_WAITING_FOR_LOOP,
-	GCM_CALIBRATE_ARGYLL_STATE_RUNNING,
-	GCM_CALIBRATE_ARGYLL_STATE_LAST
-} GcmCalibrateArgyllState;
-
 /**
  * GcmCalibrateArgyllPrivate:
  *
@@ -74,6 +66,7 @@ struct _GcmCalibrateArgyllPrivate
 	GConfClient			*gconf_client;
 	GcmCalibrateArgyllPrecision	 precision;
 	GMainLoop			*loop;
+	GMainLoop			*loop_ui;
 	GtkWidget			*terminal;
 	GtkBuilder			*builder;
 	pid_t				 child_pid;
@@ -81,10 +74,9 @@ struct _GcmCalibrateArgyllPrivate
 	GcmScreen			*screen;
 	glong				 vte_previous_row;
 	glong				 vte_previous_col;
-	GPtrArray			*cached_titles;
-	GPtrArray			*cached_messages;
+	gchar				*cached_title;
+	gchar				*cached_message;
 	gboolean			 already_on_window;
-	GcmCalibrateArgyllState		 state;
 };
 
 enum {
@@ -213,60 +205,49 @@ gcm_calibrate_argyll_get_display_type (GcmCalibrateArgyll *calibrate_argyll)
 }
 
 /**
- * gcm_calibrate_argyll_set_dialog:
+ * gcm_calibrate_argyll_set_title:
  **/
 static void
-gcm_calibrate_argyll_set_dialog (GcmCalibrateArgyll *calibrate_argyll, const gchar *title, const gchar *message)
+gcm_calibrate_argyll_set_title (GcmCalibrateArgyll *calibrate_argyll, const gchar *title)
 {
 	GcmCalibrateArgyllPrivate *priv = calibrate_argyll->priv;
 	GtkWidget *widget;
 	gchar *text;
 
 	/* save in case we need to reuse */
-	g_ptr_array_add (priv->cached_titles, g_strdup (title));
-	g_ptr_array_add (priv->cached_messages, g_strdup (message));
+	if (title != priv->cached_title) {
+		g_free (priv->cached_title);
+		priv->cached_title = g_strdup (title);
+	}
 
 	/* set the text */
 	text = g_strdup_printf ("<big><b>%s</b></big>", title);
 	widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_title"));
 	gtk_label_set_markup (GTK_LABEL(widget), text);
 	g_free (text);
-
-	/* set the text */
-	widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_message"));
-	gtk_label_set_markup (GTK_LABEL(widget), message);
 }
 
 /**
- * gcm_calibrate_argyll_pop_dialog:
+ * gcm_calibrate_argyll_set_message:
  **/
 static void
-gcm_calibrate_argyll_pop_dialog (GcmCalibrateArgyll *calibrate_argyll)
+gcm_calibrate_argyll_set_message (GcmCalibrateArgyll *calibrate_argyll, const gchar *title)
 {
 	GcmCalibrateArgyllPrivate *priv = calibrate_argyll->priv;
 	GtkWidget *widget;
-	const gchar *title;
-	const gchar *message;
-	guint len;
+	gchar *text;
 
 	/* save in case we need to reuse */
-	len = priv->cached_titles->len;
-	title = g_ptr_array_index (priv->cached_titles, len-1);
-	message = g_ptr_array_index (priv->cached_messages, len-1);
+	if (title != priv->cached_message) {
+		g_free (priv->cached_message);
+		priv->cached_message = g_strdup (title);
+	}
 
 	/* set the text */
-	text = g_strdup_printf ("<big><b>%s</b></big>", title);
-	widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_title"));
+	text = g_strdup_printf ("%s", title);
+	widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_message"));
 	gtk_label_set_markup (GTK_LABEL(widget), text);
 	g_free (text);
-
-	/* set the text */
-	widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_message"));
-	gtk_label_set_markup (GTK_LABEL(widget), message);
-
-	/* remove from the stack */
-	g_ptr_array_remove_index (priv->cached_titles, len-1);
-	g_ptr_array_remove_index (priv->cached_messages, len-1);
 }
 
 /**
@@ -335,8 +316,6 @@ gcm_calibrate_argyll_display_neutralise (GcmCalibrateArgyll *calibrate_argyll, G
 	gint x, y;
 	gchar *basename = NULL;
 	gchar *output_name = NULL;
-	const gchar *title;
-	const gchar *message;
 
 	/* get shared data */
 	g_object_get (calibrate_argyll,
@@ -375,13 +354,9 @@ gcm_calibrate_argyll_display_neutralise (GcmCalibrateArgyll *calibrate_argyll, G
 	gtk_window_move (GTK_WINDOW(widget), 10, y);
 
 	/* TRANSLATORS: title, default paramters needed to calibrate_argyll */
-	title = _("Getting default parameters");
-
+	gcm_calibrate_argyll_set_title (calibrate_argyll, _("Getting default parameters"));
 	/* TRANSLATORS: dialog message */
-	message = _("This pre-calibrates the screen by sending colored and gray patches to your screen and measuring them with the hardware device.");
-
-	/* push new messages into the UI */
-	gcm_calibrate_argyll_set_dialog (calibrate_argyll, title, message);
+	gcm_calibrate_argyll_set_message (calibrate_argyll, _("This pre-calibrates the screen by sending colored and gray patches to your screen and measuring them with the hardware device."));
 
 	/* argument array */
 	array = g_ptr_array_new_with_free_func (g_free);
@@ -398,7 +373,6 @@ gcm_calibrate_argyll_display_neutralise (GcmCalibrateArgyll *calibrate_argyll, G
 	gcm_calibrate_argyll_debug_argv (command, argv);
 
 	/* start up the command */
-	priv->state = GCM_CALIBRATE_ARGYLL_STATE_RUNNING;
 	vte_terminal_reset (VTE_TERMINAL(priv->terminal), TRUE, FALSE);
 	priv->child_pid = vte_terminal_fork_command (VTE_TERMINAL(priv->terminal), command, argv, NULL, GCM_CALIBRATE_ARGYLL_TEMP_DIR, FALSE, FALSE, FALSE);
 
@@ -438,8 +412,6 @@ gcm_calibrate_argyll_display_generate_patches (GcmCalibrateArgyll *calibrate_arg
 	gchar **argv = NULL;
 	GPtrArray *array = NULL;
 	gchar *basename = NULL;
-	const gchar *title;
-	const gchar *message;
 
 	/* get shared data */
 	g_object_get (calibrate_argyll,
@@ -454,12 +426,9 @@ gcm_calibrate_argyll_display_generate_patches (GcmCalibrateArgyll *calibrate_arg
 	}
 
 	/* TRANSLATORS: title, patches are specific colours used in calibration */
-	title = _("Generating the patches");
+	gcm_calibrate_argyll_set_title (calibrate_argyll, _("Generating the patches"));
 	/* TRANSLATORS: dialog message */
-	message = _("Generating the patches that will be measured with the hardware device.");
-
-	/* push new messages into the UI */
-	gcm_calibrate_argyll_set_dialog (calibrate_argyll, title, message);
+	gcm_calibrate_argyll_set_message (calibrate_argyll, _("Generating the patches that will be measured with the hardware device."));
 
 	/* argument array */
 	array = g_ptr_array_new_with_free_func (g_free);
@@ -473,7 +442,6 @@ gcm_calibrate_argyll_display_generate_patches (GcmCalibrateArgyll *calibrate_arg
 	gcm_calibrate_argyll_debug_argv (command, argv);
 
 	/* start up the command */
-	priv->state = GCM_CALIBRATE_ARGYLL_STATE_RUNNING;
 	vte_terminal_reset (VTE_TERMINAL(priv->terminal), TRUE, FALSE);
 	priv->child_pid = vte_terminal_fork_command (VTE_TERMINAL(priv->terminal), command, argv, NULL, GCM_CALIBRATE_ARGYLL_TEMP_DIR, FALSE, FALSE, FALSE);
 
@@ -513,8 +481,6 @@ gcm_calibrate_argyll_display_draw_and_measure (GcmCalibrateArgyll *calibrate_arg
 	gchar **argv = NULL;
 	GPtrArray *array = NULL;
 	gchar *basename = NULL;
-	const gchar *title;
-	const gchar *message;
 
 	/* get shared data */
 	g_object_get (calibrate_argyll,
@@ -532,12 +498,9 @@ gcm_calibrate_argyll_display_draw_and_measure (GcmCalibrateArgyll *calibrate_arg
 	type = gcm_calibrate_argyll_get_display_type (calibrate_argyll);
 
 	/* TRANSLATORS: title, drawing means painting to the screen */
-	title = _("Drawing the patches");
+	gcm_calibrate_argyll_set_title (calibrate_argyll, _("Drawing the patches"));
 	/* TRANSLATORS: dialog message */
-	message = _("Drawing the generated patches to the screen, which will then be measured by the hardware device.");
-
-	/* push new messages into the UI */
-	gcm_calibrate_argyll_set_dialog (calibrate_argyll, title, message);
+	gcm_calibrate_argyll_set_message (calibrate_argyll, _("Drawing the generated patches to the screen, which will then be measured by the hardware device."));
 
 	/* argument array */
 	array = g_ptr_array_new_with_free_func (g_free);
@@ -553,7 +516,6 @@ gcm_calibrate_argyll_display_draw_and_measure (GcmCalibrateArgyll *calibrate_arg
 	gcm_calibrate_argyll_debug_argv (command, argv);
 
 	/* start up the command */
-	priv->state = GCM_CALIBRATE_ARGYLL_STATE_RUNNING;
 	vte_terminal_reset (VTE_TERMINAL(priv->terminal), TRUE, FALSE);
 	priv->child_pid = vte_terminal_fork_command (VTE_TERMINAL(priv->terminal), command, argv, NULL, GCM_CALIBRATE_ARGYLL_TEMP_DIR, FALSE, FALSE, FALSE);
 
@@ -600,8 +562,6 @@ gcm_calibrate_argyll_display_generate_profile (GcmCalibrateArgyll *calibrate_arg
 	gchar *model = NULL;
 	GPtrArray *array = NULL;
 	GtkWidget *widget;
-	const gchar *title;
-	const gchar *message;
 
 	/* get shared data */
 	g_object_get (calibrate_argyll,
@@ -634,12 +594,9 @@ gcm_calibrate_argyll_display_generate_profile (GcmCalibrateArgyll *calibrate_arg
 	gtk_widget_hide (widget);
 
 	/* TRANSLATORS: title, a profile is a ICC file */
-	title = _("Generating the profile");
+	gcm_calibrate_argyll_set_title (calibrate_argyll, _("Generating the profile"));
 	/* TRANSLATORS: dialog message */
-	message = _("Generating the ICC color profile that can be used with this screen.");
-
-	/* push new messages into the UI */
-	gcm_calibrate_argyll_set_dialog (calibrate_argyll, title, message);
+	gcm_calibrate_argyll_set_message (calibrate_argyll, _("Generating the ICC color profile that can be used with this screen."));
 
 	/* argument array */
 	array = g_ptr_array_new_with_free_func (g_free);
@@ -657,7 +614,6 @@ gcm_calibrate_argyll_display_generate_profile (GcmCalibrateArgyll *calibrate_arg
 	gcm_calibrate_argyll_debug_argv (command, argv);
 
 	/* start up the command */
-	priv->state = GCM_CALIBRATE_ARGYLL_STATE_RUNNING;
 	vte_terminal_reset (VTE_TERMINAL(priv->terminal), TRUE, FALSE);
 	priv->child_pid = vte_terminal_fork_command (VTE_TERMINAL(priv->terminal), command, argv, NULL, GCM_CALIBRATE_ARGYLL_TEMP_DIR, FALSE, FALSE, FALSE);
 
@@ -701,12 +657,11 @@ gcm_calibrate_argyll_device_setup (GcmCalibrateArgyll *calibrate_argyll, GError
 	gboolean ret = TRUE;
 	GString *string = NULL;
 	GcmCalibrateArgyllPrivate *priv = calibrate_argyll->priv;
-	const gchar *title;
 
 	string = g_string_new ("");
 
 	/* TRANSLATORS: title, we're setting up the device ready for calibration */
-	title = _("Setting up device");
+	gcm_calibrate_argyll_set_title (calibrate_argyll, _("Setting up device"));
 
 	/* TRANSLATORS: dialog message, preface */
 	g_string_append_printf (string, "%s\n", _("Before calibrating the device, you have to manually acquire a reference image and save it as a TIFF image file."));
@@ -724,15 +679,10 @@ gcm_calibrate_argyll_device_setup (GcmCalibrateArgyll *calibrate_argyll, GError
 	g_string_append_printf (string, "\n%s", _("Do you have a scanned TIFF file of a IT8.7/2 reference image?"));
 
 	/* set the message */
+	gcm_calibrate_argyll_set_message (calibrate_argyll, string->str);
 
-	/* push new messages into the UI */
-	gcm_calibrate_argyll_set_dialog (calibrate_argyll, title, string->str);
-
-	/* set state */
-	priv->state = GCM_CALIBRATE_ARGYLL_STATE_WAITING_FOR_LOOP;
-
-	/* wait until finished */
-	g_main_loop_run (priv->loop);
+	/* wait until user selects okay or closes window */
+	g_main_loop_run (priv->loop_ui);
 
 	/* get result */
 	if (priv->response != GTK_RESPONSE_OK) {
@@ -760,8 +710,6 @@ gcm_calibrate_argyll_device_copy (GcmCalibrateArgyll *calibrate_argyll, GError *
 	gchar *basename = NULL;
 	gchar *filename_source = NULL;
 	gchar *filename_reference = NULL;
-	const gchar *title;
-	const gchar *message;
 
 	/* get shared data */
 	g_object_get (calibrate_argyll,
@@ -771,12 +719,9 @@ gcm_calibrate_argyll_device_copy (GcmCalibrateArgyll *calibrate_argyll, GError *
 		      NULL);
 
 	/* TRANSLATORS: title, a profile is a ICC file */
-	title = _("Copying files");
+	gcm_calibrate_argyll_set_title (calibrate_argyll, _("Copying files"));
 	/* TRANSLATORS: dialog message */
-	message = _("Copying source image, chart data and CIE reference values.");
-
-	/* push new messages into the UI */
-	gcm_calibrate_argyll_set_dialog (calibrate_argyll, title, message);
+	gcm_calibrate_argyll_set_message (calibrate_argyll, _("Copying source image, chart data and CIE reference values."));
 
 	/* build filenames */
 	filename = g_strdup_printf ("%s.tif", basename);
@@ -818,8 +763,6 @@ gcm_calibrate_argyll_device_measure (GcmCalibrateArgyll *calibrate_argyll, GErro
 	gchar *filename = NULL;
 	gchar *command = NULL;
 	gchar *basename = NULL;
-	const gchar *title;
-	const gchar *message;
 
 	/* get shared data */
 	g_object_get (calibrate_argyll,
@@ -827,12 +770,9 @@ gcm_calibrate_argyll_device_measure (GcmCalibrateArgyll *calibrate_argyll, GErro
 		      NULL);
 
 	/* TRANSLATORS: title, drawing means painting to the screen */
-	title = _("Measuring the patches");
+	gcm_calibrate_argyll_set_title (calibrate_argyll, _("Measuring the patches"));
 	/* TRANSLATORS: dialog message */
-	message = _("Detecting the reference patches and measuring them.");
-
-	/* push new messages into the UI */
-	gcm_calibrate_argyll_set_dialog (calibrate_argyll, title, message);
+	gcm_calibrate_argyll_set_message (calibrate_argyll, _("Detecting the reference patches and measuring them."));
 
 	/* get correct name of the command */
 	command = gcm_calibrate_argyll_get_tool_filename ("scanin", error);
@@ -854,7 +794,6 @@ gcm_calibrate_argyll_device_measure (GcmCalibrateArgyll *calibrate_argyll, GErro
 	gcm_calibrate_argyll_debug_argv (command, argv);
 
 	/* start up the command */
-	priv->state = GCM_CALIBRATE_ARGYLL_STATE_RUNNING;
 	vte_terminal_reset (VTE_TERMINAL(priv->terminal), TRUE, FALSE);
 	priv->child_pid = vte_terminal_fork_command (VTE_TERMINAL(priv->terminal), command, argv, NULL, GCM_CALIBRATE_ARGYLL_TEMP_DIR, FALSE, FALSE, FALSE);
 
@@ -901,8 +840,6 @@ gcm_calibrate_argyll_device_generate_profile (GcmCalibrateArgyll *calibrate_argy
 	gchar *manufacturer = NULL;
 	gchar *model = NULL;
 	gchar *device = NULL;
-	const gchar *title;
-	const gchar *message;
 
 	/* get shared data */
 	g_object_get (calibrate_argyll,
@@ -931,12 +868,9 @@ gcm_calibrate_argyll_device_generate_profile (GcmCalibrateArgyll *calibrate_argy
 	copyright = g_strdup_printf ("%s %04i %s", _("Copyright (c)"), date->year, g_get_real_name ());
 
 	/* TRANSLATORS: title, a profile is a ICC file */
-	title = _("Generating the profile");
+	gcm_calibrate_argyll_set_title (calibrate_argyll, _("Generating the profile"));
 	/* TRANSLATORS: dialog message */
-	message = _("Generating the ICC color profile that can be used with this device.");
-
-	/* push new messages into the UI */
-	gcm_calibrate_argyll_set_dialog (calibrate_argyll, title, message);
+	gcm_calibrate_argyll_set_message (calibrate_argyll, _("Generating the ICC color profile that can be used with this device."));
 
 	/* argument array */
 	array = g_ptr_array_new_with_free_func (g_free);
@@ -954,7 +888,6 @@ gcm_calibrate_argyll_device_generate_profile (GcmCalibrateArgyll *calibrate_argy
 	gcm_calibrate_argyll_debug_argv (command, argv);
 
 	/* start up the command */
-	priv->state = GCM_CALIBRATE_ARGYLL_STATE_RUNNING;
 	vte_terminal_reset (VTE_TERMINAL(priv->terminal), TRUE, FALSE);
 	priv->child_pid = vte_terminal_fork_command (VTE_TERMINAL(priv->terminal), command, argv, NULL, GCM_CALIBRATE_ARGYLL_TEMP_DIR, FALSE, FALSE, FALSE);
 
@@ -1070,8 +1003,6 @@ gcm_calibrate_argyll_display (GcmCalibrate *calibrate, GtkWindow *window, GError
 	GcmCalibrateArgyll *calibrate_argyll = GCM_CALIBRATE_ARGYLL(calibrate);
 	GcmCalibrateArgyllPrivate *priv = calibrate_argyll->priv;
 	gboolean ret;
-	const gchar *title;
-	const gchar *message;
 
 	/* show main UI */
 	widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "dialog_calibrate"));
@@ -1080,13 +1011,10 @@ gcm_calibrate_argyll_display (GcmCalibrate *calibrate, GtkWindow *window, GError
 		gdk_window_set_transient_for (gtk_widget_get_window (widget), gtk_widget_get_window (GTK_WIDGET(window)));
 
 	/* TRANSLATORS: title, hardware refers to a calibration device */
-	title = _("Set up display");
+	gcm_calibrate_argyll_set_title (calibrate_argyll, _("Set up display"));
 
 	/* TRANSLATORS: dialog message */
-	message = _("Setting up display device for use...");
-
-	/* push new messages into the UI */
-	gcm_calibrate_argyll_set_dialog (calibrate_argyll, title, message);
+	gcm_calibrate_argyll_set_message (calibrate_argyll, _("Setting up display device for use..."));
 
 	/* step 1 */
 	ret = gcm_calibrate_argyll_display_neutralise (calibrate_argyll, error);
@@ -1126,8 +1054,6 @@ gcm_calibrate_argyll_device (GcmCalibrate *calibrate, GtkWindow *window, GError
 	GcmCalibrateArgyll *calibrate_argyll = GCM_CALIBRATE_ARGYLL(calibrate);
 	GcmCalibrateArgyllPrivate *priv = calibrate_argyll->priv;
 	gboolean ret;
-	const gchar *title;
-	const gchar *message;
 
 	/* show main UI */
 	widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "dialog_calibrate"));
@@ -1136,13 +1062,10 @@ gcm_calibrate_argyll_device (GcmCalibrate *calibrate, GtkWindow *window, GError
 		gdk_window_set_transient_for (gtk_widget_get_window (widget), gtk_widget_get_window (GTK_WIDGET(window)));
 
 	/* TRANSLATORS: title, hardware refers to a calibration device */
-	title = _("Set up device");
+	gcm_calibrate_argyll_set_title (calibrate_argyll, _("Set up device"));
 
 	/* TRANSLATORS: dialog message */
-	message = _("Setting up device for use...");
-
-	/* push new messages into the UI */
-	gcm_calibrate_argyll_set_dialog (calibrate_argyll, title, message);
+	gcm_calibrate_argyll_set_message (calibrate_argyll, _("Setting up device for use..."));
 
 	/* step 0 */
 	ret = gcm_calibrate_argyll_device_setup (calibrate_argyll, error);
@@ -1190,10 +1113,8 @@ gcm_calibrate_argyll_exit_cb (VteTerminal *terminal, GcmCalibrateArgyll *calibra
 		priv->response = GTK_RESPONSE_REJECT;
 
 	priv->child_pid = -1;
-	if (g_main_loop_is_running (priv->loop)) {
-		priv->state = GCM_CALIBRATE_ARGYLL_STATE_IDLE;
+	if (g_main_loop_is_running (priv->loop))
 		g_main_loop_quit (priv->loop);
-	}
 }
 
 /**
@@ -1207,13 +1128,30 @@ gcm_calibrate_argyll_interaction_required (GcmCalibrateArgyll *calibrate_argyll,
 	GcmCalibrateArgyllPrivate *priv = calibrate_argyll->priv;
 
 	/* save for later */
-	saved_title = g_strdup (priv->cached_title;
-	saved_message = g_strdup (priv->cached_message;
+	saved_title = g_strdup (priv->cached_title);
+	saved_message = g_strdup (priv->cached_message);
 
+	/* set this to our new text */
+	gcm_calibrate_argyll_set_title (calibrate_argyll, title);
+	gcm_calibrate_argyll_set_message (calibrate_argyll, message);
+
+	/* wait until user selects okay or closes window */
+	g_main_loop_run (priv->loop_ui);
+
+	/* get result */
+	if (priv->response == GTK_RESPONSE_CANCEL) {
+		egg_debug ("sending quit");
+		vte_terminal_feed_child (VTE_TERMINAL(priv->terminal), "Q", 1);
+		goto out;
+	}
+
+	/* send the terminal an okay */
+	egg_debug ("sending okay");
+	vte_terminal_feed_child (VTE_TERMINAL(priv->terminal), " ", 1);
 
 	/* restore to what we were trying to do in the first place */
-	title = saved_title);
-	message = saved_message);
+	gcm_calibrate_argyll_set_title (calibrate_argyll, saved_title);
+	gcm_calibrate_argyll_set_message (calibrate_argyll, saved_message);
 out:
 	g_free (saved_title);
 	g_free (saved_message);
@@ -1257,13 +1195,7 @@ gcm_calibrate_argyll_process_output_cmd (GcmCalibrateArgyll *calibrate_argyll, c
 		message = _("Please attach the hardware device to the center of the screen on the gray square.");
 
 		/* block for a response */
-		egg_debug ("blocking waiting for user input: %s", title);
-
-		/* push new messages into the UI */
-		gcm_calibrate_argyll_set_dialog (calibrate_argyll, title, message);
-
-		/* set state */
-		priv->state = GCM_CALIBRATE_ARGYLL_STATE_WAITING_FOR_STDIN,
+		gcm_calibrate_argyll_interaction_required (calibrate_argyll, title, message);
 
 		/* save as we know the device is on the screen now */
 		priv->already_on_window = TRUE;
@@ -1281,13 +1213,7 @@ gcm_calibrate_argyll_process_output_cmd (GcmCalibrateArgyll *calibrate_argyll, c
 		message = _("Please set the device to calibration mode.");
 
 		/* block for a response */
-		egg_debug ("blocking waiting for user input: %s", title);
-
-		/* push new messages into the UI */
-		gcm_calibrate_argyll_set_dialog (calibrate_argyll, title, message);
-
-		/* set state */
-		priv->state = GCM_CALIBRATE_ARGYLL_STATE_WAITING_FOR_STDIN,
+		gcm_calibrate_argyll_interaction_required (calibrate_argyll, title, message);
 		goto out;
 	}
 
@@ -1380,18 +1306,11 @@ gcm_calibrate_argyll_cancel_cb (GtkWidget *widget, GcmCalibrateArgyll *calibrate
 	GcmCalibrateArgyllPrivate *priv = calibrate_argyll->priv;
 
 	priv->response = GTK_RESPONSE_CANCEL;
-
-	/* send input if waiting */
-	if (priv->state == GCM_CALIBRATE_ARGYLL_STATE_WAITING_FOR_STDIN)
-		vte_terminal_feed_child (VTE_TERMINAL(priv->terminal), "Q", 1);
-
-	/* clear loop if waiting */
-	if (priv->state == GCM_CALIBRATE_ARGYLL_STATE_WAITING_FOR_LOOP)
-		g_main_loop_quit (priv->loop);
-
-	/* stop loop */
+	vte_terminal_feed_child (VTE_TERMINAL(priv->terminal), "Q", 1);
 	if (g_main_loop_is_running (priv->loop))
 		g_main_loop_quit (priv->loop);
+	if (g_main_loop_is_running (priv->loop_ui))
+		g_main_loop_quit (priv->loop_ui);
 }
 
 /**
@@ -1401,18 +1320,9 @@ static void
 gcm_calibrate_argyll_ok_cb (GtkWidget *widget, GcmCalibrateArgyll *calibrate_argyll)
 {
 	GcmCalibrateArgyllPrivate *priv = calibrate_argyll->priv;
-
-	/* send input if waiting */
-	if (priv->state == GCM_CALIBRATE_ARGYLL_STATE_WAITING_FOR_STDIN) {
-		vte_terminal_feed_child (VTE_TERMINAL(priv->terminal), " ", 1);
-		gcm_calibrate_argyll_pop_dialog (calibrate_argyll);
-	}
-
-	/* clear loop if waiting */
-	if (priv->state == GCM_CALIBRATE_ARGYLL_STATE_WAITING_FOR_LOOP)
-		g_main_loop_quit (priv->loop);
-
 	priv->response = GTK_RESPONSE_OK;
+	if (g_main_loop_is_running (priv->loop_ui))
+		g_main_loop_quit (priv->loop_ui);
 	gtk_widget_hide (widget);
 }
 
@@ -1473,12 +1383,12 @@ gcm_calibrate_argyll_init (GcmCalibrateArgyll *calibrate_argyll)
 	calibrate_argyll->priv = GCM_CALIBRATE_ARGYLL_GET_PRIVATE (calibrate_argyll);
 	calibrate_argyll->priv->child_pid = -1;
 	calibrate_argyll->priv->loop = g_main_loop_new (NULL, FALSE);
+	calibrate_argyll->priv->loop_ui = g_main_loop_new (NULL, FALSE);
 	calibrate_argyll->priv->vte_previous_row = 0;
 	calibrate_argyll->priv->vte_previous_col = 0;
-	calibrate_argyll->priv->cached_titles = g_ptr_array_new_with_free_func (g_free);
-	calibrate_argyll->priv->cached_messages = g_ptr_array_new_with_free_func (g_free);
+	calibrate_argyll->priv->cached_title = NULL;
+	calibrate_argyll->priv->cached_message = NULL;
 	calibrate_argyll->priv->already_on_window = FALSE;
-	calibrate_argyll->priv->state = GCM_CALIBRATE_ARGYLL_STATE_IDLE;
 
 	/* get UI */
 	calibrate_argyll->priv->builder = gtk_builder_new ();
@@ -1549,11 +1459,12 @@ gcm_calibrate_argyll_finalize (GObject *object)
 	gtk_widget_hide (widget);
 
 	g_main_loop_unref (priv->loop);
+	g_main_loop_unref (priv->loop_ui);
 	g_object_unref (priv->builder);
 	g_object_unref (priv->screen);
 	g_object_unref (priv->gconf_client);
-	g_ptr_array_unref (priv->cached_titles);
-	g_ptr_array_unref (priv->cached_messages);
+	g_free (priv->cached_title);
+	g_free (priv->cached_message);
 
 	G_OBJECT_CLASS (gcm_calibrate_argyll_parent_class)->finalize (object);
 }
diff --git a/src/gcm-calibrate-argyll.h b/src/gcm-calibrate-argyll.h
index 63a359a..42f0015 100644
--- a/src/gcm-calibrate-argyll.h
+++ b/src/gcm-calibrate-argyll.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_CALIBRATE_ARGYLL_H
diff --git a/src/gcm-calibrate-manual.c b/src/gcm-calibrate-manual.c
index 8e34e2c..911f00b 100644
--- a/src/gcm-calibrate-manual.c
+++ b/src/gcm-calibrate-manual.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/src/gcm-calibrate-manual.h b/src/gcm-calibrate-manual.h
index 9765b53..542a3eb 100644
--- a/src/gcm-calibrate-manual.h
+++ b/src/gcm-calibrate-manual.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_CALIBRATE_MANUAL_H
diff --git a/src/gcm-calibrate.c b/src/gcm-calibrate.c
index 8b82884..4098a9d 100644
--- a/src/gcm-calibrate.c
+++ b/src/gcm-calibrate.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/src/gcm-calibrate.h b/src/gcm-calibrate.h
index a822026..fe72f69 100644
--- a/src/gcm-calibrate.h
+++ b/src/gcm-calibrate.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_CALIBRATE_H
diff --git a/src/gcm-cie-widget.c b/src/gcm-cie-widget.c
index c50fe41..02686ae 100644
--- a/src/gcm-cie-widget.c
+++ b/src/gcm-cie-widget.c
@@ -20,7 +20,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
diff --git a/src/gcm-cie-widget.h b/src/gcm-cie-widget.h
index 3f28bf1..efcc012 100644
--- a/src/gcm-cie-widget.h
+++ b/src/gcm-cie-widget.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_CIE_WIDGET_H__
diff --git a/src/gcm-client.c b/src/gcm-client.c
index 1df21b3..65876e5 100644
--- a/src/gcm-client.c
+++ b/src/gcm-client.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/src/gcm-client.h b/src/gcm-client.h
index b09a604..f3f1752 100644
--- a/src/gcm-client.h
+++ b/src/gcm-client.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_CLIENT_H
diff --git a/src/gcm-clut.c b/src/gcm-clut.c
index 3573e92..2eb7960 100644
--- a/src/gcm-clut.c
+++ b/src/gcm-clut.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/src/gcm-clut.h b/src/gcm-clut.h
index 7be7234..2a6ed14 100644
--- a/src/gcm-clut.h
+++ b/src/gcm-clut.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_CLUT_H
diff --git a/src/gcm-color-device.c b/src/gcm-color-device.c
index c6b44a2..a45ca2a 100644
--- a/src/gcm-color-device.c
+++ b/src/gcm-color-device.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/src/gcm-color-device.h b/src/gcm-color-device.h
index 1c83c18..18beb7f 100644
--- a/src/gcm-color-device.h
+++ b/src/gcm-color-device.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_COLOR_DEVICE_H
diff --git a/src/gcm-dbus.c b/src/gcm-dbus.c
index 0b576a4..c863918 100644
--- a/src/gcm-dbus.c
+++ b/src/gcm-dbus.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
diff --git a/src/gcm-dbus.h b/src/gcm-dbus.h
index b003f0d..9c7f5e7 100644
--- a/src/gcm-dbus.h
+++ b/src/gcm-dbus.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_DBUS_H
diff --git a/src/gcm-device.c b/src/gcm-device.c
index 7d122c9..456e44a 100644
--- a/src/gcm-device.c
+++ b/src/gcm-device.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/src/gcm-device.h b/src/gcm-device.h
index cc78538..33252a3 100644
--- a/src/gcm-device.h
+++ b/src/gcm-device.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_DEVICE_H
diff --git a/src/gcm-dmi.c b/src/gcm-dmi.c
index c658f4e..cef9d42 100644
--- a/src/gcm-dmi.c
+++ b/src/gcm-dmi.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/src/gcm-dmi.h b/src/gcm-dmi.h
index bd07dbd..0a4897c 100644
--- a/src/gcm-dmi.h
+++ b/src/gcm-dmi.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_DMI_H
diff --git a/src/gcm-dump-edid.c b/src/gcm-dump-edid.c
index 0e92a48..09a4cfe 100644
--- a/src/gcm-dump-edid.c
+++ b/src/gcm-dump-edid.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
diff --git a/src/gcm-dump-profile.c b/src/gcm-dump-profile.c
index 80389b1..e948cf8 100644
--- a/src/gcm-dump-profile.c
+++ b/src/gcm-dump-profile.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
diff --git a/src/gcm-edid.c b/src/gcm-edid.c
index 3f487ff..040f70e 100644
--- a/src/gcm-edid.c
+++ b/src/gcm-edid.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/src/gcm-edid.h b/src/gcm-edid.h
index cac6dcb..ac3dfca 100644
--- a/src/gcm-edid.h
+++ b/src/gcm-edid.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_EDID_H
diff --git a/src/gcm-enum.c b/src/gcm-enum.c
index ed2623f..9a3478c 100644
--- a/src/gcm-enum.c
+++ b/src/gcm-enum.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
diff --git a/src/gcm-enum.h b/src/gcm-enum.h
index aeed9bc..3533224 100644
--- a/src/gcm-enum.h
+++ b/src/gcm-enum.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_ENUM_H
diff --git a/src/gcm-fix-profile.c b/src/gcm-fix-profile.c
index 57e729f..9ff0a65 100644
--- a/src/gcm-fix-profile.c
+++ b/src/gcm-fix-profile.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
diff --git a/src/gcm-gamma-widget.c b/src/gcm-gamma-widget.c
index 0c524a5..6bee986 100644
--- a/src/gcm-gamma-widget.c
+++ b/src/gcm-gamma-widget.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
diff --git a/src/gcm-gamma-widget.h b/src/gcm-gamma-widget.h
index e665653..5d4168d 100644
--- a/src/gcm-gamma-widget.h
+++ b/src/gcm-gamma-widget.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_GAMMA_WIDGET_H__
diff --git a/src/gcm-image.c b/src/gcm-image.c
index 44215b6..58574c2 100644
--- a/src/gcm-image.c
+++ b/src/gcm-image.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/src/gcm-image.h b/src/gcm-image.h
index 272cbc1..a96cd47 100644
--- a/src/gcm-image.h
+++ b/src/gcm-image.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_IMAGE_H
diff --git a/src/gcm-import.c b/src/gcm-import.c
index f1042fa..001c4f3 100644
--- a/src/gcm-import.c
+++ b/src/gcm-import.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
diff --git a/src/gcm-inspect.c b/src/gcm-inspect.c
index 4c9c1d9..5b01d8d 100644
--- a/src/gcm-inspect.c
+++ b/src/gcm-inspect.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
diff --git a/src/gcm-install-system-wide.c b/src/gcm-install-system-wide.c
index 0a5f86a..50a331f 100644
--- a/src/gcm-install-system-wide.c
+++ b/src/gcm-install-system-wide.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
diff --git a/src/gcm-prefs.c b/src/gcm-prefs.c
index 87d8b6c..0a12955 100644
--- a/src/gcm-prefs.c
+++ b/src/gcm-prefs.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
diff --git a/src/gcm-profile-lcms1.c b/src/gcm-profile-lcms1.c
index 9810355..7c3b837 100644
--- a/src/gcm-profile-lcms1.c
+++ b/src/gcm-profile-lcms1.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/src/gcm-profile-lcms1.h b/src/gcm-profile-lcms1.h
index 47bbddf..78cefe9 100644
--- a/src/gcm-profile-lcms1.h
+++ b/src/gcm-profile-lcms1.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_PROFILE_LCMS1_H
diff --git a/src/gcm-profile-store.c b/src/gcm-profile-store.c
index 033a3cb..d789b6f 100644
--- a/src/gcm-profile-store.c
+++ b/src/gcm-profile-store.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/src/gcm-profile-store.h b/src/gcm-profile-store.h
index 92ad77c..fc03510 100644
--- a/src/gcm-profile-store.h
+++ b/src/gcm-profile-store.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_PROFILE_STORE_H
diff --git a/src/gcm-profile.c b/src/gcm-profile.c
index 6a17427..a8aefbc 100644
--- a/src/gcm-profile.c
+++ b/src/gcm-profile.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/src/gcm-profile.h b/src/gcm-profile.h
index a313b88..5d05bb6 100644
--- a/src/gcm-profile.h
+++ b/src/gcm-profile.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_PROFILE_H
diff --git a/src/gcm-screen.c b/src/gcm-screen.c
index cddb119..e876162 100644
--- a/src/gcm-screen.c
+++ b/src/gcm-screen.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/src/gcm-screen.h b/src/gcm-screen.h
index a518fb2..0744332 100644
--- a/src/gcm-screen.h
+++ b/src/gcm-screen.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_SCREEN_H
diff --git a/src/gcm-self-test.c b/src/gcm-self-test.c
index c50cfb1..e919fe0 100644
--- a/src/gcm-self-test.c
+++ b/src/gcm-self-test.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include <glib-object.h>
diff --git a/src/gcm-session.c b/src/gcm-session.c
index 345e23c..8e02e8c 100644
--- a/src/gcm-session.c
+++ b/src/gcm-session.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
diff --git a/src/gcm-tables.c b/src/gcm-tables.c
index 89517a1..c70034d 100644
--- a/src/gcm-tables.c
+++ b/src/gcm-tables.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/src/gcm-tables.h b/src/gcm-tables.h
index db2f6fb..4afaec2 100644
--- a/src/gcm-tables.h
+++ b/src/gcm-tables.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_TABLES_H
diff --git a/src/gcm-trc-widget.c b/src/gcm-trc-widget.c
index 57133df..66d54e0 100644
--- a/src/gcm-trc-widget.c
+++ b/src/gcm-trc-widget.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
diff --git a/src/gcm-trc-widget.h b/src/gcm-trc-widget.h
index 5514fca..eb6c118 100644
--- a/src/gcm-trc-widget.h
+++ b/src/gcm-trc-widget.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_TRC_WIDGET_H__
diff --git a/src/gcm-utils.c b/src/gcm-utils.c
index 89d62c3..5d7a2af 100644
--- a/src/gcm-utils.c
+++ b/src/gcm-utils.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
diff --git a/src/gcm-utils.h b/src/gcm-utils.h
index 93f90bb..6b3dac8 100644
--- a/src/gcm-utils.h
+++ b/src/gcm-utils.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_UTILS_H
diff --git a/src/gcm-xserver.c b/src/gcm-xserver.c
index 3ae4c53..1038d9e 100644
--- a/src/gcm-xserver.c
+++ b/src/gcm-xserver.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/src/gcm-xserver.h b/src/gcm-xserver.h
index 5847906..bf9a25c 100644
--- a/src/gcm-xserver.h
+++ b/src/gcm-xserver.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_XSERVER_H
diff --git a/src/gcm-xyz.c b/src/gcm-xyz.c
index bbe51cb..e02c8d0 100644
--- a/src/gcm-xyz.c
+++ b/src/gcm-xyz.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/src/gcm-xyz.h b/src/gcm-xyz.h
index 240df5a..9d8c668 100644
--- a/src/gcm-xyz.h
+++ b/src/gcm-xyz.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef __GCM_XYZ_H
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]