Mercurial Mercurial > hg > mozilla / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
firefox-kde.patch
changeset 467 a9baaad57fa4
parent 462 2d86bdb4277f
child 479 56e16f4cce54
equal deleted inserted replaced
466:c0ae7c025b78 467:a9baaad57fa4 
  1120 +
 
  1120 +
 
  1121 +</window>
 
  1121 +</window>
 
  1122 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 
  1122 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 
  1123 --- a/browser/base/jar.mn
 
  1123 --- a/browser/base/jar.mn
 
  1124 +++ b/browser/base/jar.mn
 
  1124 +++ b/browser/base/jar.mn
 
  1125 @@ -32,16 +32,18 @@ browser.jar:
 
  1125 @@ -35,16 +35,18 @@ browser.jar:
 
  1126          content/browser/abouthome/restore-large.png   (content/abouthome/restore-large.png)
 
  1126          content/browser/abouthome/restore-large.png   (content/abouthome/restore-large.png)
 
  1127          content/browser/abouthome/mozilla.png         (content/abouthome/mozilla.png)
 
  1127          content/browser/abouthome/mozilla.png         (content/abouthome/mozilla.png)
 
  1128          content/browser/abouthome/noise.png           (content/abouthome/noise.png)
 
  1128          content/browser/abouthome/noise.png           (content/abouthome/noise.png)
 
  1129          content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
 
  1129          content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
 
  1130          content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
 
  1130          content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
 
  1142  *       content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
 
  1142  *       content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
 
  1143  *       content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
 
  1143  *       content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
 
  1144 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
 
  1144 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
 
  1145 --- a/browser/components/build/nsModule.cpp
 
  1145 --- a/browser/components/build/nsModule.cpp
 
  1146 +++ b/browser/components/build/nsModule.cpp
 
  1146 +++ b/browser/components/build/nsModule.cpp
 
  1147 @@ -41,17 +41,17 @@
 
  1147 @@ -8,17 +8,17 @@
 
  1148  #include "nsBrowserCompsCID.h"
 
  1148  #include "nsBrowserCompsCID.h"
 
  1149  #include "DirectoryProvider.h"
 
  1149  #include "DirectoryProvider.h"
 
  1150  
  1150  
  1151  #if defined(XP_WIN)
 
  1151  #if defined(XP_WIN)
 
  1152  #include "nsWindowsShellService.h"
 
  1152  #include "nsWindowsShellService.h"
 
  1161  #include "nsIEHistoryEnumerator.h"
 
  1161  #include "nsIEHistoryEnumerator.h"
 
  1162  #endif
 
  1162  #endif
 
  1163  
  1163  
  1164  #include "rdf.h"
 
  1164  #include "rdf.h"
 
  1165  #include "nsFeedSniffer.h"
 
  1165  #include "nsFeedSniffer.h"
 
  1166 @@ -65,18 +65,16 @@ using namespace mozilla::browser;
 
  1166 @@ -32,18 +32,16 @@ using namespace mozilla::browser;
 
  1167  
  1167  
  1168  /////////////////////////////////////////////////////////////////////////////
 
  1168  /////////////////////////////////////////////////////////////////////////////
 
  1169  
  1169  
  1170  NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider)
 
  1170  NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider)
 
  1171  #if defined(XP_WIN)
 
  1171  #if defined(XP_WIN)
 
  1180  NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator)
 
  1180  NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator)
 
  1181  #endif
 
  1181  #endif
 
  1182  
  1182  
  1183  NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
 
  1183  NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
 
  1184  
  1184  
  1185 @@ -97,17 +95,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID)
 
  1185 @@ -64,17 +62,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID)
 
  1186  #endif
 
  1186  #endif
 
  1187  NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
 
  1187  NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
 
  1188  
  1188  
  1189  static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
 
  1189  static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
 
  1190      { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor },
 
  1190      { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor },
 
  1202      { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor },
 
  1202      { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor },
 
  1203  #endif
 
  1203  #endif
 
  1204 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
 
  1204 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
 
  1205 --- a/browser/components/preferences/advanced.js
 
  1205 --- a/browser/components/preferences/advanced.js
 
  1206 +++ b/browser/components/preferences/advanced.js
 
  1206 +++ b/browser/components/preferences/advanced.js
 
  1207 @@ -716,24 +716,42 @@ var gAdvancedPane = {
 
  1207 @@ -22,16 +22,22 @@ var gAdvancedPane = {
 
  1208      var brandBundle = document.getElementById("bundleBrand");
 
  1208      if (extraArgs && extraArgs["advancedTab"]){
 
  1209      var shellBundle = document.getElementById("bundleShell");
 
  1209        advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]);
 
  1210      var brandShortName = brandBundle.getString("brandShortName");
 
  1210      } else {
 
  1211      var promptTitle = shellBundle.getString("setDefaultBrowserTitle");
 
  1211        var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex");
 
  1212      var promptMessage;
 
  1212        if (preference.value !== null)
 
  1213      const IPS = Components.interfaces.nsIPromptService;
 
  1213          advancedPrefs.selectedIndex = preference.value;
 
  1214      var psvc = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
 
  1214      }
 
  1215                           .getService(IPS);
 
  1215  
  1216 +
 
       
  1217 +    var env = Components.classes["@mozilla.org/process/environment;1"]
 
  1216 +    var env = Components.classes["@mozilla.org/process/environment;1"]
 
  1218 +                        .getService(Components.interfaces.nsIEnvironment);
 
  1217 +                        .getService(Components.interfaces.nsIEnvironment);
 
  1219 +    var kde_session = 0;
 
  1218 +    var kde_session = 0;
 
  1220 +    if (env.get('KDE_FULL_SESSION') == "true")
 
  1219 +    if (env.get('KDE_FULL_SESSION') == "true")
 
  1221 +      kde_session = 1;
 
  1220 +      kde_session = 1;
 
  1222 +
 
  1221 +
 
  1223      if (!shellSvc.isDefaultBrowser(false)) {
 
  1222  #ifdef HAVE_SHELL_SERVICE
 
  1224        promptMessage = shellBundle.getFormattedString("setDefaultBrowserMessage", 
  1223      this.updateSetDefaultBrowser();
 
  1225                                                       [brandShortName]);
 
  1224  #endif
 
  1226        var rv = psvc.confirmEx(window, promptTitle, promptMessage, 
  1225  #ifdef MOZ_UPDATER
 
  1227                                IPS.STD_YES_NO_BUTTONS,
 
  1226      this.updateReadPrefs();
 
  1228                                null, null, null, null, { });
 
  1227  #endif
 
  1229 -      if (rv == 0)
 
  1228      this.updateOfflineApps();
 
  1230 +      if (rv == 0) {
 
  1229  #ifdef MOZ_CRASHREPORTER
 
  1231          shellSvc.setDefaultBrowser(true, false);
 
  1230 @@ -705,12 +711,23 @@ var gAdvancedPane = {
 
  1232 +        if (kde_session == 1) {
 
  1231    /**
 
  1233 +          var shellObj = Components.classes["@mozilla.org/file/local;1"]
 
  1232     * Set browser as the operating system default browser.
 
  1234 +                                   .createInstance(Components.interfaces.nsILocalFile);
 
  1233     */
 
  1235 +          shellObj.initWithPath("/usr/bin/kwriteconfig");
 
  1234    setDefaultBrowser: function()
 
  1236 +          var process = Components.classes["@mozilla.org/process/util;1"]
 
  1235    {
 
  1237 +                                  .createInstance(Components.interfaces.nsIProcess);
 
  1236      var shellSvc = Components.classes["@mozilla.org/browser/shell-service;1"]
 
  1238 +          process.init(shellObj);
 
  1237                               .getService(Components.interfaces.nsIShellService);
 
  1239 +          var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "MozillaFirefox"];
 
  1238      shellSvc.setDefaultBrowser(true, false);
 
  1240 +          process.run(false, args, args.length);
 
  1239 +    if (kde_session == 1) {
 
  1241 +        }
 
  1240 +      var shellObj = Components.classes["@mozilla.org/file/local;1"]
 
  1242 +      }
 
  1241 +                               .createInstance(Components.interfaces.nsILocalFile);
 
  1243      }
 
  1242 +      shellObj.initWithPath("/usr/bin/kwriteconfig");
 
  1244      else {
 
  1243 +      var process = Components.classes["@mozilla.org/process/util;1"]
 
  1245        promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser",
 
  1244 +                              .createInstance(Components.interfaces.nsIProcess);
 
  1246                                                       [brandShortName]);
 
  1245 +      process.init(shellObj);
 
  1247        psvc.alert(window, promptTitle, promptMessage);
 
  1246 +      var args = ["--file", "kdeglobals", "--group", "General", "--key",
 
  1248      }
 
  1247 +          "BrowserApplication", "MozillaFirefox"];
 
       
  1248 +      process.run(false, args, args.length);
 
       
  1249 +    }
 
       
  1250      document.getElementById("setDefaultPane").selectedIndex = 1;
 
  1249    }
 
  1251    }
 
  1250  #endif
 
  1252  #endif
 
       
  1253  };
 
  1251 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
 
  1254 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
 
  1252 --- a/browser/components/shell/src/Makefile.in
 
  1255 --- a/browser/components/shell/src/Makefile.in
 
  1253 +++ b/browser/components/shell/src/Makefile.in
 
  1256 +++ b/browser/components/shell/src/Makefile.in
 
  1254 @@ -51,17 +51,18 @@ endif
 
  1257 @@ -17,17 +17,18 @@ USE_STATIC_LIBS = 1
 
  1255  
  1258  
  1256  ifeq ($(OS_ARCH),WINNT)
 
  1259  ifeq ($(OS_ARCH),WINNT)
 
  1257  CPPSRCS = nsWindowsShellService.cpp
 
  1260  CPPSRCS = nsWindowsShellService.cpp
 
  1258  else
 
  1261  else
 
  1259  ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 
  1262  ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 
  1712 +
 
  1715 +
 
  1713 +#endif // nsunixshellservice_h____
 
  1716 +#endif // nsunixshellservice_h____
 
  1714 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 
  1717 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 
  1715 --- a/browser/installer/package-manifest.in
 
  1718 --- a/browser/installer/package-manifest.in
 
  1716 +++ b/browser/installer/package-manifest.in
 
  1719 +++ b/browser/installer/package-manifest.in
 
  1717 @@ -500,16 +500,17 @@
 
  1720 @@ -521,16 +521,17 @@
 
  1718  #ifdef MOZ_SERVICES_SYNC
 
       
  1719  @BINPATH@/@PREF_DIR@/services-sync.js
 
  1721  @BINPATH@/@PREF_DIR@/services-sync.js
 
       
  1722  @BINPATH@/@PREF_DIR@/services-aitc.js
 
  1720  #endif
 
  1723  #endif
 
  1721  @BINPATH@/greprefs.js
 
  1724  @BINPATH@/greprefs.js
 
  1722  @BINPATH@/defaults/autoconfig/platform.js
 
  1725  @BINPATH@/defaults/autoconfig/platform.js
 
  1723  @BINPATH@/defaults/autoconfig/prefcalls.js
 
  1726  @BINPATH@/defaults/autoconfig/prefcalls.js
 
  1724  ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
 
  1727  ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
mozilla