X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=videolink.cpp;h=8ab52660ec2b3d347692a499af9cb4194c20d1fa;hb=095c46b0de5edd5ae14b4e311d54c723eb73e11f;hp=3d2daebd0176644a008444e729c76e86ebd85be3;hpb=4b8bff9ce93df43b120c5cf4d1476d3a435f99d3;p=videolink.git

diff --git a/videolink.cpp b/videolink.cpp
index 3d2daeb..8ab5266 100644
--- a/videolink.cpp
+++ b/videolink.cpp
@@ -43,10 +43,19 @@
 #include <nsIURI.h> // required before nsILink.h
 #include <nsILink.h>
 #include <nsIPrefBranch.h>
+#if MOZ_VERSION_MAJOR > 1 || (MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR >= 8)
+#   include <nsPresContext.h>
+#else
+#   include <nsIPresContext.h>
+    typedef nsIPresContext nsPresContext; // ugh
+#endif
 #include <nsIPrefService.h>
-#include <nsIPresContext.h>
 #include <nsIPresShell.h>
-#include <nsIServiceManagerUtils.h>
+#if MOZ_VERSION_MAJOR > 1 || (MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR >= 8)
+#   include <nsServiceManagerUtils.h>
+#else
+#   include <nsIServiceManagerUtils.h>
+#endif
 #include <nsIWebBrowser.h>
 #include <nsString.h>
 
@@ -178,14 +187,14 @@ namespace
 	bool process_page();
 	void save_screenshot();
 	void process_links(nsIPresShell * pres_shell,
-			   nsIPresContext * pres_context,
+			   nsPresContext * pres_context,
 			   nsIDOMWindow * dom_window);
 
 	video::frame_params frame_params_;
 	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;
@@ -210,7 +219,8 @@ namespace
 	    : frame_params_(frame_params),
 	      output_dir_(output_dir),
 	      encoder_(encoder),
-	      stylesheet_(load_css("file://" VIDEOLINK_LIB_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),
@@ -422,7 +432,7 @@ namespace
 	assert(doc_shell);
 	nsCOMPtr<nsIPresShell> pres_shell;
 	check(doc_shell->GetPresShell(getter_AddRefs(pres_shell)));
-	nsCOMPtr<nsIPresContext> pres_context;
+	nsCOMPtr<nsPresContext> pres_context;
 	check(doc_shell->GetPresContext(getter_AddRefs(pres_context)));
 	nsCOMPtr<nsIDOMWindow> dom_window;
 	check(browser->GetContentDOMWindow(getter_AddRefs(dom_window)));
@@ -431,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;
@@ -526,7 +536,7 @@ namespace
     };
 
     void videolink_window::process_links(nsIPresShell * pres_shell,
-				     nsIPresContext * pres_context,
+				     nsPresContext * pres_context,
 				     nsIDOMWindow * dom_window)
     {
 	Glib::RefPtr<Gdk::Window> window(get_window());
@@ -703,7 +713,12 @@ namespace
 		check(event_state_man->SetContentState(content,
 						       NS_EVENT_STATE_HOVER));
 
-		pres_shell->FlushPendingNotifications(true);
+#		if MOZ_VERSION_MAJOR > 1                                   \
+		     || (MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR >= 8)
+		    pres_shell->FlushPendingNotifications(Flush_Display);
+#		else
+		    pres_shell->FlushPendingNotifications(true);
+#		endif
 
 		// We may have to exit and wait for image loading
 		// to complete, at which point we will be called
@@ -850,17 +865,16 @@ namespace
 	check(CallGetService<nsIPrefService>(pref_service_cid,
 					     getter_AddRefs(pref_service)));
 	nsCOMPtr<nsIPrefBranch> pref_branch;
+	check(pref_service->GetBranch("", getter_AddRefs(pref_branch)));
 
-	// Disable IE-compatibility kluge that causes backgrounds to
-	// sometimes/usually be missing from snapshots.  This is only
-	// effective from Mozilla 1.8 onward.
 #   	if MOZ_VERSION_MAJOR > 1                                 \
            || (MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR >= 8)
-	check(pref_service->GetDefaultBranch("layout",
-					     getter_AddRefs(pref_branch)));
-	check(pref_branch->SetBoolPref(
-		  "fire_onload_after_image_background_loads",
-		  true));
+	    // Disable IE-compatibility kluge that causes backgrounds to
+	    // sometimes/usually be missing from snapshots.  This is only
+	    // effective from Mozilla 1.8 onward.
+	    check(pref_branch->SetBoolPref(
+		      "layout.fire_onload_after_image_background_loads",
+		      true));
 #   	endif
 
 	// Set display resolution.  With standard-definition video we
@@ -871,9 +885,8 @@ namespace
 	// slightly different but unfortunately Mozilla doesn't
 	// support non-square pixels (and neither do fontconfig or Xft
 	// anyway).
-	check(pref_service->GetDefaultBranch("browser.display",
-					     getter_AddRefs(pref_branch)));
-	check(pref_branch->SetIntPref("screen_resolution", 40));
+	check(pref_branch->SetIntPref("browser.display.screen_resolution",
+				      40));
     }
 
 } // namespace