[Commits] [SCM] claws branch, master, updated. 3.10.1-128-g9730112

[claws at claws-mail.org]

The branch, master has been updated
       via  973011215ffad1e1b2acdcfab52f042bd8823ce7 (commit)
      from  d0ad5f6a2835f12e6ede145e86253801f4432da5 (commit)

Summary of changes:
 src/plugins/fancy/fancy_viewer.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit 973011215ffad1e1b2acdcfab52f042bd8823ce7
Author: Paul <paul at claws-mail.org>
Date:   Sat Jul 19 17:25:56 2014 +0100

    don't ignore stylesheet when reloading from popup prefs

diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
index da003f5..80317c6 100644
--- a/src/plugins/fancy/fancy_viewer.c
+++ b/src/plugins/fancy/fancy_viewer.c
@@ -141,15 +141,13 @@ static void fancy_open_external_activated(GtkCheckMenuItem *item, FancyViewer *v
 
 static void fancy_set_defaults(FancyViewer *viewer)
 {
-	gchar *user_stylesheet = g_strconcat("file://", fancy_prefs.stylesheet, NULL);
-	
 	viewer->override_prefs_remote_content = fancy_prefs.enable_remote_content;
 	viewer->override_prefs_external = fancy_prefs.open_external;
 	viewer->override_prefs_images = fancy_prefs.enable_images;
 	viewer->override_prefs_scripts = fancy_prefs.enable_scripts;
 	viewer->override_prefs_plugins = fancy_prefs.enable_plugins;
 	viewer->override_prefs_java = fancy_prefs.enable_java;
-	viewer->override_stylesheet = user_stylesheet;
+	viewer->override_stylesheet = g_strconcat("file://", fancy_prefs.stylesheet, NULL);
 
 	g_signal_handlers_block_by_func(G_OBJECT(viewer->enable_images),
 		fancy_auto_load_images_activated, viewer);
@@ -197,7 +195,6 @@ static void fancy_set_defaults(FancyViewer *viewer)
 		fancy_open_external_activated, viewer);
 
 	fancy_apply_prefs(viewer);
-	g_free(user_stylesheet);
 }
 
 static void fancy_load_uri(FancyViewer *viewer, const gchar *uri)

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail