aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog34
-rw-r--r--calendar/gui/calendar-component.c2
-rw-r--r--calendar/gui/calendar-config.c84
-rw-r--r--calendar/gui/calendar-config.h9
-rw-r--r--calendar/gui/dialogs/cal-prefs-dialog.c57
-rw-r--r--calendar/gui/dialogs/cal-prefs-dialog.glade6
-rw-r--r--calendar/gui/dialogs/calendar-setup.c142
-rw-r--r--calendar/gui/dialogs/calendar-setup.glade6
-rw-r--r--calendar/gui/e-cal-model-tasks.c18
-rw-r--r--calendar/gui/e-cal-model.c7
-rw-r--r--calendar/gui/memos-component.c2
-rw-r--r--calendar/gui/migration.c10
-rw-r--r--calendar/gui/tasks-component.c2
-rw-r--r--filter/ChangeLog20
-rw-r--r--filter/filter-colour.c108
-rw-r--r--filter/filter-colour.h2
-rw-r--r--filter/filter-element.c8
-rw-r--r--mail/ChangeLog11
-rw-r--r--mail/em-composer-prefs.c41
-rw-r--r--mail/em-composer-prefs.h3
-rw-r--r--mail/em-mailer-prefs.c71
-rw-r--r--mail/em-mailer-prefs.h5
-rw-r--r--mail/mail-config.glade23
-rw-r--r--plugins/groupwise-account-setup/ChangeLog7
-rw-r--r--plugins/groupwise-account-setup/camel-gw-listener.c6
25 files changed, 376 insertions, 308 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e7502367a2..ed09628954 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,37 @@
+2007-04-01 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #373116
+
+ * gui/calendar-component.c (ensure_sources):
+ * gui/e-cal-model.c (ecm_get_color_for_component):
+ * gui/memos-component.c (ensure_sources):
+ * gui/migration.c (create_calendar_contact_source),
+ (create_calendar_sources), (create_task_sources),
+ (create_memo_sources), (add_gw_esource):
+ * gui/tasks-component.c (ensure_sources):
+ Use the new ESource color API.
+
+ * gui/calendar-component.c
+ (calendar_config_get_tasks_due_today_color),
+ (calendar_config_get_tasks_overdue_color):
+ Return a GdkColor instead of an X color specification.
+
+ * gui/calendar-component.c
+ (calendar_config_set_tasks_due_today_color),
+ (calendar_config_set_tasks_overdue_color):
+ Accept a GdkColor instead of an X color specification.
+
+ * gui/e-cal-model-tasks.c (ecmt_get_color_for_component):
+ Adapt to modified color API in calendar-component.c by converting
+ the GdkColor to an X color specification. This is an ugly hack to
+ be fixed later.
+
+ * gui/dialogs/cal-prefs-dialog.c:
+ * gui/dialogs/cal-prefs-dialog.glade:
+ * gui/dialogs/calendar-setup.c:
+ * gui/dialogs/calendar-setup.glade:
+ Migrate from GnomeColorPicker to GtkColorButton.
+
2007-03-29 Matthew Barnes <mbarnes@redhat.com>
* gui/e-cal-component-memo-preview.c (write_html):
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 17824272b4..d528202a50 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -252,7 +252,7 @@ ensure_sources (CalendarComponent *component)
}
g_free (primary_calendar);
- e_source_set_color (personal_source, 0xBECEDD);
+ e_source_set_color_spec (personal_source, "#BECEDD");
}
if (!on_the_web) {
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 6ec6386a79..9a1221274e 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -1219,68 +1219,104 @@ on_timezone_dialog_delete_event (GnomeDialog *dialog,
/**
* calendar_config_get_tasks_due_today_color:
+ * @color: the location to store the color
*
* Queries the color to be used to display tasks that are due today.
- *
- * Return value: An X color specification.
**/
-const char *
-calendar_config_get_tasks_due_today_color (void)
+void
+calendar_config_get_tasks_due_today_color (GdkColor *color)
{
- static char *color = NULL;
+ const gchar *key = CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR;
+ GError *error = NULL;
+ gchar *color_spec;
- if (color)
- g_free (color);
+ g_return_if_fail (color != NULL);
- color = gconf_client_get_string (config, CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR, NULL);
- return color;
+ color_spec = gconf_client_get_string (config, key, &error);
+
+ if (color_spec != NULL && !gdk_color_parse (color_spec, color))
+ g_warning ("Unknown color \"%s\"", color_spec);
+ else if (error != NULL) {
+ g_warning ("%s", error->message);
+ g_error_free (error);
+ }
+
+ g_free (color_spec);
}
/**
* calendar_config_set_tasks_due_today_color:
- * @color: X color specification
+ * @color: a #GdkColor
*
* Sets the color to be used to display tasks that are due today.
**/
void
-calendar_config_set_tasks_due_today_color (const char *color)
+calendar_config_set_tasks_due_today_color (GdkColor *color)
{
+ const gchar *key = CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR;
+ GError *error = NULL;
+ gchar color_spec[16];
+
g_return_if_fail (color != NULL);
- gconf_client_set_string (config, CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR, color, NULL);
+ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x",
+ color->red, color->green, color->blue);
+
+ if (!gconf_client_set_string (config, key, color_spec, &error)) {
+ g_warning ("%s", error->message);
+ g_error_free (error);
+ }
}
/**
* calendar_config_get_tasks_overdue_color:
+ * @color: the location to store the color
*
* Queries the color to be used to display overdue tasks.
- *
- * Return value: An X color specification.
**/
-const char *
-calendar_config_get_tasks_overdue_color (void)
+void
+calendar_config_get_tasks_overdue_color (GdkColor *color)
{
- static char *color = NULL;
+ const gchar *key = CALENDAR_CONFIG_TASKS_OVERDUE_COLOR;
+ GError *error = NULL;
+ gchar *color_spec;
- if (color)
- g_free (color);
+ g_return_if_fail (color != NULL);
- color = gconf_client_get_string (config, CALENDAR_CONFIG_TASKS_OVERDUE_COLOR, NULL);
- return color;
+ color_spec = gconf_client_get_string (config, key, &error);
+
+ if (color_spec != NULL && !gdk_color_parse (color_spec, color))
+ g_warning ("Unknown color \"%s\"", color_spec);
+ else if (error != NULL) {
+ g_warning ("%s", error->message);
+ g_error_free (error);
+ }
+
+ g_free (color_spec);
}
/**
* calendar_config_set_tasks_overdue_color:
- * @color: X color specification
+ * @color: a #GdkColor
*
* Sets the color to be used to display overdue tasks.
**/
void
-calendar_config_set_tasks_overdue_color (const char *color)
+calendar_config_set_tasks_overdue_color (GdkColor *color)
{
+ const gchar *key = CALENDAR_CONFIG_TASKS_OVERDUE_COLOR;
+ GError *error = NULL;
+ gchar color_spec[16];
+
g_return_if_fail (color != NULL);
- gconf_client_set_string (config, CALENDAR_CONFIG_TASKS_OVERDUE_COLOR, color, NULL);
+ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x",
+ color->red, color->green, color->blue);
+
+ if (!gconf_client_set_string (config, key, color_spec, &error)) {
+ g_warning ("%s", error->message);
+ g_error_free (error);
+ }
}
/**
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index 9b97c1e6c2..8e24792647 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -31,6 +31,7 @@
#define _CALENDAR_CONFIG_H_
#include <glib.h>
+#include <gdk/gdk.h>
#include <libecal/e-cal.h>
#include <gconf/gconf-client.h>
@@ -201,11 +202,11 @@ void calendar_config_set_primary_memos (const char *primary_uid);
guint calendar_config_add_notification_primary_memos (GConfClientNotifyFunc func, gpointer data);
/* Colors for the task list */
-const char *calendar_config_get_tasks_due_today_color (void);
-void calendar_config_set_tasks_due_today_color (const char *color);
+void calendar_config_get_tasks_due_today_color (GdkColor *color);
+void calendar_config_set_tasks_due_today_color (GdkColor *color);
-const char *calendar_config_get_tasks_overdue_color (void);
-void calendar_config_set_tasks_overdue_color (const char *color);
+void calendar_config_get_tasks_overdue_color (GdkColor *color);
+void calendar_config_set_tasks_overdue_color (GdkColor *color);
/* Settings to hide completed tasks. */
gboolean calendar_config_get_hide_completed_tasks (void);
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 38f9ed50a6..665f76d2c6 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -31,7 +31,6 @@
#include "../e-timezone-entry.h"
#include "../calendar-config.h"
#include "cal-prefs-dialog.h"
-#include <libgnomeui/gnome-color-picker.h>
#include <widgets/misc/e-dateedit.h>
#include <e-util/e-dialog-widgets.h>
#include <e-util/e-util-private.h>
@@ -95,21 +94,6 @@ eccp_widget_glade (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
return glade_xml_get_widget (prefs->gui, item->label);
}
-/* Returns a pointer to a static string with an X color spec for the current
- * value of a color picker.
- */
-static const char *
-spec_from_picker (GtkWidget *picker)
-{
- static char spec[8];
- guint8 r, g, b;
-
- gnome_color_picker_get_i8 (GNOME_COLOR_PICKER (picker), &r, &g, &b, NULL);
- g_snprintf (spec, sizeof (spec), "#%02x%02x%02x", r, g, b);
-
- return spec;
-}
-
static void
working_days_changed (GtkWidget *widget, CalendarPrefsDialog *prefs)
{
@@ -276,15 +260,21 @@ hide_completed_tasks_units_changed (GtkWidget *widget, CalendarPrefsDialog *pref
}
static void
-tasks_due_today_set_color (GnomeColorPicker *picker, guint r, guint g, guint b, guint a, CalendarPrefsDialog *prefs)
+tasks_due_today_set_color (GtkColorButton *color_button, CalendarPrefsDialog *prefs)
{
- calendar_config_set_tasks_due_today_color (spec_from_picker (prefs->tasks_due_today_color));
+ GdkColor color;
+
+ gtk_color_button_get_color (color_button, &color);
+ calendar_config_set_tasks_due_today_color (&color);
}
static void
-tasks_overdue_set_color (GnomeColorPicker *picker, guint r, guint g, guint b, guint a, CalendarPrefsDialog *prefs)
+tasks_overdue_set_color (GtkColorButton *color_button, CalendarPrefsDialog *prefs)
{
- calendar_config_set_tasks_overdue_color (spec_from_picker (prefs->tasks_overdue_color));
+ GdkColor color;
+
+ gtk_color_button_get_color (color_button, &color);
+ calendar_config_set_tasks_overdue_color (&color);
}
static void
@@ -416,22 +406,6 @@ setup_changes (CalendarPrefsDialog *prefs)
g_signal_connect (G_OBJECT (prefs->template_url), "changed", G_CALLBACK (template_url_changed), prefs);
}
-/* Sets the color in a color picker from an X color spec */
-static void
-set_color_picker (GtkWidget *picker, const char *spec)
-{
- GdkColor color;
-
- if (!spec || !gdk_color_parse (spec, &color))
- color.red = color.green = color.blue = 0;
-
- gnome_color_picker_set_i16 (GNOME_COLOR_PICKER (picker),
- color.red,
- color.green,
- color.blue,
- 65535);
-}
-
/* Shows the current Free/Busy settings in the dialog */
static void
show_fb_config (CalendarPrefsDialog *prefs)
@@ -448,11 +422,18 @@ show_fb_config (CalendarPrefsDialog *prefs)
static void
show_task_list_config (CalendarPrefsDialog *prefs)
{
+ GtkColorButton *color_button;
+ GdkColor color;
CalUnits units;
gboolean hide_completed_tasks = FALSE;
- set_color_picker (prefs->tasks_due_today_color, calendar_config_get_tasks_due_today_color ());
- set_color_picker (prefs->tasks_overdue_color, calendar_config_get_tasks_overdue_color ());
+ color_button = GTK_COLOR_BUTTON (prefs->tasks_due_today_color);
+ calendar_config_get_tasks_due_today_color (&color);
+ gtk_color_button_set_color (color_button, &color);
+
+ color_button = GTK_COLOR_BUTTON (prefs->tasks_overdue_color);
+ calendar_config_get_tasks_overdue_color (&color);
+ gtk_color_button_set_color (color_button, &color);
/* Hide Completed Tasks. */
e_dialog_toggle_set (prefs->tasks_hide_completed, calendar_config_get_hide_completed_tasks ());
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
index 92ca58e1c6..18c9421b11 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ b/calendar/gui/dialogs/cal-prefs-dialog.glade
@@ -1231,10 +1231,9 @@ Days</property>
</child>
<child>
- <widget class="GnomeColorPicker" id="tasks_due_today_color">
+ <widget class="GtkColorButton" id="tasks_due_today_color">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
<property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
@@ -1250,10 +1249,9 @@ Days</property>
</child>
<child>
- <widget class="GnomeColorPicker" id="tasks_overdue_color">
+ <widget class="GtkColorButton" id="tasks_overdue_color">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
<property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index 4e679054e6..543a3555c7 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -73,44 +73,22 @@ eccp_check_complete (EConfig *ec, const char *pageid, void *data)
}
static void
-colorpicker_set_color (GnomeColorPicker *color, guint32 rgb)
-{
- gnome_color_picker_set_i8 (color, (rgb & 0xff0000) >> 16, (rgb & 0xff00) >> 8, rgb & 0xff, 0xff);
-}
-
-static guint32
-colorpicker_get_color (GnomeColorPicker *color)
-{
- guint8 r, g, b, a;
- guint32 rgb = 0;
-
- gnome_color_picker_get_i8 (color, &r, &g, &b, &a);
-
- rgb = r;
- rgb <<= 8;
- rgb |= g;
- rgb <<= 8;
- rgb |= b;
-
- return rgb;
-}
-
-static void
eccp_commit (EConfig *ec, GSList *items, void *data)
{
CalendarSourceDialog *sdialog = data;
xmlNodePtr xml;
if (sdialog->original_source) {
- guint32 color;
+ const gchar *color_spec;
xml = xmlNewNode (NULL, "dummy");
e_source_dump_to_xml_node (sdialog->source, xml);
e_source_update_from_xml_node (sdialog->original_source, xml->children, NULL);
xmlFreeNode (xml);
- if (e_source_get_color (sdialog->source, &color))
- e_source_set_color (sdialog->original_source, color);
+ color_spec = e_source_peek_color_spec (sdialog->source);
+ if (color_spec != NULL)
+ e_source_set_color_spec (sdialog->original_source, color_spec);
} else {
e_source_group_add_source (sdialog->source_group, sdialog->source, -1);
e_source_list_sync (sdialog->source_list, NULL);
@@ -304,63 +282,80 @@ eccp_general_offline (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent,
}
static void
-color_changed (GnomeColorPicker *picker, guint r, guint g, guint b, guint a, ECalConfigTargetSource *t)
+color_changed (GtkColorButton *color_button, ECalConfigTargetSource *target)
{
- ESource *source = t->source;
- e_source_set_color (source, colorpicker_get_color (picker));
+ ESource *source = target->source;
+ gchar color_spec[16];
+ GdkColor color;
+
+ gtk_color_button_get_color (color_button, &color);
+ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x",
+ color.red, color.green, color.blue);
+ e_source_set_color_spec (source, color_spec);
+}
+
+static const gchar *
+choose_initial_color (void)
+{
+ static const gchar *colors[] = {
+ "#BECEDD", /* 190 206 221 Blue */
+ "#E2F0EF", /* 226 240 239 Light Blue */
+ "#C6E2B7", /* 198 226 183 Green */
+ "#E2F0D3", /* 226 240 211 Light Green */
+ "#E2D4B7", /* 226 212 183 Khaki */
+ "#EAEAC1", /* 234 234 193 Light Khaki */
+ "#F0B8B7", /* 240 184 183 Pink */
+ "#FED4D3", /* 254 212 211 Light Pink */
+ "#E2C6E1", /* 226 198 225 Purple */
+ "#F0E2EF" /* 240 226 239 Light Purple */
+ };
+
+ return colors[g_random_int_range (0, G_N_ELEMENTS (colors))];
}
static GtkWidget *
eccp_get_source_color (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
{
CalendarSourceDialog *sdialog = data;
- static GtkWidget *label, *picker;
- int row;
- ECalConfigTargetSource *t = (ECalConfigTargetSource *) ec->target;
- static guint32 assigned_colors[] = {
- 0xBECEDD, /* 190 206 221 Blue */
- 0xE2F0EF, /* 226 240 239 Light Blue */
- 0xC6E2B7, /* 198 226 183 Green */
- 0xE2F0D3, /* 226 240 211 Light Green */
- 0xE2D4B7, /* 226 212 183 Khaki */
- 0xEAEAC1, /* 234 234 193 Light Khaki */
- 0xF0B8B7, /* 240 184 183 Pink */
- 0xFED4D3, /* 254 212 211 Light Pink */
- 0xE2C6E1, /* 226 198 225 Purple */
- 0xF0E2EF /* 240 226 239 Light Purple */
- };
- GRand *rand = g_rand_new ();
- guint32 color;
+ static GtkWidget *label, *color_button;
+ guint row = GTK_TABLE (parent)->nrows;
+ const gchar *color_spec = NULL;
+ GdkColor color;
if (old)
gtk_widget_destroy (label);
- row = ((GtkTable*)parent)->nrows;
+ if (sdialog->original_source)
+ color_spec = e_source_peek_color_spec (sdialog->original_source);
- color = assigned_colors[g_rand_int_range (rand, 0, 9)];
- g_rand_free (rand);
+ if (color_spec == NULL) {
+ color_spec = choose_initial_color ();
+ e_source_set_color_spec (sdialog->source, color_spec);
+ }
+
+ if (!gdk_color_parse (color_spec, &color))
+ g_warning ("Unknown color \"%s\" in calendar \"%s\"",
+ color_spec, e_source_peek_name (sdialog->source));
label = gtk_label_new_with_mnemonic (_("C_olor:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach (
+ GTK_TABLE (parent), label,
+ 0, 1, row, row + 1, GTK_FILL, 0, 0, 0);
gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0);
- picker = gnome_color_picker_new ();
- gtk_widget_show (picker);
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), picker);
- gtk_table_attach (GTK_TABLE (parent), picker, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
- g_signal_connect (G_OBJECT (picker), "color-set", G_CALLBACK (color_changed), t);
-
- if (sdialog->original_source)
- e_source_get_color (sdialog->original_source, &color);
- else
- /* since we don't have an original source here, we want to set
- * the initial color */
- e_source_set_color (sdialog->source, color);
+ color_button = gtk_color_button_new_with_color (&color);
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), color_button);
+ gtk_table_attach (
+ GTK_TABLE (parent), color_button,
+ 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+ gtk_widget_show (color_button);
- colorpicker_set_color (GNOME_COLOR_PICKER (picker), color);
+ g_signal_connect (
+ G_OBJECT (color_button), "color-set",
+ G_CALLBACK (color_changed), ec->target);
- return picker;
+ return color_button;
}
static ECalConfigItem eccp_items[] = {
@@ -414,7 +409,7 @@ calendar_setup_edit_calendar (struct _GtkWindow *parent, ESource *source, ESourc
ECalConfigTargetSource *target;
if (source) {
- guint32 color;
+ const gchar *color_spec;
sdialog->original_source = source;
g_object_ref (source);
@@ -423,8 +418,9 @@ calendar_setup_edit_calendar (struct _GtkWindow *parent, ESource *source, ESourc
sdialog->source = e_source_new_from_standalone_xml (xml);
g_free (xml);
- if (e_source_get_color (source, &color))
- e_source_set_color (sdialog->source, color);
+ color_spec = e_source_peek_color_spec (source);
+ if (color_spec != NULL)
+ e_source_set_color_spec (sdialog->source, color_spec);
} else {
GConfClient *gconf;
GSList *l, *ptr, *temp = NULL;
@@ -504,7 +500,7 @@ calendar_setup_edit_task_list (struct _GtkWindow *parent, ESource *source)
ECalConfigTargetSource *target;
if (source) {
- guint32 color;
+ const gchar *color_spec;
sdialog->original_source = source;
g_object_ref (source);
@@ -513,8 +509,8 @@ calendar_setup_edit_task_list (struct _GtkWindow *parent, ESource *source)
sdialog->source = e_source_new_from_standalone_xml (xml);
g_free (xml);
- e_source_get_color (source, &color);
- e_source_set_color (sdialog->source, color);
+ color_spec = e_source_peek_color_spec (source);
+ e_source_set_color_spec (sdialog->source, color_spec);
} else {
GConfClient *gconf;
GSList *l, *ptr, *temp = NULL;
@@ -589,7 +585,7 @@ calendar_setup_edit_memo_list (struct _GtkWindow *parent, ESource *source)
ECalConfigTargetSource *target;
if (source) {
- guint32 color;
+ const gchar *color_spec;
sdialog->original_source = source;
g_object_ref (source);
@@ -598,8 +594,8 @@ calendar_setup_edit_memo_list (struct _GtkWindow *parent, ESource *source)
sdialog->source = e_source_new_from_standalone_xml (xml);
g_free (xml);
- e_source_get_color (source, &color);
- e_source_set_color (sdialog->source, color);
+ color_spec = e_source_peek_color_spec (source);
+ e_source_set_color_spec (sdialog->source, color_spec);
} else {
GConfClient *gconf;
GSList *l;
diff --git a/calendar/gui/dialogs/calendar-setup.glade b/calendar/gui/dialogs/calendar-setup.glade
index da2947d9c7..75631fe1fc 100644
--- a/calendar/gui/dialogs/calendar-setup.glade
+++ b/calendar/gui/dialogs/calendar-setup.glade
@@ -338,10 +338,9 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="source-color">
+ <widget class="GtkColorButton" id="source-color">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
<property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
@@ -587,10 +586,9 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="source-color">
+ <widget class="GtkColorButton" id="source-color">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
<property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index b481c52048..cb989b0845 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -1025,14 +1025,28 @@ ecmt_value_to_string (ETableModel *etm, int col, const void *value)
static const char *
ecmt_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data)
{
+ static gchar color_spec[16];
+ GdkColor color;
+
g_return_val_if_fail (E_IS_CAL_MODEL_TASKS (model), NULL);
g_return_val_if_fail (comp_data != NULL, NULL);
+ /* XXX ECalModel's get_color_for_component() method should really
+ * get a GdkColor instead of a color specification string. */
+
switch (get_due_status ((ECalModelTasks *) model, comp_data)) {
case E_CAL_MODEL_TASKS_DUE_TODAY:
- return calendar_config_get_tasks_due_today_color ();
+ /* XXX ugly hack */
+ calendar_config_get_tasks_due_today_color (&color);
+ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x",
+ color.red, color.green, color.blue);
+ return color_spec;
case E_CAL_MODEL_TASKS_DUE_OVERDUE:
- return calendar_config_get_tasks_overdue_color ();
+ /* XXX ugly hack */
+ calendar_config_get_tasks_overdue_color (&color);
+ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x",
+ color.red, color.green, color.blue);
+ return color_spec;
case E_CAL_MODEL_TASKS_DUE_NEVER:
case E_CAL_MODEL_TASKS_DUE_FUTURE:
case E_CAL_MODEL_TASKS_DUE_COMPLETE:
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 19bd29e8f7..78afb704a3 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -947,7 +947,7 @@ static const char *
ecm_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data)
{
ESource *source;
- guint32 source_color;
+ const gchar *color_spec;
gint i, first_empty = 0;
static AssignedColorData assigned_colors[] = {
{ "#BECEDD", NULL }, /* 190 206 221 Blue */
@@ -965,9 +965,10 @@ ecm_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data)
g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
source = e_cal_get_source (comp_data->client);
- if (e_source_get_color (source, &source_color)) {
+ color_spec = e_source_peek_color_spec (source);
+ if (color_spec != NULL) {
g_free (comp_data->color);
- comp_data->color = g_strdup_printf ("#%06x", source_color & 0xffffff);
+ comp_data->color = g_strdup (color_spec);
return comp_data->color;
}
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index 81d3208cd2..b304a41dbd 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -213,7 +213,7 @@ ensure_sources (MemosComponent *component)
calendar_config_set_memos_selected (&selected);
}
- e_source_set_color (source, 0xBECEDD);
+ e_source_set_color_spec (source, "#BECEDD");
personal_source = source;
}
diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c
index feffff101f..65c759ce40 100644
--- a/calendar/gui/migration.c
+++ b/calendar/gui/migration.c
@@ -406,7 +406,7 @@ create_calendar_contact_source (ESourceList *source_list)
e_source_group_add_source (group, source, -1);
g_object_unref (source);
- e_source_set_color (source, 0xFED4D3);
+ e_source_set_color_spec (source, "#FED4D3");
e_source_group_set_readonly (group, TRUE);
return group;
@@ -497,7 +497,7 @@ create_calendar_sources (CalendarComponent *component,
}
g_free (primary_calendar);
- e_source_set_color (source, 0xBECEDD);
+ e_source_set_color_spec (source, "#BECEDD");
*personal_source = source;
}
@@ -590,7 +590,7 @@ create_task_sources (TasksComponent *component,
calendar_config_set_tasks_selected (&selected);
}
- e_source_set_color (source, 0xBECEDD);
+ e_source_set_color_spec (source, "#BECEDD");
*personal_source = source;
}
@@ -1098,7 +1098,7 @@ create_memo_sources (MemosComponent *component,
calendar_config_set_memos_selected (&selected);
}
- e_source_set_color (source, 0xBECEDD);
+ e_source_set_color_spec (source, "#BECEDD");
*personal_source = source;
}
@@ -1161,7 +1161,7 @@ add_gw_esource (ESourceList *source_list, const char *group_name, const char *s
e_source_set_property (source, "use_ssl", use_ssl);
e_source_set_property (source, "offline_sync", offline_sync ? "1" : "0" );
- e_source_set_color (source, 0xEEBC60);
+ e_source_set_color_spec (source, "#EEBC60");
e_source_group_add_source (group, source, -1);
ids = gconf_client_get_list (client, CALENDAR_CONFIG_MEMOS_SELECTED_MEMOS, GCONF_VALUE_STRING, NULL);
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 4e9643dc92..2fc9bc8d62 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -209,7 +209,7 @@ ensure_sources (TasksComponent *component)
calendar_config_set_tasks_selected (&selected);
}
- e_source_set_color (source, 0xBECEDD);
+ e_source_set_color_spec (source, "#BECEDD");
personal_source = source;
}
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 95e4d1da52..70bc1a371c 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,23 @@
+2007-04-01 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #373116
+
+ * filter-colour.h:
+ Store color as a GdkColor instead of separate RGBA components.
+
+ * filter-colour.c (color_eq):
+ Use gdk_color_equal() to compare colors.
+
+ * filter-colour.c (xml_encode):
+ Encode color as a single property ("spec").
+
+ * filter-colour.c (xml_decode):
+ Read the color from a single property ("spec").
+ Provide a migration path for old XML files.
+
+ * filter-colour.c (get_widget):
+ Migrate from GnomeColorPicker to GtkColorButton.
+
2007-03-20 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #419524
diff --git a/filter/filter-colour.c b/filter/filter-colour.c
index 78db9d848c..97a343bc63 100644
--- a/filter/filter-colour.c
+++ b/filter/filter-colour.c
@@ -26,7 +26,7 @@
#endif
#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-color-picker.h>
+#include <gtk/gtkcolorbutton.h>
#include "libedataserver/e-sexp.h"
#include "filter-colour.h"
@@ -120,13 +120,11 @@ filter_colour_new (void)
static int
colour_eq (FilterElement *fe, FilterElement *cm)
{
- FilterColour *fc = (FilterColour *)fe, *cc = (FilterColour *)cm;
-
- return FILTER_ELEMENT_CLASS (parent_class)->eq (fe, cm)
- && fc->r == cc->r
- && fc->g == cc->g
- && fc->b == cc->b
- && fc->a == cc->a;
+ FilterColour *fc = (FilterColour *) fe;
+ FilterColour *cc = (FilterColour *) cm;
+
+ return FILTER_ELEMENT_CLASS (parent_class)->eq (fe, cm)
+ && gdk_color_equal (&fc->color, &cc->color);
}
static void
@@ -139,76 +137,70 @@ xml_create (FilterElement *fe, xmlNodePtr node)
static xmlNodePtr
xml_encode (FilterElement *fe)
{
- xmlNodePtr value;
FilterColour *fc = (FilterColour *)fe;
- char hex[16];
-
- d(printf("Encoding colour as xml\n"));
+ xmlNodePtr value;
+ gchar spec[16];
+
+ g_snprintf (spec, sizeof (spec), "#%04x%04x%04x",
+ fc->color.red, fc->color.green, fc->color.blue);
+
value = xmlNewNode(NULL, "value");
xmlSetProp(value, "name", fe->name);
xmlSetProp(value, "type", "colour");
-
- sprintf(hex, "%04x", fc->r);
- xmlSetProp(value, "red", hex);
- sprintf(hex, "%04x", fc->g);
- xmlSetProp(value, "green", hex);
- sprintf(hex, "%04x", fc->b);
- xmlSetProp(value, "blue", hex);
- sprintf(hex, "%04x", fc->a);
- xmlSetProp(value, "alpha", hex);
-
- return value;
-}
+ xmlSetProp(value, "spec", spec);
-static guint16
-get_value (xmlNodePtr node, char *name)
-{
- unsigned int ret;
- char *value;
-
- value = xmlGetProp(node, name);
- sscanf(value, "%04x", &ret);
- xmlFree(value);
- return ret;
+ return value;
}
-
static int
xml_decode (FilterElement *fe, xmlNodePtr node)
{
FilterColour *fc = (FilterColour *)fe;
-
+ xmlChar *prop;
+
xmlFree (fe->name);
fe->name = xmlGetProp(node, "name");
- fc->r = get_value(node, "red");
- fc->g = get_value(node, "green");
- fc->b = get_value(node, "blue");
- fc->a = get_value(node, "alpha");
-
+
+ prop = xmlGetProp(node, "spec");
+ if (prop != NULL) {
+ gdk_color_parse(prop, &fc->color);
+ xmlFree (prop);
+ } else {
+ /* try reading the old RGB properties */
+ prop = xmlGetProp(node, "red");
+ sscanf(prop, "%" G_GINT16_MODIFIER "x", &fc->color.red);
+ xmlFree (prop);
+ prop = xmlGetProp(node, "green");
+ sscanf(prop, "%" G_GINT16_MODIFIER "x", &fc->color.green);
+ xmlFree (prop);
+ prop = xmlGetProp(node, "blue");
+ sscanf(prop, "%" G_GINT16_MODIFIER "x", &fc->color.blue);
+ xmlFree (prop);
+ }
+
return 0;
}
static void
-set_colour (GnomeColorPicker *cp, guint r, guint g, guint b, guint a, FilterColour *fc)
+set_color (GtkColorButton *color_button, FilterColour *fc)
{
- fc->r = r;
- fc->g = g;
- fc->b = b;
- fc->a = a;
+ gtk_color_button_get_color (color_button, &fc->color);
}
static GtkWidget *
get_widget (FilterElement *fe)
{
FilterColour *fc = (FilterColour *) fe;
- GnomeColorPicker *cp;
-
- cp = (GnomeColorPicker *) gnome_color_picker_new ();
- gnome_color_picker_set_i16 (cp, fc->r, fc->g, fc->b, fc->a);
- gtk_widget_show ((GtkWidget *) cp);
- g_signal_connect (cp, "color_set", G_CALLBACK (set_colour), fe);
+ GtkWidget *color_button;
+
+ color_button = gtk_color_button_new_with_color (&fc->color);
+ gtk_widget_show (color_button);
+
+ g_signal_connect (
+ G_OBJECT (color_button), "color_set",
+ G_CALLBACK (set_color), fe);
- return (GtkWidget *) cp;
+ return color_button;
}
static void
@@ -221,9 +213,9 @@ static void
format_sexp (FilterElement *fe, GString *out)
{
FilterColour *fc = (FilterColour *)fe;
- char *str;
-
- str = g_strdup_printf ("#%02x%02x%02x", (fc->r >> 8) & 0xff, (fc->g >> 8) & 0xff, (fc->b >> 8) & 0xff);
- e_sexp_encode_string (out, str);
- g_free (str);
+ gchar spec[16];
+
+ g_snprintf (spec, sizeof (spec), "#%04x%04x%04x",
+ fc->color.red, fc->color.green, fc->color.blue);
+ e_sexp_encode_string (out, spec);
}
diff --git a/filter/filter-colour.h b/filter/filter-colour.h
index 9e22a2021f..e1bf347d9b 100644
--- a/filter/filter-colour.h
+++ b/filter/filter-colour.h
@@ -39,7 +39,7 @@ typedef struct _FilterColourClass FilterColourClass;
struct _FilterColour {
FilterElement parent_object;
- guint16 r, g, b, a;
+ GdkColor color;
};
struct _FilterColourClass {
diff --git a/filter/filter-element.c b/filter/filter-element.c
index 11b848216f..60ca789a69 100644
--- a/filter/filter-element.c
+++ b/filter/filter-element.c
@@ -293,12 +293,10 @@ copy_value(FilterElement *de, FilterElement *se)
}
} else if (IS_FILTER_COLOUR(se)) {
if (IS_FILTER_COLOUR(de)) {
- FilterColour *s = (FilterColour *)se, *d = (FilterColour *)de;
+ FilterColour *s = (FilterColour *)se;
+ FilterColour *d = (FilterColour *)de;
- d->r = s->r;
- d->g = s->g;
- d->b = s->b;
- d->a = s->a;
+ d->color = s->color;
}
} else if (IS_FILTER_DATESPEC(se)) {
if (IS_FILTER_DATESPEC(de)) {
diff --git a/mail/ChangeLog b/mail/ChangeLog
index c818437768..50346e240d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,14 @@
+2007-04-01 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #373117
+
+ * em-composer-prefs.c:
+ * em-composer-prefs.h:
+ * em-mailer-prefs.c:
+ * em-mailer-prefs.h:
+ * mail-config.glade:
+ Migrate from GnomeColorPicker to GtkColorButton.
+
2007-03-30 Matthew Barnes <mbarnes@redhat.com>
* em-format-html-display.c (icon_entry_changed_cb): Fix a typo.
diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c
index 616f3a43ae..96813058ea 100644
--- a/mail/em-composer-prefs.c
+++ b/mail/em-composer-prefs.c
@@ -56,9 +56,8 @@
#include <gtk/gtkcellrenderertext.h>
#include <gtk/gtkimage.h>
#include <gtk/gtkstock.h>
-
+#include <gtk/gtkcolorbutton.h>
#include <gtk/gtkfilechooserbutton.h>
-#include <libgnomeui/gnome-color-picker.h>
#include <gtkhtml/gtkhtml.h>
@@ -545,7 +544,7 @@ spell_set_ui (EMComposerPrefs *prefs)
GtkTreeIter iter;
GError *err = NULL;
char **strv = NULL;
- guint r, g, b;
+ GdkColor color;
gboolean go;
char *lang;
int i;
@@ -580,21 +579,33 @@ spell_set_ui (EMComposerPrefs *prefs)
if (strv != NULL)
g_strfreev (strv);
- r = gconf_client_get_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_red", NULL);
- g = gconf_client_get_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_green", NULL);
- b = gconf_client_get_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_blue", NULL);
-
- gnome_color_picker_set_i16 (GNOME_COLOR_PICKER (prefs->colour), r, g, b, 0xffff);
+ color.red = gconf_client_get_int (prefs->gconf,
+ GNOME_SPELL_GCONF_DIR "/spell_error_color_red", NULL);
+ color.green = gconf_client_get_int (prefs->gconf,
+ GNOME_SPELL_GCONF_DIR "/spell_error_color_green", NULL);
+ color.blue = gconf_client_get_int (prefs->gconf,
+ GNOME_SPELL_GCONF_DIR "/spell_error_color_blue", NULL);
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (prefs->color), &color);
prefs->spell_active = TRUE;
}
static void
-spell_color_set (GtkWidget *widget, guint r, guint g, guint b, guint a, EMComposerPrefs *prefs)
+spell_color_set (GtkColorButton *color_button, EMComposerPrefs *prefs)
{
- gconf_client_set_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_red", r, NULL);
- gconf_client_set_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_green", g, NULL);
- gconf_client_set_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_blue", b, NULL);
+ GdkColor color;
+
+ gtk_color_button_get_color (GTK_COLOR_BUTTON (color_button), &color);
+
+ gconf_client_set_int (prefs->gconf,
+ GNOME_SPELL_GCONF_DIR "/spell_error_color_red",
+ color.red, NULL);
+ gconf_client_set_int (prefs->gconf,
+ GNOME_SPELL_GCONF_DIR "/spell_error_color_green",
+ color.green, NULL);
+ gconf_client_set_int (prefs->gconf,
+ GNOME_SPELL_GCONF_DIR "/spell_error_color_blue",
+ color.blue, NULL);
}
static char *
@@ -676,7 +687,7 @@ spell_setup (EMComposerPrefs *prefs)
spell_set_ui (prefs);
- widget = glade_xml_get_widget (prefs->gui, "colorpickerSpellCheckColor");
+ widget = glade_xml_get_widget (prefs->gui, "colorButtonSpellCheckColor");
g_signal_connect (widget, "color_set", G_CALLBACK (spell_color_set), prefs);
}
@@ -922,7 +933,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs)
g_free (buf);
/* Spell Checking: GNOME Spell part */
- prefs->colour = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, "colorpickerSpellCheckColor"));
+ prefs->color = GTK_COLOR_BUTTON (glade_xml_get_widget (gui, "colorButtonSpellCheckColor"));
prefs->language = GTK_TREE_VIEW (glade_xml_get_widget (gui, "listSpellCheckLanguage"));
model = gtk_list_store_new (3, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER);
gtk_tree_view_set_model (prefs->language, (GtkTreeModel *) model);
@@ -942,7 +953,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs)
info_pixmap = glade_xml_get_widget (gui, "pixmapSpellInfo");
gtk_image_set_from_stock (GTK_IMAGE (info_pixmap), GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_BUTTON);
if (!spell_setup_check_options (prefs)) {
- gtk_widget_hide (GTK_WIDGET (prefs->colour));
+ gtk_widget_hide (GTK_WIDGET (prefs->color));
gtk_widget_hide (GTK_WIDGET (prefs->language));
}
diff --git a/mail/em-composer-prefs.h b/mail/em-composer-prefs.h
index ca64ead692..ecdbb22f3f 100644
--- a/mail/em-composer-prefs.h
+++ b/mail/em-composer-prefs.h
@@ -48,7 +48,6 @@ struct _GtkOptionMenu;
struct _GdkPixbuf;
struct _GtkWidget;
struct _GladeXML;
-struct _GnomeColorPicker;
struct _GConfClient;
struct _GtkButton;
struct _GtkTreeView;
@@ -71,7 +70,7 @@ struct _EMComposerPrefs {
struct _GtkOptionMenu *charset;
struct _GtkToggleButton *spell_check;
- struct _GnomeColorPicker *colour;
+ struct _GtkColorButton *color;
struct _GtkTreeView *language;
CORBA_sequence_GNOME_Spell_Language *language_seq;
gboolean spell_active;
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index c552ad7e92..064ef1256a 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -35,7 +35,7 @@
#include "misc/e-charset-picker.h"
#include <bonobo/bonobo-generic-factory.h>
-#include <libgnomeui/gnome-color-picker.h>
+#include <gtk/gtkcolorbutton.h>
#include <gtk/gtkfilechooserbutton.h>
#include <gtk/gtkfontbutton.h>
@@ -157,49 +157,27 @@ em_mailer_prefs_finalise (GObject *obj)
static void
-colorpicker_set_color (GnomeColorPicker *color, const char *str)
+color_button_set_color (GtkColorButton *color_button, const gchar *spec)
{
- GdkColor colour;
- guint32 rgb;
-
- gdk_color_parse (str, &colour);
- rgb = ((colour.red & 0xff00) << 8) | (colour.green & 0xff00) | ((colour.blue & 0xff00) >> 8);
-
- gnome_color_picker_set_i8 (color, (rgb & 0xff0000) >> 16, (rgb & 0xff00) >> 8, rgb & 0xff, 0xff);
-}
+ GdkColor color;
-static guint32
-colorpicker_get_color (GnomeColorPicker *color)
-{
- guint8 r, g, b, a;
- guint32 rgb = 0;
-
- gnome_color_picker_get_i8 (color, &r, &g, &b, &a);
-
- rgb = r;
- rgb <<= 8;
- rgb |= g;
- rgb <<= 8;
- rgb |= b;
-
- return rgb;
+ if (gdk_color_parse (spec, &color))
+ gtk_color_button_set_color (color_button, &color);
}
static void
-citation_color_set (GtkWidget *widget, guint r, guint g, guint b, guint a, EMMailerPrefs *prefs)
+citation_color_set (GtkColorButton *color_button, EMMailerPrefs *prefs)
{
- guint32 rgb = 0;
- char buf[20];
-
- rgb = r & 0xff;
- rgb <<= 8;
- rgb |= g & 0xff;
- rgb <<= 8;
- rgb |= b & 0xff;
-
- sprintf (buf, "#%06x", rgb & 0xffffff);
-
- gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/display/citation_colour", buf, NULL);
+ GdkColor color;
+ gchar spec[16];
+
+ gtk_color_button_get_color (color_button, &color);
+ g_snprintf (spec, sizeof (spec), "#%04x%04x%04x",
+ color.red, color.green, color.blue);
+
+ gconf_client_set_string (prefs->gconf,
+ "/apps/evolution/mail/display/citation_colour",
+ spec, NULL);
}
static void
@@ -212,9 +190,12 @@ labels_changed (EMMailerPrefs *prefs)
int i;
for (i = 4; i >= 0; i--) {
+ GdkColor color;
+
cstring = gtk_entry_get_text (prefs->labels[i].name);
- rgb = colorpicker_get_color (prefs->labels[i].color);
- string = g_strdup_printf ("%s:#%06x", cstring, rgb & 0xffffff);
+ gtk_color_button_get_color (prefs->labels[i].color, &color);
+ string = g_strdup_printf ("%s:#%04x%04x%04x", cstring,
+ color.red, color.green, color.blue);
list = g_slist_prepend (list, string);
}
@@ -249,7 +230,7 @@ restore_labels_clicked (GtkWidget *widget, gpointer user_data)
for (i = 0; i < 5; i++) {
gtk_entry_set_text (prefs->labels[i].name, _(label_defaults[i].name));
- colorpicker_set_color (prefs->labels[i].color, label_defaults[i].colour);
+ color_button_set_color (prefs->labels[i].color, label_defaults[i].colour);
atk_object_set_name(gtk_widget_get_accessible((GtkWidget *)prefs->labels[i].color), _(label_defaults[i].name));
}
}
@@ -812,9 +793,9 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs)
"/apps/evolution/mail/display/mark_citations",
G_CALLBACK (toggle_button_toggled));
- prefs->citation_color = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, "colorpickerHighlightCitations"));
+ prefs->citation_color = GTK_COLOR_BUTTON (glade_xml_get_widget (gui, "colorButtonHighlightCitations"));
buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/citation_colour", NULL);
- colorpicker_set_color (prefs->citation_color, buf ? buf : "#737373");
+ color_button_set_color (prefs->citation_color, buf ? buf : "#737373");
g_signal_connect (prefs->citation_color, "color-set", G_CALLBACK (citation_color_set), prefs);
if (!gconf_client_key_is_writable (prefs->gconf, "/apps/evolution/mail/display/citation_colour", NULL))
gtk_widget_set_sensitive ((GtkWidget *) prefs->citation_color, FALSE);
@@ -935,14 +916,14 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs)
g_free (widget_name);
widget_name = g_strdup_printf ("colorLabel%d", i);
- prefs->labels[i].color = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, widget_name));
+ prefs->labels[i].color = GTK_COLOR_BUTTON (glade_xml_get_widget (gui, widget_name));
gtk_widget_set_sensitive ((GtkWidget *) prefs->labels[i].color, !locked);
g_free (widget_name);
gtk_entry_set_text (prefs->labels[i].name, label->name);
g_signal_connect (prefs->labels[i].name, "changed", G_CALLBACK (label_entry_changed), prefs);
- colorpicker_set_color (prefs->labels[i].color, label->colour);
+ color_button_set_color (prefs->labels[i].color, label->colour);
g_signal_connect (prefs->labels[i].color, "color-set", G_CALLBACK (label_color_set), prefs);
atk_object_set_name(gtk_widget_get_accessible((GtkWidget *)prefs->labels[i].color), label->name);
diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h
index 582938a2d9..9a8222a3ba 100644
--- a/mail/em-mailer-prefs.h
+++ b/mail/em-mailer-prefs.h
@@ -37,7 +37,6 @@ struct _GtkOptionMenu;
struct _GdkPixbuf;
struct _GtkWidget;
struct _GladeXML;
-struct _GnomeColorPicker;
struct _GtkFileChooserbutton;
struct _GtkFontButton;
struct _GConfClient;
@@ -80,7 +79,7 @@ struct _EMMailerPrefs {
struct _GtkSpinButton *mlimit_count;
struct _GtkOptionMenu *charset;
struct _GtkToggleButton *citation_highlight;
- struct _GnomeColorPicker *citation_color;
+ struct _GtkColorButton *citation_color;
/* Deleting Mail */
struct _GtkToggleButton *empty_trash;
@@ -110,7 +109,7 @@ struct _EMMailerPrefs {
/* Labels and Colours tab */
struct {
struct _GtkEntry *name;
- struct _GnomeColorPicker *color;
+ struct _GtkColorButton *color;
} labels[5];
struct _GtkButton *restore_labels;
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 9a14bd8881..6a1442b88b 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -5139,10 +5139,9 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
</child>
<child>
- <widget class="GnomeColorPicker" id="colorpickerHighlightCitations">
+ <widget class="GtkColorButton" id="colorButtonHighlightCitations">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
<property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
@@ -6080,10 +6079,9 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
<property name="column_spacing">6</property>
<child>
- <widget class="GnomeColorPicker" id="colorLabel0">
+ <widget class="GtkColorButton" id="colorLabel0">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
<property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
@@ -6099,10 +6097,9 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
</child>
<child>
- <widget class="GnomeColorPicker" id="colorLabel1">
+ <widget class="GtkColorButton" id="colorLabel1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
<property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
@@ -6118,10 +6115,9 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
</child>
<child>
- <widget class="GnomeColorPicker" id="colorLabel2">
+ <widget class="GtkColorButton" id="colorLabel2">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
<property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
@@ -6137,10 +6133,9 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
</child>
<child>
- <widget class="GnomeColorPicker" id="colorLabel3">
+ <widget class="GtkColorButton" id="colorLabel3">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
<property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
@@ -6156,10 +6151,9 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
</child>
<child>
- <widget class="GnomeColorPicker" id="colorLabel4">
+ <widget class="GtkColorButton" id="colorLabel4">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
<property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
@@ -8316,7 +8310,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="mnemonic_widget">colorpickerSpellCheckColor</property>
+ <property name="mnemonic_widget">colorButtonSpellCheckColor</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -8330,10 +8324,9 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
</child>
<child>
- <widget class="GnomeColorPicker" id="colorpickerSpellCheckColor">
+ <widget class="GtkColorButton" id="colorButtonSpellCheckColor">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
<property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog
index 19dd5f3054..a0a75f3106 100644
--- a/plugins/groupwise-account-setup/ChangeLog
+++ b/plugins/groupwise-account-setup/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-01 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #373116
+
+ * camel-gw-listener.c (add_esource):
+ Use the new ESource color API.
+
2007-02-09 Sankar P <psankar@novell.com>
* camel-gw-listener.c: (add_esource), (remove_esource),
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c
index 39328418a8..58c46b7bfe 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.c
+++ b/plugins/groupwise-account-setup/camel-gw-listener.c
@@ -212,12 +212,10 @@ add_esource (const char *conf_key, const char *group_name, const char *source_n
e_source_set_property (source, "use_ssl", use_ssl);
e_source_set_property (source, "offline_sync", offline_sync ? "1" : "0" );
if (parent_id_name) {
- guint32 color;
e_source_set_property (source, "parent_id_name", parent_id_name);
- color = (guint32) atoi((char *)(camel_url_get_param (url, "color")));
- e_source_set_color (source, color);
+ e_source_set_color_spec (source, camel_url_get_param (url, "color"));
} else
- e_source_set_color (source, 0xEEBC60);
+ e_source_set_color_spec (source, "#EEBC60");
e_source_group_add_source (group, source, -1);
e_source_list_sync (source_list, NULL);