SOURCES: kdelibs-branch.diff - updated (fixes for running kde3 and...
arekm
arekm at pld-linux.org
Sat Apr 5 00:26:49 CEST 2008
Author: arekm Date: Fri Apr 4 22:26:49 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated (fixes for running kde3 and kde4 apps at the same time)
---- Files affected:
SOURCES:
kdelibs-branch.diff (1.76 -> 1.77)
---- Diffs:
================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.76 SOURCES/kdelibs-branch.diff:1.77
--- SOURCES/kdelibs-branch.diff:1.76 Sat Mar 15 23:13:22 2008
+++ SOURCES/kdelibs-branch.diff Sat Apr 5 00:26:43 2008
@@ -1,7 +1,7 @@
Index: kate/part/katesupercursor.cpp
===================================================================
---- kate/part/katesupercursor.cpp (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ kate/part/katesupercursor.cpp (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- kate/part/katesupercursor.cpp (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ kate/part/katesupercursor.cpp (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -186,7 +186,7 @@
{
if (newLine)
@@ -11,10 +11,31 @@
{
if(m_line == int(line))
m_col -= col;
+Index: kate/data/haskell.xml
+===================================================================
+--- kate/data/haskell.xml (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ kate/data/haskell.xml (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+ <!-- Haskell syntax highlighting by Marcel Martin <mmar at freenet.de> -->
+-<language name="Haskell" version="1.04" kateversion="2.3" section="Sources" extensions="*.hs" author="Marcel Martin (mmar at freenet.de)" license="">
++<language name="Haskell" version="1.05" kateversion="2.3" section="Sources" extensions="*.hs" author="Marcel Martin (mmar at freenet.de)" license="">
+ <highlighting>
+ <list name="keywords">
+ <item> case </item>
+@@ -11,6 +11,7 @@
+ <item> do </item>
+ <item> else </item>
+ <item> if </item>
++ <item> import </item>
+ <item> in </item>
+ <item> infixl </item>
+ <item> infixr </item>
Index: mimetypes/audio/x-oggflac.desktop
===================================================================
---- mimetypes/audio/x-oggflac.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/x-oggflac.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/x-oggflac.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/x-oggflac.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -8,7 +8,7 @@
Comment[af]=Ogg FLAC Klank
Comment[ar]=ملف Ogg FLAC صوتي
@@ -26,8 +47,8 @@
Comment[bs]=Ogg FLAC audio
Index: mimetypes/audio/vnd.rn-realaudio.desktop
===================================================================
---- mimetypes/audio/vnd.rn-realaudio.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/vnd.rn-realaudio.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/vnd.rn-realaudio.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/vnd.rn-realaudio.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -10,7 +10,7 @@
Comment[ar]=ملف Real Audio
Comment[az]=RealAudio Faylı
@@ -39,8 +60,8 @@
Comment[bs]=RealAudio datoteka
Index: mimetypes/audio/x-vorbis.desktop
===================================================================
---- mimetypes/audio/x-vorbis.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/x-vorbis.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/x-vorbis.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/x-vorbis.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -8,7 +8,7 @@
Comment[af]=Ogg Vorbis Klank
Comment[ar]=ملف Ogg Vorbis صوتي
@@ -52,8 +73,8 @@
Comment[bs]=Ogg Vorbis audio
Index: mimetypes/audio/x-flac.desktop
===================================================================
---- mimetypes/audio/x-flac.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/x-flac.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/x-flac.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/x-flac.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -5,7 +5,7 @@
Comment[af]=FLAC Klank
Comment[ar]=ملف FLAC صوتي
@@ -65,8 +86,8 @@
Comment[bs]=FLAC audio
Index: mimetypes/audio/x-aiff.desktop
===================================================================
---- mimetypes/audio/x-aiff.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/x-aiff.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/x-aiff.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/x-aiff.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -5,7 +5,7 @@
Comment[af]=Aiff/Amiga Klank
Comment[ar]=صوت AIFF/Amiga
@@ -78,8 +99,8 @@
Comment[bs]=AIFF/Amiga audio
Index: mimetypes/audio/mpegurl.desktop
===================================================================
---- mimetypes/audio/mpegurl.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/mpegurl.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/mpegurl.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/mpegurl.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -10,7 +10,7 @@
Comment[ar]=صوت انسيابي من MPEG الطبقة 3
Comment[az]=Axıcı MPEG Layer 3 Audio
@@ -91,8 +112,8 @@
Comment[bs]=Streaming MPEG Layer 3 audio
Index: mimetypes/audio/x-musepack.desktop
===================================================================
---- mimetypes/audio/x-musepack.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/x-musepack.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/x-musepack.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/x-musepack.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -7,7 +7,7 @@
Comment=Musepack Audio
Comment[af]=Musepack Klank
@@ -104,8 +125,8 @@
Comment[bs]=Musepack audio
Index: mimetypes/audio/x-mpegurl.desktop
===================================================================
---- mimetypes/audio/x-mpegurl.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/x-mpegurl.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/x-mpegurl.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/x-mpegurl.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -8,7 +8,7 @@
Comment[ar]=صوت انسيابي من MPEG الطبقة 3
Comment[az]=Axıcı MPEG Layer 3 Audio
@@ -117,8 +138,8 @@
Comment[bs]=Streaming MPEG Layer 3 audio
Index: mimetypes/audio/basic.desktop
===================================================================
---- mimetypes/audio/basic.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/basic.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/basic.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/basic.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -5,7 +5,7 @@
Comment[af]=Ulaw (Sun) Audio
Comment[ar]=صوت ULAW (صن)
@@ -130,8 +151,8 @@
Comment[bs]=ULAW (Sun) audio
Index: mimetypes/audio/prs.sid.desktop
===================================================================
---- mimetypes/audio/prs.sid.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/prs.sid.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/prs.sid.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/prs.sid.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -7,7 +7,7 @@
Comment=C64 SID Music
Comment[af]=C64 SID Musiek
@@ -143,8 +164,8 @@
Comment[bs]=C64 SID muzika
Index: mimetypes/audio/x-mod.desktop
===================================================================
---- mimetypes/audio/x-mod.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/x-mod.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/x-mod.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/x-mod.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -7,7 +7,7 @@
Comment=Amiga Soundtracker Audio
Comment[ar]=صوت Amiga Soundtracker
@@ -156,8 +177,8 @@
Comment[bs]=Amiga Soundtracker audio
Index: mimetypes/audio/aac.desktop
===================================================================
---- mimetypes/audio/aac.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/aac.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/aac.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/aac.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -9,7 +9,7 @@
Comment[ar]=ملف AAC صوتي
Comment[az]=AAC Səsi
@@ -169,8 +190,8 @@
Comment[bs]=AAC zvuk
Index: mimetypes/audio/x-pn-realaudio.desktop
===================================================================
---- mimetypes/audio/x-pn-realaudio.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/x-pn-realaudio.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/x-pn-realaudio.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/x-pn-realaudio.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -8,7 +8,7 @@
Comment[ar]=ملف Real Audio
Comment[az]=RealAudio Faylı
@@ -182,8 +203,8 @@
Comment[bs]=RealAudio datoteka
Index: mimetypes/audio/x-matroska.desktop
===================================================================
---- mimetypes/audio/x-matroska.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/x-matroska.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/x-matroska.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/x-matroska.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -8,7 +8,7 @@
Comment[af]=Matroska Klank
Comment[ar]=ملف ماتروسكا صوتي
@@ -195,8 +216,8 @@
Comment[bs]=Matroska audio
Index: mimetypes/audio/x-midi.desktop
===================================================================
---- mimetypes/audio/x-midi.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/x-midi.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/x-midi.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/x-midi.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -8,7 +8,7 @@
Comment[af]=MIDI Klank
Comment[ar]=صوت MIDI
@@ -208,8 +229,8 @@
Comment[bs]=MIDI audio
Index: mimetypes/audio/mpeg.desktop
===================================================================
---- mimetypes/audio/mpeg.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/mpeg.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/mpeg.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/mpeg.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -9,7 +9,7 @@
Comment=MPEG Audio
Comment[af]=MPEG Klank
@@ -221,8 +242,8 @@
Comment[bs]=MPEG audio
Index: mimetypes/audio/x-adpcm.desktop
===================================================================
---- mimetypes/audio/x-adpcm.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/x-adpcm.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/x-adpcm.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/x-adpcm.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -5,7 +5,7 @@
Comment[af]=PCM Klank
Comment[ar]=صوت PCM
@@ -234,8 +255,8 @@
Comment[bs]=PCM audio
Index: mimetypes/audio/x-speex.desktop
===================================================================
---- mimetypes/audio/x-speex.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/x-speex.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/x-speex.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/x-speex.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -8,7 +8,7 @@
Comment[af]=Speex Klank
Comment[ar]=ملف Speex صوتي
@@ -247,8 +268,8 @@
Comment[bs]=Speex audio
Index: mimetypes/audio/mp4.desktop
===================================================================
---- mimetypes/audio/mp4.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/mp4.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/mp4.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/mp4.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -8,7 +8,7 @@
Comment[af]=MPEG-4 Klank
Comment[ar]=صوت MPEG-4
@@ -260,8 +281,8 @@
Comment[bs]=MPEG-4 audio
Index: mimetypes/audio/x-wav.desktop
===================================================================
---- mimetypes/audio/x-wav.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/x-wav.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/x-wav.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/x-wav.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -8,7 +8,7 @@
Comment[af]=Wav Audio
Comment[ar]=صوت WAV
@@ -273,8 +294,8 @@
Comment[bs]=WAV audio
Index: mimetypes/audio/x-mp2.desktop
===================================================================
---- mimetypes/audio/x-mp2.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/x-mp2.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/x-mp2.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/x-mp2.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -8,7 +8,7 @@
Comment=MPEG Layer 2 Audio
Comment[af]=MPEG Vlak 2 Klank
@@ -286,8 +307,8 @@
Comment[bs]=MPEG Layer 2 audio
Index: mimetypes/audio/vorbis.desktop
===================================================================
---- mimetypes/audio/vorbis.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/vorbis.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/vorbis.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/vorbis.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -8,7 +8,7 @@
Comment[af]=Ogg Vorbis Klank
Comment[ar]=ملف Ogg Vorbis صوتي
@@ -299,8 +320,8 @@
Comment[bs]=Ogg Vorbis audio
Index: mimetypes/audio/x-mp3.desktop
===================================================================
---- mimetypes/audio/x-mp3.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/x-mp3.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/x-mp3.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/x-mp3.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -9,7 +9,7 @@
Comment[af]=MPEG Vlak 3 Klank
Comment[ar]=صوت MPEG الطبقة 3
@@ -312,8 +333,8 @@
Comment[bs]=MPEG Layer 3 audio
Index: mimetypes/audio/x-ms-wma.desktop
===================================================================
---- mimetypes/audio/x-ms-wma.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/audio/x-ms-wma.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/audio/x-ms-wma.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/audio/x-ms-wma.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -7,7 +7,7 @@
Comment=Windows Media Audio
Comment[af]=Windows Media Klank
@@ -325,8 +346,8 @@
Comment[bs]=Windows Media audio
Index: mimetypes/text/vnd.abc.desktop
===================================================================
---- mimetypes/text/vnd.abc.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/text/vnd.abc.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/text/vnd.abc.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/text/vnd.abc.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -3,7 +3,7 @@
Comment=ABC Music File
Comment[af]=ABC Musiek Lêer
@@ -338,8 +359,8 @@
Comment[bs]=ABC muzička datoteka
Index: mimetypes/video/x-ogm.desktop
===================================================================
---- mimetypes/video/x-ogm.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/video/x-ogm.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/video/x-ogm.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/video/x-ogm.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -8,7 +8,7 @@
Comment=Ogg/Ogm Video
Comment[ar]=ملف مرئي Ogg/Ogm
@@ -351,8 +372,8 @@
Comment[bs]=Ogg/Ogm video
Index: mimetypes/video/x-theora.desktop
===================================================================
---- mimetypes/video/x-theora.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/video/x-theora.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/video/x-theora.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/video/x-theora.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -7,7 +7,7 @@
Comment=Theora Video
Comment[ar]=ملف فيديو Theora
@@ -364,8 +385,8 @@
Comment[bs]=Theora video
Index: mimetypes/video/mpeg.desktop
===================================================================
---- mimetypes/video/mpeg.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/video/mpeg.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/video/mpeg.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/video/mpeg.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -9,7 +9,7 @@
Comment[ar]=ملف مرئي MPEG
Comment[az]=MPEG Video Faylı
@@ -377,8 +398,8 @@
Comment[ca]=Vídeo MPEG
Index: mimetypes/video/quicktime.desktop
===================================================================
---- mimetypes/video/quicktime.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/video/quicktime.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/video/quicktime.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/video/quicktime.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -7,7 +7,7 @@
Comment=Quicktime Video
Comment[ar]=ملف مرئي Quicktime
@@ -390,8 +411,8 @@
Comment[ca]=Vídeo Quicktime
Index: mimetypes/video/x-ms-wmv.desktop
===================================================================
---- mimetypes/video/x-ms-wmv.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/video/x-ms-wmv.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/video/x-ms-wmv.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/video/x-ms-wmv.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -5,7 +5,7 @@
Comment[ar]=ملف مرئي Windows Media
Comment[az]=Windows Mediya Video Faylı
@@ -403,8 +424,8 @@
Comment[bs]=Windows Media video
Index: mimetypes/video/x-msvideo.desktop
===================================================================
---- mimetypes/video/x-msvideo.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/video/x-msvideo.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/video/x-msvideo.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/video/x-msvideo.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -8,7 +8,7 @@
Comment[af]=Microsoft Avi Video
Comment[ar]=مرئي Microsoft AVI
@@ -416,8 +437,8 @@
Comment[bs]=Microsoft AVI video
Index: mimetypes/video/vnd.rn-realvideo.desktop
===================================================================
---- mimetypes/video/vnd.rn-realvideo.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/video/vnd.rn-realvideo.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/video/vnd.rn-realvideo.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/video/vnd.rn-realvideo.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -9,7 +9,7 @@
Comment[ar]=ملف RealVideo
Comment[az]=RealVideo Faylı
@@ -429,8 +450,8 @@
Comment[bs]=RealVideo datoteka
Index: mimetypes/video/avi.desktop
===================================================================
---- mimetypes/video/avi.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/video/avi.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/video/avi.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/video/avi.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -9,7 +9,7 @@
Comment[af]=Microsoft Avi Video
Comment[ar]=مرئي Microsoft AVI
@@ -442,8 +463,8 @@
Comment[bs]=Microsoft AVI video
Index: mimetypes/video/mp4.desktop
===================================================================
---- mimetypes/video/mp4.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/video/mp4.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/video/mp4.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/video/mp4.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -7,7 +7,7 @@
Comment=MPEG-4 Video
Comment[ar]=ملف مرئي MPEG-4
@@ -455,8 +476,8 @@
Comment[bs]=MPEG-4 video
Index: mimetypes/video/x-flic.desktop
===================================================================
---- mimetypes/video/x-flic.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/video/x-flic.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/video/x-flic.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/video/x-flic.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -9,7 +9,7 @@
Comment[ar]=ملف FLIC لأوتوديسك
Comment[az]=Autodesk FLIC Faylı
@@ -468,8 +489,8 @@
Comment[bs]=Autodesk FLIC datoteke
Index: mimetypes/video/x-matroska.desktop
===================================================================
---- mimetypes/video/x-matroska.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ mimetypes/video/x-matroska.desktop (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- mimetypes/video/x-matroska.desktop (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ mimetypes/video/x-matroska.desktop (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -7,7 +7,7 @@
Comment=Matroska Video
Comment[ar]=مرئي Matroska
@@ -481,8 +502,8 @@
Comment[bs]=Matroska video
Index: kdecore/tests/kurltest.cpp
===================================================================
---- kdecore/tests/kurltest.cpp (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ kdecore/tests/kurltest.cpp (.../branches/KDE/3.5/kdelibs) (wersja 786050)
+--- kdecore/tests/kurltest.cpp (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ kdecore/tests/kurltest.cpp (.../branches/KDE/3.5/kdelibs) (wersja 793728)
@@ -112,6 +112,11 @@
check( "KURL::host()", url1.host(), "www1.foo.bar");
check( "KURL::url()", url1.url(), "http://www1.foo.bar");
@@ -497,9 +518,50 @@
check( "KURL::url()", rel_url.url(), "http://www.foo.bar/top//test1/file.html" );
Index: kdecore/kapplication.cpp
===================================================================
---- kdecore/kapplication.cpp (.../tags/KDE/3.5.9/kdelibs) (wersja 786050)
-+++ kdecore/kapplication.cpp (.../branches/KDE/3.5/kdelibs) (wersja 786050)
-@@ -1349,7 +1349,7 @@
+--- kdecore/kapplication.cpp (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ kdecore/kapplication.cpp (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+@@ -1244,6 +1244,32 @@
+ d->session_save = false;
+ }
+
++static void checkRestartVersion( QSessionManager& sm )
++{
++ Display* dpy = qt_xdisplay();
++ Atom type;
++ int format;
++ unsigned long nitems, after;
++ unsigned char* data;
++ if( XGetWindowProperty( dpy, DefaultRootWindow( dpy ), XInternAtom( dpy, "KDE_FULL_SESSION", False ),
++ 0, 1, False, AnyPropertyType, &type, &format, &nitems, &after, &data ) == Success ) {
++ if( type == XA_STRING && format == 8 ) { // session set, check if KDE_SESSION_VERSION is not set (meaning KDE3)
++ unsigned char* data;
++ if( XGetWindowProperty( dpy, DefaultRootWindow( dpy ), XInternAtom( dpy, "KDE_SESSION_VERSION", False ),
++ 0, 1, False, AnyPropertyType, &type, &format, &nitems, &after, &data ) == Success ) {
++ XFree( data ); // KDE4 or newer
++ } else {
++ return; // we run in our native session, no need to wrap
++ }
++ }
++ XFree( data );
++ }
++ QString wrapper = KStandardDirs::findExe( "kde3" );
++ QStringList restartCommand = sm.restartCommand();
++ restartCommand.prepend( wrapper );
++ sm.setRestartCommand( restartCommand );
++}
++
+ void KApplication::saveState( QSessionManager& sm )
+ {
+ d->session_save = true;
+@@ -1297,6 +1323,7 @@
+ sm.setRestartCommand( restartCommand );
+ }
+
++ checkRestartVersion( sm );
+
+ // finally: do session management
+ emit saveYourself(); // for compatibility
+@@ -1349,7 +1376,7 @@
return;
if (kapp && (Tty != kapp->type()))
setOverrideCursor( Qt::waitCursor );
@@ -508,10 +570,2125 @@
if (kapp && (Tty != kapp->type()))
restoreOverrideCursor();
#endif
+Index: kdecore/netwm.cpp
+===================================================================
+--- kdecore/netwm.cpp (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ kdecore/netwm.cpp (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+@@ -512,7 +512,7 @@
+ CARD32 *data32;
+ unsigned long i, j, k, sz, s;
+ unsigned long *d = (unsigned long *) buffer;
+- for (i = 0, j = 0; i < bufsize; i++) {
++ for (i = 0, j = 0; i < bufsize;) {
+ icons[j].size.width = *d++;
+ i += sizeof(long);
+ icons[j].size.height = *d++;
+Index: khtml/khtmlview.cpp
+===================================================================
+--- khtml/khtmlview.cpp (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ khtml/khtmlview.cpp (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+@@ -813,16 +813,20 @@
+ } else {
+ ref = root;
+ }
+-
+ if (ref) {
+- if( ref->style()->overflowX() == OHIDDEN )
++ if( ref->style()->overflowX() == OHIDDEN ) {
+ if (d->hmode == Auto) QScrollView::setHScrollBarMode(AlwaysOff);
+- else
++ } else if (ref->style()->overflowX() == OSCROLL ) {
++ if (d->hmode == Auto) QScrollView::setHScrollBarMode(AlwaysOn);
++ } else {
+ if (QScrollView::hScrollBarMode() == AlwaysOff) QScrollView::setHScrollBarMode(d->hmode);
+- if ( ref->style()->overflowY() == OHIDDEN )
++ } if ( ref->style()->overflowY() == OHIDDEN ) {
+ if (d->vmode == Auto) QScrollView::setVScrollBarMode(AlwaysOff);
+- else
++ } else if (ref->style()->overflowY() == OSCROLL ) {
++ if (d->vmode == Auto) QScrollView::setVScrollBarMode(AlwaysOn);
++ } else {
+ if (QScrollView::vScrollBarMode() == AlwaysOff) QScrollView::setVScrollBarMode(d->vmode);
++ }
+ }
+ d->needsFullRepaint = d->firstRelayout;
+ if (_height != visibleHeight() || _width != visibleWidth()) {;
+Index: khtml/html/html_baseimpl.cpp
+===================================================================
+--- khtml/html/html_baseimpl.cpp (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ khtml/html/html_baseimpl.cpp (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+@@ -170,6 +170,10 @@
+ getDocument()->setHTMLWindowEventListener(EventImpl::KEYPRESS_EVENT,
+ getDocument()->createHTMLEventListener(attr->value().string(), "onkeypress", NULL));
+ break;
++ case ATTR_ONSCROLL:
++ getDocument()->setHTMLWindowEventListener(EventImpl::SCROLL_EVENT,
++ getDocument()->createHTMLEventListener(attr->value().string(), "onscroll", NULL));
++ break;
+ case ATTR_NOSAVE:
+ break;
+ default:
+Index: khtml/html/html_elementimpl.cpp
+===================================================================
+--- khtml/html/html_elementimpl.cpp (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ khtml/html/html_elementimpl.cpp (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+@@ -259,6 +259,10 @@
+ setHTMLEventListener(EventImpl::BLUR_EVENT,
+ getDocument()->createHTMLEventListener(attr->value().string(), "onblur", this));
+ break;
++ case ATTR_ONSCROLL:
++ setHTMLEventListener(EventImpl::SCROLL_EVENT,
++ getDocument()->createHTMLEventListener(attr->value().string(), "onscroll", this));
++ break;
+ // other misc attributes
+ default:
+ #ifdef UNSUPPORTED_ATTR
+Index: khtml/rendering/render_flow.cpp
+===================================================================
+--- khtml/rendering/render_flow.cpp (.../tags/KDE/3.5.9/kdelibs) (wersja 793728)
++++ khtml/rendering/render_flow.cpp (.../branches/KDE/3.5/kdelibs) (wersja 793728)
+@@ -314,7 +314,7 @@
+ RenderFlow::lowestPosition(bool includeOverflowInterior, bool includeSelf) const
+ {
+ int bottom = RenderBox::lowestPosition(includeOverflowInterior, includeSelf);
+- if (!includeOverflowInterior && style()->hidesOverflow())
++ if (!includeOverflowInterior && hasOverflowClip())
+ return bottom;
+
+ // FIXME: Come up with a way to use the layer tree to avoid visiting all the kids.
+@@ -339,7 +339,7 @@
+ int RenderFlow::rightmostPosition(bool includeOverflowInterior, bool includeSelf) const
+ {
+ int right = RenderBox::rightmostPosition(includeOverflowInterior, includeSelf);
+- if (!includeOverflowInterior && style()->hidesOverflow())
++ if (!includeOverflowInterior && hasOverflowClip())
+ return right;
+
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kdelibs-branch.diff?r1=1.76&r2=1.77&f=u
More information about the pld-cvs-commit
mailing list