[balsa/gtk3] Drop bad-address-color

[Peter Bloomfield <PeterB src gnome org>]

commit 46fd5abcfc3d47711f0741c33efe067fdff8f68b
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Wed Jun 22 21:49:45 2011 -0400

    Drop bad-address-color
    
    	* src/balsa-app.h:
    	* src/balsa-mime-widget-message.c (add_header_sigstate):
    	* src/pref-manager.c (open_preferences_manager), (apply_prefs),
    	(set_prefs), (colors_subpage):
    	* src/save-restore.c (config_global_load), (config_save):
    	* src/sendmsg-window.c (balsa_sendmsg_destroy_handler),
    	(create_info_pane):
    	* src/sendmsg-window.h:

 ChangeLog                       |   13 +++++++++++++
 src/balsa-app.h                 |    3 ---
 src/balsa-mime-widget-message.c |    4 +---
 src/pref-manager.c              |   27 ---------------------------
 src/save-restore.c              |    5 -----
 src/sendmsg-window.c            |    5 -----
 src/sendmsg-window.h            |    3 ---
 7 files changed, 14 insertions(+), 46 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4ac00e2..cd1b9d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2011-06-22  Peter Bloomfield
 
+	Drop bad-address-color
+
+	* src/balsa-app.h:
+	* src/balsa-mime-widget-message.c (add_header_sigstate):
+	* src/pref-manager.c (open_preferences_manager), (apply_prefs),
+	(set_prefs), (colors_subpage):
+	* src/save-restore.c (config_global_load), (config_save):
+	* src/sendmsg-window.c (balsa_sendmsg_destroy_handler),
+	(create_info_pane):
+	* src/sendmsg-window.h:
+
+2011-06-22  Peter Bloomfield
+
 	* src/sendmsg-window.c (add_attachment): do not cast non-widget
 	to GtkWidget*.
 
