Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Timothy Pearson
13 years ago
commit
457d6220a5
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,97 @@
|
||||
commit 3516f9bc3f3af5ae21cdbd2d3af835645cf72274
|
||||
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||
Date: 1327531037 -0600
|
||||
|
||||
Fix linear alphabet string errors
|
||||
|
||||
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc
|
||||
index 63130db..e0ec1b9 100644
|
||||
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc
|
||||
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc
|
||||
@@ -24,7 +24,7 @@ static const string::size_type np = string::npos;
|
||||
const string Base64::Base64Table(
|
||||
// 0000000000111111111122222222223333333333444444444455555555556666
|
||||
// 0123456789012345678901234567890123456789012345678901234567890123
|
||||
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/");
|
||||
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/");
|
||||
|
||||
// Decode Table gives the index of any valid base64 character in the Base64 table]
|
||||
// 65 == A, 97 == a, 48 == 0, 43 == +, 47 == /
|
||||
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
|
||||
index fcdd3d4..06df3f7 100644
|
||||
--- a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
|
||||
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
|
||||
@@ -44,7 +44,7 @@ TQByteArray Base64::encode(const TQByteArray &s)
|
||||
{
|
||||
int i;
|
||||
int len = s.size();
|
||||
- char tbl[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
|
||||
+ char tbl[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
|
||||
int a, b, c;
|
||||
|
||||
TQByteArray p((len+2)/3*4);
|
||||
diff --git a/kopete/protocols/oscar/liboscar/md5.c b/kopete/protocols/oscar/liboscar/md5.c
|
||||
index 1ca18d1..e627358 100644
|
||||
--- a/kopete/protocols/oscar/liboscar/md5.c
|
||||
+++ b/kopete/protocols/oscar/liboscar/md5.c
|
||||
@@ -55,7 +55,7 @@ main()
|
||||
"abc", /*900150983cd24fb0d6963f7d28e17f72*/
|
||||
"message digest", /*f96b697d7cb7938d525a2f31aaf161d0*/
|
||||
"abcdefghijklmnopqrstuvwxyz", /*c3fcd3d76192e4007dfb496cca67e13b*/
|
||||
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
|
||||
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
|
||||
/*d174ab98d277d9f5a5611c2c9f419d9f*/
|
||||
"12345678901234567890123456789012345678901234567890123456789012345678901234567890" /*57edf4a22be3c955ac49da2e2107b67a*/
|
||||
};
|
||||
diff --git a/kopete/protocols/yahoo/libkyahoo/crypt.c b/kopete/protocols/yahoo/libkyahoo/crypt.c
|
||||
index 76620bc..ee15c34 100644
|
||||
--- a/kopete/protocols/yahoo/libkyahoo/crypt.c
|
||||
+++ b/kopete/protocols/yahoo/libkyahoo/crypt.c
|
||||
@@ -45,7 +45,7 @@ static const char md5_salt_prefix[] = "$1$";
|
||||
|
||||
/* Table with characters for base64 transformation. */
|
||||
static const char b64t[64] =
|
||||
-"./0123456789ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
|
||||
+"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
|
||||
|
||||
char *yahoo_crypt(const char *key, const char *salt);
|
||||
|
||||
diff --git a/kopete/protocols/yahoo/libkyahoo/libyahoo.c b/kopete/protocols/yahoo/libkyahoo/libyahoo.c
|
||||
index 32e6f2b..a97e7be 100644
|
||||
--- a/kopete/protocols/yahoo/libkyahoo/libyahoo.c
|
||||
+++ b/kopete/protocols/yahoo/libkyahoo/libyahoo.c
|
||||
@@ -60,7 +60,7 @@ extern char *yahoo_crypt(char *, char *);
|
||||
void yahooBase64(unsigned char *out, const unsigned char *in, int inlen)
|
||||
/* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */
|
||||
{
|
||||
- char base64digits[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
|
||||
+ char base64digits[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
"abcdefghijklmnopqrstuvwxyz"
|
||||
"0123456789._";
|
||||
|
||||
diff --git a/kopete/protocols/yahoo/libkyahoo/md5.c b/kopete/protocols/yahoo/libkyahoo/md5.c
|
||||
index 5bc2c13..5a537e0 100644
|
||||
--- a/kopete/protocols/yahoo/libkyahoo/md5.c
|
||||
+++ b/kopete/protocols/yahoo/libkyahoo/md5.c
|
||||
@@ -69,7 +69,7 @@ main()
|
||||
"abc", /*900150983cd24fb0d6963f7d28e17f72*/
|
||||
"message digest", /*f96b697d7cb7938d525a2f31aaf161d0*/
|
||||
"abcdefghijklmnopqrstuvwxyz", /*c3fcd3d76192e4007dfb496cca67e13b*/
|
||||
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
|
||||
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
|
||||
/*d174ab98d277d9f5a5611c2c9f419d9f*/
|
||||
"12345678901234567890123456789012345678901234567890123456789012345678901234567890" /*57edf4a22be3c955ac49da2e2107b67a*/
|
||||
};
|
||||
diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp
|
||||
index d7f6004..4129754 100644
|
||||
--- a/kppp/providerdb.cpp
|
||||
+++ b/kppp/providerdb.cpp
|
||||
@@ -44,7 +44,7 @@
|
||||
#include <ksimpleconfig.h>
|
||||
|
||||
|
||||
-#define UNENCODED_CHARS "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_"
|
||||
+#define UNENCODED_CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_"
|
||||
|
||||
TQWizard* ProviderDB::wiz = 0L;
|
||||
|
||||
@ -0,0 +1,66 @@
|
||||
commit f670853164f8a23f3656fa9de72b12b962b9bcaa
|
||||
Author: Slávek Banko <slavek.banko@axis.cz>
|
||||
Date: 1339294006 +0200
|
||||
|
||||
Improve Kaffeine support in Kopete now listening plugin
|
||||
|
||||
diff --git a/kopete/plugins/nowlistening/nlkaffeine.cpp b/kopete/plugins/nowlistening/nlkaffeine.cpp
|
||||
index c2b70ba..77dd84c 100644
|
||||
--- a/kopete/plugins/nowlistening/nlkaffeine.cpp
|
||||
+++ b/kopete/plugins/nowlistening/nlkaffeine.cpp
|
||||
@@ -40,7 +40,7 @@ void NLKaffeine::update()
|
||||
m_newTrack = false;
|
||||
TQString newTrack;
|
||||
bool error = true; // Asume we have a error first.
|
||||
- TQCString kaffeineIface("Kaffeine"), kaffeineGetTrack("getTitle()");
|
||||
+ TQCString kaffeineIface("KaffeineIface"), kaffeineGetTrack("title()");
|
||||
|
||||
// see if kaffeine is registered with DCOP
|
||||
if ( m_client->isApplicationRegistered( "kaffeine" ) )
|
||||
@@ -52,10 +52,10 @@ void NLKaffeine::update()
|
||||
if ( !m_client->call( "kaffeine", kaffeineIface, "isPlaying()", data,
|
||||
replyType, replyData ) )
|
||||
{
|
||||
- kdDebug ( 14307 ) << k_funcinfo << " Trying DCOP interface of Kaffeine >= 0.5" << endl;
|
||||
- // Trying with the new Kaffeine DCOP interface (>=0.5)
|
||||
- kaffeineIface = "KaffeineIface";
|
||||
- kaffeineGetTrack = "title()";
|
||||
+ kdDebug ( 14307 ) << k_funcinfo << " Trying DCOP interface of Kaffeine < 0.5" << endl;
|
||||
+ // Trying with the old Kaffeine DCOP interface (<0.5)
|
||||
+ kaffeineIface = "Kaffeine";
|
||||
+ kaffeineGetTrack = "getTitle()";
|
||||
if( !m_client->call( "kaffeine", kaffeineIface, "isPlaying()", data, replyType, replyData ) )
|
||||
{
|
||||
kdDebug( 14307 ) << k_funcinfo << " DCOP error on Kaffeine." << endl;
|
||||
@@ -94,6 +94,31 @@ void NLKaffeine::update()
|
||||
m_newTrack = true;
|
||||
m_track = newTrack;
|
||||
}
|
||||
+ if ( kaffeineIface == "Kaffeine" )
|
||||
+ {
|
||||
+ // old Kaffeine DCOP interface (<0.5)
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if ( m_client->call( "kaffeine", kaffeineIface, "album()", data,
|
||||
+ replyType, replyData ) )
|
||||
+ {
|
||||
+ TQDataStream reply( replyData, IO_ReadOnly );
|
||||
+
|
||||
+ if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
|
||||
+ reply >> m_album;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if ( m_client->call( "kaffeine", kaffeineIface, "artist()", data,
|
||||
+ replyType, replyData ) )
|
||||
+ {
|
||||
+ TQDataStream reply( replyData, IO_ReadOnly );
|
||||
+
|
||||
+ if ( replyType == TQSTRING_OBJECT_NAME_STRING ) {
|
||||
+ reply >> m_artist;
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
else
|
||||
kdDebug ( 14307 ) << "Kaffeine is not running!\n" << endl;
|
||||
@ -0,0 +1,39 @@
|
||||
commit f86a25380b4901bbd828dde8f35adb5b789d40c6
|
||||
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||
Date: 1331690526 -0500
|
||||
|
||||
Remove "More Applications" from TDE menu.
|
||||
This partially resolves bug report 653.
|
||||
|
||||
diff --git a/kdict/kdict.desktop b/kdict/kdict.desktop
|
||||
index d274d23..0b63798 100644
|
||||
--- a/kdict/kdict.desktop
|
||||
+++ b/kdict/kdict.desktop
|
||||
@@ -150,4 +150,4 @@ GenericName[zu]=Isichaza magama esixhumekile
|
||||
X-KDE-StartupNotify=true
|
||||
X-DCOP-ServiceType=Unique
|
||||
DocPath=kdict/index.html
|
||||
-Categories=Qt;KDE;Network;X-KDE-More;Office;Dictionary;
|
||||
+Categories=Qt;KDE;Network;Office;Dictionary;
|
||||
diff --git a/knewsticker/knewsticker-standalone.desktop b/knewsticker/knewsticker-standalone.desktop
|
||||
index b164e52..08d0d1e 100644
|
||||
--- a/knewsticker/knewsticker-standalone.desktop
|
||||
+++ b/knewsticker/knewsticker-standalone.desktop
|
||||
@@ -92,5 +92,5 @@ GenericName[zu]=Umlungiseleli Wezindaba
|
||||
Terminal=false
|
||||
X-KDE-StartupNotify=true
|
||||
X-DCOP-ServiceType=Unique
|
||||
-Categories=Qt;KDE;Network;X-KDE-More;News;
|
||||
+Categories=Qt;KDE;Network;News;
|
||||
NoDisplay=true
|
||||
diff --git a/kppp/logview/kppplogview.desktop b/kppp/logview/kppplogview.desktop
|
||||
index 39ba64f..401718f 100644
|
||||
--- a/kppp/logview/kppplogview.desktop
|
||||
+++ b/kppp/logview/kppplogview.desktop
|
||||
@@ -74,5 +74,5 @@ Path=
|
||||
Type=Application
|
||||
Terminal=false
|
||||
X-DCOP-ServiceType=Multi
|
||||
-Categories=Qt;KDE;Network;X-KDE-More;Dialup;
|
||||
+Categories=Qt;KDE;Network;Dialup;
|
||||
NoDisplay=true
|
||||
@ -0,0 +1,19 @@
|
||||
commit 228ad1c6df4be49fde421520e25fb9645ee922e7
|
||||
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||
Date: 1339265402 -0500
|
||||
|
||||
Update kalarmd icon reference, which does not exist, to kalarm.
|
||||
|
||||
diff --git a/kalarm/kalarmd/kalarmd.autostart.desktop b/kalarm/kalarmd/kalarmd.autostart.desktop
|
||||
index 7342be1..c9a72db 100644
|
||||
--- a/kalarm/kalarmd/kalarmd.autostart.desktop
|
||||
+++ b/kalarm/kalarmd/kalarmd.autostart.desktop
|
||||
@@ -46,7 +46,7 @@ Name[uk]=Демон KAlarm
|
||||
Name[zh_CN]=KAlarm 进程
|
||||
Name[zh_TW]=KAlarm 守護程式
|
||||
Exec=kalarmd --autostart
|
||||
-Icon=kalarmd
|
||||
+Icon=kalarm
|
||||
Type=Application
|
||||
Comment=KAlarm alarm daemon autostart at login
|
||||
Comment[af]=Begin KAlarm bediener outomaties tydens aanteken
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue