Changed style-sheet application in Mozila/XULRunner 1.8 to override built-in preferen...

[videolink.git] / videolink.cpp

diff --git a/videolink.cpp b/videolink.cpp
index 59956c744eb673a36ce7234669f9fc51798a543c..8ab52660ec2b3d347692a499af9cb4194c20d1fa 100644 (file)
--- a/videolink.cpp
+++ b/videolink.cpp
@@ -194,7 +194,7 @@ namespace
        std::string output_dir_;
        mpeg_encoder encoder_;
        browser_widget browser_widget_;
-       nsCOMPtr<nsIStyleSheet> stylesheet_;
+       agent_style_sheet_holder style_sheet_;
 
        dvd_contents contents_;
        typedef std::map<std::string, dvd_contents::pgc_ref> resource_map_type;
@@ -219,7 +219,8 @@ namespace
            : frame_params_(frame_params),
              output_dir_(output_dir),
              encoder_(encoder),
-             stylesheet_(load_css("file://" VIDEOLINK_SHARE_DIR "/videolink.css")),
+             style_sheet_(init_agent_style_sheet(
+                              "file://"VIDEOLINK_SHARE_DIR"/videolink.css")),
              pending_window_update_(false),
              pending_req_count_(0),
              have_tweaked_page_(false),
@@ -440,7 +441,7 @@ namespace
        // disable scrollbars.
        if (!have_tweaked_page_)
        {
-           apply_style_sheet(stylesheet_, pres_shell);
+           apply_agent_style_sheet(style_sheet_, pres_shell);
 
            // This actually only needs to be done once.
            nsCOMPtr<nsIDOMBarProp> dom_bar_prop;
@@ -874,12 +875,6 @@ namespace
            check(pref_branch->SetBoolPref(
                      "layout.fire_onload_after_image_background_loads",
                      true));
-
-           // Turn off link underlining.  This is also set in the agent
-           // stylesheet, but seems to be overridden by preferences in
-           // Mozilla 1.8.
-           check(pref_branch->SetBoolPref("browser.underline_anchors",
-                                          false));
 #      endif
 
        // Set display resolution.  With standard-definition video we