diff --git a/src/balsa-app.h b/src/balsa-app.h
index 3c7ec75..8fa5dbf 100644
--- a/src/balsa-app.h
+++ b/src/balsa-app.h
@@ -273,9 +273,6 @@ extern struct BalsaApplication {
     /* text color of URL's */
     GdkRGBA url_color;
 
-    /* label color of bad addresses */
-    GdkRGBA bad_address_color;
-
     guint pwindow_option;
     gboolean wordwrap;
     gint wraplength;
diff --git a/src/balsa-mime-widget-message.c b/src/balsa-mime-widget-message.c
index a8c992f..070d2c6 100644
--- a/src/balsa-mime-widget-message.c
+++ b/src/balsa-mime-widget-message.c
@@ -835,9 +835,7 @@ add_header_sigstate(GtkTextView * view, GMimeGpgmeSigstat * siginfo)
 						PANGO_STYLE_ITALIC,
 						"weight",
 						PANGO_WEIGHT_BOLD,
-						"foreground-gdk",
-						&balsa_app.
-						bad_address_color, NULL);
+                                                NULL);
     msg =
 	g_strdup_printf("%s%s",
 			libbalsa_gpgme_sig_protocol_name(siginfo->
diff --git a/src/pref-manager.c b/src/pref-manager.c
index d020818..6ae4cf1 100644
--- a/src/pref-manager.c
+++ b/src/pref-manager.c
@@ -156,7 +156,6 @@ typedef struct _PropertyUI {
     /* colours */
     GtkWidget *quoted_color[MAX_QUOTED_COLOR];
     GtkWidget *url_color;
-    GtkWidget *bad_address_color;
 
     /* sorting and threading prefs */
     GtkWidget *tree_expand_check;
@@ -246,7 +245,6 @@ static GtkWidget *colors_subpage(void);
 
 static GtkWidget *message_colors_group(GtkWidget * page);
 static GtkWidget *link_color_group(GtkWidget * page);
-static GtkWidget *composition_window_group(GtkWidget * page);
 
 static GtkWidget *format_subpage(void);
 
@@ -764,9 +762,6 @@ open_preferences_manager(GtkWidget * widget, gpointer data)
     g_signal_connect(G_OBJECT(pui->url_color), "released",
                      G_CALLBACK(properties_modified_cb), property_box);
 
-    g_signal_connect(G_OBJECT(pui->bad_address_color), "released",
-                     G_CALLBACK(properties_modified_cb), property_box);
-
     /* handling of message parts with 8-bit chars without codeset headers */
     for (i = 0; i < NUM_CONVERT_8BIT_MODES; i++)
         g_signal_connect(G_OBJECT(pui->convert_unknown_8bit[i]), "toggled",
@@ -1078,10 +1073,6 @@ apply_prefs(GtkDialog * pbox)
     gtk_color_button_get_rgba(GTK_COLOR_BUTTON(pui->url_color),
                               &balsa_app.url_color);
 
-    /* bad address color */
-    gtk_color_button_get_rgba(GTK_COLOR_BUTTON(pui->bad_address_color),
-                              &balsa_app.bad_address_color);
-
     /* sorting and threading */
     libbalsa_mailbox_set_sort_field(NULL, pui->sort_field_index);
     libbalsa_mailbox_set_threading_type(NULL, pui->threading_type_index);
@@ -1324,8 +1315,6 @@ set_prefs(void)
                                   &balsa_app.quoted_color[i]);
     gtk_color_button_set_rgba(GTK_COLOR_BUTTON(pui->url_color),
                               &balsa_app.url_color);
-    gtk_color_button_set_rgba(GTK_COLOR_BUTTON(pui->bad_address_color),
-                              &balsa_app.bad_address_color);
 
     /* Information Message */
     pm_combo_box_set_level(pui->information_message_menu,
@@ -2333,7 +2322,6 @@ colors_subpage(void)
 
     pm_page_add(page, message_colors_group(page), FALSE);
     pm_page_add(page, link_color_group(page), FALSE);
-    pm_page_add(page, composition_window_group(page), FALSE);
 
     return page;
 }
@@ -2371,21 +2359,6 @@ link_color_group(GtkWidget * page)
 }
 
 static GtkWidget *
-composition_window_group(GtkWidget * page)
-{
-    GtkWidget *group;
-    GtkWidget *vbox;
-
-    group = pm_group_new(_("Composition window"));
-    vbox = pm_group_get_vbox(group);
-    pui->bad_address_color =
-        color_box(GTK_BOX(vbox),
-                  _("Invalid or incomplete address label color"));
-
-    return group;
-}
-
-static GtkWidget *
 message_subpage(void)
 {
     GtkWidget *page = pm_page_new();
diff --git a/src/save-restore.c b/src/save-restore.c
index fa00dc3..4b94b84 100644
--- a/src/save-restore.c
+++ b/src/save-restore.c
@@ -752,10 +752,6 @@ config_global_load(void)
     /* URL coloring */
     load_color("UrlColor", DEFAULT_URL_COLOR, &balsa_app.url_color);
 
-    /* bad address coloring */
-    load_color("BadAddressColor", DEFAULT_BAD_ADDRESS_COLOR,
-               &balsa_app.bad_address_color);
-
     /* ... font used to display messages */
     g_free(balsa_app.message_font);
     balsa_app.message_font =
@@ -1289,7 +1285,6 @@ config_save(void)
     }
 
     save_color("UrlColor", &balsa_app.url_color);
-    save_color("BadAddressColor", &balsa_app.bad_address_color);
 
     /* ... handling of Multipart/Alternative */
     libbalsa_conf_set_bool("DisplayAlternativeAsPlain",
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index 5846ff6..d8b7089 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -1016,8 +1016,6 @@ balsa_sendmsg_destroy_handler(BalsaSendmsg * bsmsg)
     if (balsa_app.debug)
 	printf("balsa_sendmsg_destroy_handler: Freeing bsmsg\n");
     gtk_widget_destroy(bsmsg->window);
-    if (bsmsg->bad_address_style)
-        g_object_unref(G_OBJECT(bsmsg->bad_address_style));
     quit_on_close = bsmsg->quit_on_close;
     g_free(bsmsg->fcc_url);
     g_free(bsmsg->in_reply_to);
@@ -2907,9 +2905,6 @@ create_info_pane(BalsaSendmsg * bsmsg)
     gtk_table_set_col_spacings(GTK_TABLE(table), 6);
     gtk_container_set_border_width(GTK_CONTAINER(table), 6);
 
-    /* bsmsg->bad_address_style will be set in create_email_entry: */
-    bsmsg->bad_address_style = NULL;
-
     /* From: */
     create_from_entry(table, bsmsg);
 
diff --git a/src/sendmsg-window.h b/src/sendmsg-window.h
index b2f9c2a..9c79dc9 100644
--- a/src/sendmsg-window.h
+++ b/src/sendmsg-window.h
@@ -102,9 +102,6 @@ extern "C" {
 	gboolean req_dispnotify; /* send a MDN */ 
 	gboolean quit_on_close; /* quit balsa after the compose window */
 	                        /* is closed.                          */
-        /* style for changing the color of address labels when the
-         * address isn't valid: */
-        GtkStyle *bad_address_style;  
 #ifdef HAVE_GPGME
 	guint gpg_mode;
 #endif