equal
deleted
inserted
replaced
707 +</bindings> |
707 +</bindings> |
708 diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widgets/preferences-kde.xml |
708 diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widgets/preferences-kde.xml |
709 new file mode 100644 |
709 new file mode 100644 |
710 --- /dev/null |
710 --- /dev/null |
711 +++ b/toolkit/content/widgets/preferences-kde.xml |
711 +++ b/toolkit/content/widgets/preferences-kde.xml |
712 @@ -0,0 +1,1371 @@ |
712 @@ -0,0 +1,1373 @@ |
713 +<?xml version="1.0"?> |
713 +<?xml version="1.0"?> |
714 + |
714 + |
715 +<!DOCTYPE bindings [ |
715 +<!DOCTYPE bindings [ |
716 + <!ENTITY % preferencesDTD SYSTEM "chrome://global/locale/preferences.dtd"> |
716 + <!ENTITY % preferencesDTD SYSTEM "chrome://global/locale/preferences.dtd"> |
717 + %preferencesDTD; |
717 + %preferencesDTD; |
1973 + </implementation> |
1973 + </implementation> |
1974 + <handlers> |
1974 + <handlers> |
1975 + <handler event="command"> |
1975 + <handler event="command"> |
1976 + // This "command" event handler tracks changes made to preferences by |
1976 + // This "command" event handler tracks changes made to preferences by |
1977 + // the user in this window. |
1977 + // the user in this window. |
|
1978 + if (event.sourceEvent) |
|
1979 + event = event.sourceEvent; |
1978 + this.userChangedValue(event.target); |
1980 + this.userChangedValue(event.target); |
1979 + </handler> |
1981 + </handler> |
1980 + <handler event="select"> |
1982 + <handler event="select"> |
1981 + // This "select" event handler tracks changes made to colorpicker |
1983 + // This "select" event handler tracks changes made to colorpicker |
1982 + // preferences by the user in this window. |
1984 + // preferences by the user in this window. |
2190 -CPPSRCS += nsNativeAppSupportUnix.cpp |
2192 -CPPSRCS += nsNativeAppSupportUnix.cpp |
2191 +CPPSRCS += nsNativeAppSupportUnix.cpp nsKDEUtils.cpp |
2193 +CPPSRCS += nsNativeAppSupportUnix.cpp nsKDEUtils.cpp |
2192 +EXPORTS += nsKDEUtils.h |
2194 +EXPORTS += nsKDEUtils.h |
2193 else |
2195 else |
2194 ifeq ($(MOZ_WIDGET_TOOLKIT),qt) |
2196 ifeq ($(MOZ_WIDGET_TOOLKIT),qt) |
|
2197 MOCSRCS += moc_nsNativeAppSupportQt.cpp |
|
2198 $(NULL) |
|
2199 CPPSRCS += $(MOCSRCS) |
2195 CPPSRCS += nsNativeAppSupportQt.cpp |
2200 CPPSRCS += nsNativeAppSupportQt.cpp |
2196 CPPSRCS += nsQAppInstance.cpp |
2201 CPPSRCS += nsQAppInstance.cpp |
2197 EXPORTS += nsQAppInstance.h |
2202 EXPORTS += nsQAppInstance.h |
2198 else |
|
2199 CPPSRCS += nsNativeAppSupportDefault.cpp |
|
2200 endif |
|
2201 diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp |
2203 diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp |
2202 new file mode 100644 |
2204 new file mode 100644 |
2203 --- /dev/null |
2205 --- /dev/null |
2204 +++ b/toolkit/xre/nsKDEUtils.cpp |
2206 +++ b/toolkit/xre/nsKDEUtils.cpp |
2205 @@ -0,0 +1,328 @@ |
2207 @@ -0,0 +1,328 @@ |
3613 nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(), |
3615 nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(), |
3614 info.dwMajorVersion, |
3616 info.dwMajorVersion, |
3615 info.dwMinorVersion); |
3617 info.dwMinorVersion); |
3616 } |
3618 } |
3617 + desktop = NS_LITERAL_STRING("win"); |
3619 + desktop = NS_LITERAL_STRING("win"); |
3618 #elif defined(XP_MACOSX) |
3620 #elif defined(MOZ_WIDGET_COCOA) |
3619 SInt32 majorVersion, minorVersion; |
3621 SInt32 majorVersion, minorVersion; |
3620 if ((Gestalt(gestaltSystemVersionMajor, &majorVersion) == noErr) && |
3622 if ((Gestalt(gestaltSystemVersionMajor, &majorVersion) == noErr) && |
3621 (Gestalt(gestaltSystemVersionMinor, &minorVersion) == noErr)) { |
3623 (Gestalt(gestaltSystemVersionMinor, &minorVersion) == noErr)) { |
3622 nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(), |
3624 nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(), |
3623 majorVersion, |
3625 majorVersion, |