From e5b47e0eda14849cf1c8f6d2357d6051aa8946d3 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Thu, 8 Jul 2010 19:16:33 +0000 Subject: [PATCH] Bug #623842 - Reseting of Color Tabs to default color wrong. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19349 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/gnome-utils/dialog-account.c | 3 +++ src/gnome-utils/gnc-main-window.c | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/src/gnome-utils/dialog-account.c b/src/gnome-utils/dialog-account.c index a6b2097a98..510076fadc 100644 --- a/src/gnome-utils/dialog-account.c +++ b/src/gnome-utils/dialog-account.c @@ -372,6 +372,9 @@ gnc_ui_to_account(AccountWindow *aw) /* gdk_color_to_string requires gtk >= 2.12 */ string = g_strdup_printf("#%04X%04X%04X", color.red, color.green, color.blue); #endif + if (safe_strcmp (string, DEFAULT_COLOR) == 0) + string = "Not Set"; + old_string = xaccAccountGetColor (account); if (safe_strcmp (string, old_string) != 0) xaccAccountSetColor (account, string); diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c index 6177286a29..d18645d15c 100644 --- a/src/gnome-utils/gnc-main-window.c +++ b/src/gnome-utils/gnc-main-window.c @@ -1992,6 +1992,11 @@ main_window_update_page_color (GncPluginPage *page, gtk_widget_modify_bg(event_box, GTK_STATE_NORMAL, &tab_color); gtk_widget_modify_bg(event_box, GTK_STATE_ACTIVE, &tab_color); } + else + { + gtk_widget_modify_bg(event_box, GTK_STATE_NORMAL, NULL); + gtk_widget_modify_bg(event_box, GTK_STATE_ACTIVE, NULL); + } g_free(color_string); LEAVE("done"); } @@ -2604,6 +2609,11 @@ gnc_main_window_open_page (GncMainWindow *window, gtk_widget_modify_bg(event_box, GTK_STATE_NORMAL, &tab_color); gtk_widget_modify_bg(event_box, GTK_STATE_ACTIVE, &tab_color); } + else + { + gtk_widget_modify_bg(event_box, GTK_STATE_NORMAL, NULL); + gtk_widget_modify_bg(event_box, GTK_STATE_ACTIVE, NULL); + } text = gnc_plugin_page_get_page_long_name(page); if (text)