Attachment 82040 Details for Bug 151163

[patch] patch

skin-selection.patch (text/plain), 2.74 KB, created by Wolfgang Rosenauer on 2006-05-04 14:44:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wolfgang Rosenauer

Created: 2006-05-04 14:44:28 UTC

Size: 2.74 KB

patch

obsolete

>From: Wolfgang Rosenauer <stark@suse.de>
>Subject: choose default theme at first startup according to the Desktop Env
>References:
>
>
>Index: browser/app/profile/firefox.js
>===================================================================
>RCS file: /cvsroot/mozilla/browser/app/profile/firefox.js,v
>retrieving revision 1.71.2.15
>diff -u -p -6 -r1.71.2.15 firefox.js
>--- browser/app/profile/firefox.js	21 Oct 2005 23:30:42 -0000	1.71.2.15
>+++ browser/app/profile/firefox.js	18 Mar 2006 22:53:21 -0000
>@@ -154,13 +154,13 @@ pref("xpinstall.whitelist.add", "update.
> pref("xpinstall.whitelist.add.103", "addons.mozilla.org");
> 
> pref("keyword.enabled", true);
> pref("keyword.URL", "http://www.google.com/search?btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8&q=");
> 
> pref("general.useragent.locale", "@AB_CD@");
>-pref("general.skins.selectedSkin", "classic/1.0");
>+//pref("general.skins.selectedSkin", "classic/1.0");
> pref("general.useragent.extra.firefox", "Firefox/@APP_VERSION@");
> 
> pref("general.smoothScroll", false);
> #ifdef UNIX_BUT_NOT_MAC
> pref("general.autoScroll", false);
> #else
>Index: modules/libpref/src/nsPrefService.cpp
>===================================================================
>RCS file: /cvsroot/mozilla/modules/libpref/src/nsPrefService.cpp,v
>retrieving revision 1.90
>diff -u -p -6 -r1.90 nsPrefService.cpp
>--- modules/libpref/src/nsPrefService.cpp	14 May 2005 00:30:08 -0000	1.90
>+++ modules/libpref/src/nsPrefService.cpp	3 May 2006 22:41:15 -0000
>@@ -33,12 +33,13 @@
>  * and other provisions required by the GPL or the LGPL. If you do not delete
>  * the provisions above, a recipient may use your version of this file under
>  * the terms of any one of the NPL, the GPL or the LGPL.
>  *
>  * ***** END LICENSE BLOCK ***** */
> 
>+#include <string.h>
> #include "nsPrefService.h"
> #include "nsAppDirectoryServiceDefs.h"
> #include "nsDirectoryServiceDefs.h"
> #include "nsICategoryManager.h"
> #include "nsCategoryManagerUtils.h"
> #include "nsNetUtil.h"
>@@ -204,17 +205,28 @@ NS_IMETHODIMP nsPrefService::Observe(nsI
> }
> 
> 
> NS_IMETHODIMP nsPrefService::ReadUserPrefs(nsIFile *aFile)
> {
>   nsresult rv;
>+  PRBool rv2;
> 
>   if (nsnull == aFile) {
>     rv = UseDefaultPrefFile();
>     UseUserPrefFile();
> 
>+    rv2 = PREF_HasUserPref("general.skins.selectedSkin");
>+    if (!rv2) {
>+        if (getenv("KDE_FULL_SESSION"))
>+            PREF_SetCharPref("general.skins.selectedSkin", "plastikfox");
>+        else if (getenv("DESKTOP_SESSION") && !strcmp("gnome", getenv("DESKTOP_SESSION")))
>+            PREF_SetCharPref("general.skins.selectedSkin", "tango");
>+        else
>+            PREF_SetCharPref("general.skins.selectedSkin", "classic/1.0");
>+    }
>+
>     NotifyServiceObservers(NS_PREFSERVICE_READ_TOPIC_ID);
> 
>   } else {
>     rv = ReadAndOwnUserPrefFile(aFile);
>   }
>   return rv;

Actions: View | Diff

Attachments on bug 151163: 82040