#285849

r/sr=mkaply
From Peter Weilbacher - OS/2 does different stuff with system resolution

browser/app/profile/firefox.js

@@ -350,7 +350,9 @@ pref("browser.preferences.animateFadeIn", true);
 #else
 pref("browser.preferences.animateFadeIn", false);
 #endif
+#ifndef XP_OS2
 pref("browser.display.screen_resolution", 96);
+#endif
 
 pref("browser.download.show_plugins_in_list", true);
 pref("browser.download.hide_plugins_without_extensions", true);

browser/components/preferences/fonts.xul

@@ -221,8 +221,14 @@
               <menuitem id="defaultResolution" value="96"/>
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
-              <menuitem id="systemResolution" value="0" label="&resolution.system.label;"/>
+#define SYSTEMRESOLUTION
 #endif
+#endif
+#ifdef XP_OS2
+#define SYSTEMRESOLUTION
+#endif
+#ifdef SYSTEMRESOLUTION
+              <menuitem id="systemResolution" value="0" label="&resolution.system.label;"/>
 #endif
               <menuseparator id="resolutionSeparator"/>
               <menuitem id="userResolution" hidden="true"/>