Mailinglist Archive: opensuse-commit (1083 mails)
| < Previous | Next > |
commit kdenetwork4
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sun, 02 Sep 2007 10:03:34 +0200
- Message-id: <20070902080334.9E2EC678180@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kdenetwork4
checked in at Sun Sep 2 10:03:34 CEST 2007.
--------
--- KDE/kdenetwork4/kdenetwork4.changes 2007-08-16 13:58:54.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdenetwork4/kdenetwork4.changes 2007-09-01 19:08:47.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Aug 30 11:26:20 CEST 2007 - dmueller@xxxxxxx
+
+- update to KDE 4.0 Beta 2
+
+-------------------------------------------------------------------
+Thu Aug 23 17:58:34 CEST 2007 - stbinner@xxxxxxx
+
+- update to 3.92.0.svn705096
+
+-------------------------------------------------------------------
Old:
----
kdenetwork.tar.bz2
New:
----
kdenetwork-3.93.0.tar.bz2
krdc-fixes.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdenetwork4.spec ++++++
--- /var/tmp/diff_new_pack.X13653/_old 2007-09-02 10:03:15.000000000 +0200
+++ /var/tmp/diff_new_pack.X13653/_new 2007-09-02 10:03:15.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdenetwork4 (Version 3.92.0.svn700763)
+# spec file for package kdenetwork4 (Version 3.93.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,19 +15,25 @@
Group: Productivity/Networking/Other
Summary: KDE Network Base Package
URL: http://www.kde.org
-Version: 3.92.0.svn700763
+Version: 3.93.0
Release: 1
-Source0: kdenetwork.tar.bz2
+Source0: kdenetwork-%version.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: kdebase4-runtime
Patch: desktop-files.diff
+Patch1: krdc-fixes.diff
+%define with_kopete 0
Suggests: kde4-kget
+%if %with_kopete
Suggests: kde4-kopete
+%endif
Suggests: kde4-kppp
Suggests: kde4-krdc
Suggests: kde4-krfb
+%if 0
Suggests: kde4-knewsticker
+%endif
Suggests: kde4-lisa
Suggests: kde4-kdnssd
Suggests: kdenetwork4-filesharing
@@ -43,8 +49,9 @@
The KDE Team <kde@xxxxxxx>
%prep
-%setup -q -n kdenetwork
+%setup -q -n kdenetwork-%version
%patch
+%patch1
%build
%cmake_kde4 -d build
@@ -55,11 +62,12 @@
%makeinstall
# FIXME: contact security team
chmod u-s $RPM_BUILD_ROOT/usr/bin/kppp
+%if %with_kopete
%suse_update_desktop_file kopete Network InstantMessaging
+%endif
%suse_update_desktop_file Kppp Network Dialup
%suse_update_desktop_file -r kppplogview System Monitor
%suse_update_desktop_file -r krdc System RemoteAccess
- %suse_update_desktop_file -u knewsticker-standalone Network News
%suse_update_desktop_file -r kget System TrayIcon
%suse_update_desktop_file -r krfb System RemoteAccess
%kde_post_install
@@ -70,6 +78,7 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%if %with_kopete
%package -n kde4-kopete
Group: Productivity/Networking/Instant Messenger
Summary: Instant Messenger
@@ -98,22 +107,9 @@
/usr/bin/kopete_latexconvert.sh
/usr/bin/winpopup-install.sh
/usr/bin/winpopup-send.sh
-/usr/%_lib/libpapillon_kopete.so.*
/usr/%_lib/kde4/kcm_kopete_*.so
/usr/%_lib/kde4/kopete_*.so
-/usr/%_lib/libkopete.so.*
-/usr/%_lib/libkopete_msn_shared.so.*
-/usr/%_lib/libkopete_oscar.so.*
-/usr/%_lib/libkopetechatwindow_shared.so.*
-/usr/%_lib/libkopeteprivacy.so.*
-/usr/%_lib/libkyahoo.so.*
-/usr/%_lib/liboscar.so.*
-/usr/%_lib/libgadu_kopete.so.*
/usr/%_lib/kde4/libkrichtexteditpart.so
-/usr/%_lib/libkopete_videodevice.so.*
-/usr/%_lib/libkopeteaddaccountwizard.so.*
-/usr/%_lib/libiris_kopete.so.*
-/usr/%_lib/libkopeteidentity.so.*
/usr/share/kde4/apps/kopete_jabber
/usr/share/kde4/services/xmpp.protocol
/usr/share/applications/kde4/kopete.desktop
@@ -182,6 +178,8 @@
/usr/share/sounds/Kopete_Received.ogg
/usr/share/sounds/Kopete_Sent.ogg
/usr/share/sounds/Kopete_User_is_Online.ogg
+/usr/share/kde4/config.kcfg/motionawayconfig.kcfg
+/usr/share/kde4/config.kcfg/urlpicpreview.kcfg
%_kde_share_dir/apps/kopete_contactnotes
@@ -227,6 +225,7 @@
/usr/share/icons/oxygen/*/actions/delete_user.*
/usr/share/icons/oxygen/*/actions/edit_user.*
/usr/share/icons/oxygen/*/actions/emoticon.*
+%endif
%package -n kde4-kppp
Group: Productivity/Networking/Other
Summary: Internet Dial-Up Tool
@@ -296,7 +295,6 @@
%_kde_share_dir/services/vnc.protocol
%dir %_kde_share_dir/apps/konqueror
%dir %_kde_share_dir/apps/konqueror/servicemenus
-/usr/share/icons/hicolor/*/apps/krdc.*
%package -n kde4-krfb
Group: Productivity/Networking/Remote Desktop
Summary: Desktop Sharing
@@ -328,6 +326,7 @@
#/usr/share/dbus-1/interfaces/org.kde.krfb.xml
%doc %lang(en) /usr/share/doc/kde/HTML/en/krfb
#%_kde_share_dir/services/kinetd_krfb.desktop
+%if 0
%package -n kde4-knewsticker
Group: Productivity/Networking/News/Clients
Summary: RDF newsticker applet
@@ -365,6 +364,7 @@
%_kde_share_dir/apps/knewsticker
/usr/share/icons/hicolor/*/apps/knewsticker.*
+%endif
%package -n kde4-lisa
Group: Productivity/Networking/Other
Summary: Lan Information Server LISa
@@ -403,7 +403,7 @@
%_kde_share_dir/services/kcmkiolan.desktop
%_kde_share_dir/services/lan.protocol
-%doc %lang(en) /usr/share/doc/kde/HTML/en/lanbrowser
+%doc %lang(en) /usr/share/doc/kde/HTML/en/kcontrol/lanbrowser
/usr/%_lib/kde4/kcm_lanbrowser.so
%dir %_kde_share_dir/apps/konqueror
@@ -560,23 +560,13 @@
%files devel
%defattr(-,root,root)
-/usr/include/kopete
%_libdir/libkgetcore.so
-%_libdir/libkopeteaddaccountwizard.so
-%_libdir/liboscar.so
-%_libdir/libkopete_oscar.so
-%_libdir/libkyahoo.so
-%_libdir/libkopete_videodevice.so
-%_libdir/libkopetechatwindow_shared.so
-%_libdir/libgadu_kopete.so
-%_libdir/libkopete_msn_shared.so
-%_libdir/libkopete.so
-%_libdir/libkopeteprivacy.so
-%_libdir/libiris_kopete.so
-%_libdir/libpapillon_kopete.so
-%_libdir/libkopeteidentity.so
%changelog
+* Thu Aug 30 2007 - dmueller@xxxxxxx
+- update to KDE 4.0 Beta 2
+* Thu Aug 23 2007 - stbinner@xxxxxxx
+- update to 3.92.0.svn705096
* Thu Aug 16 2007 - stbinner@xxxxxxx
- update to 3.92.0.svn700763
* Thu Aug 09 2007 - stbinner@xxxxxxx
++++++ desktop-files.diff ++++++
--- /var/tmp/diff_new_pack.X13653/_old 2007-09-02 10:03:15.000000000 +0200
+++ /var/tmp/diff_new_pack.X13653/_new 2007-09-02 10:03:15.000000000 +0200
@@ -1,13 +1,5 @@
--- kget/desktop/kget.desktop 2007/06/26 07:16:06 1.1
+++ kget/desktop/kget.desktop 2007/06/26 07:16:29
-@@ -3,7 +3,6 @@
- Encoding=UTF-8
- Type=Application
- Exec=kget -caption "%c" %i %m
--Icon=kget
- Terminal=false
- Name=KGet
- Name[ar]=ك.جيت
@@ -62,3 +61,4 @@
GenericName[zh_TW]=下載管理員
Categories=Qt;KDE;Network;FileTransfer;
@@ -25,8 +17,8 @@
Type=Service
ServiceTypes=KCModule
---- ./krfb/krfb.desktop 2007/08/09 05:41:27 1.1
-+++ ./krfb/krfb.desktop 2007/08/09 05:41:35
+--- krfb/krfb.desktop 2007/09/01 10:53:41 1.1
++++ krfb/krfb.desktop 2007/09/01 10:53:51
@@ -3,7 +3,6 @@
Encoding=UTF-8
Type=Application
@@ -35,3 +27,13 @@
DocPath=krfb/index.html
Terminal=false
Name=Krfb
+--- krdc/krdc.desktop 2007/09/01 10:54:08 1.1
++++ krdc/krdc.desktop 2007/09/01 10:54:13
+@@ -3,7 +3,6 @@
+ Encoding=UTF-8
+ Type=Application
+ Exec=krdc -caption "%c" %u
+-Icon=krdc
+ Terminal=false
+ Name=Krdc
+ Name[ne]=केआरडीसी
++++++ krdc-fixes.diff ++++++
--- krdc/vnc/vncview.cpp
+++ krdc/vnc/vncview.cpp
@@ -101,8 +101,6 @@ void VncView::startQuitting()
m_quitFlag = true;
if (connected) {
- vncThread.cleanup();
-
vncThread.stop();
} else {
vncThread.quit();
--- krdc/vnc/vncclientthread.h
+++ krdc/vnc/vncclientthread.h
@@ -44,14 +44,14 @@ public:
const QImage image(int x = 0, int y = 0, int w = 0, int h = 0);
void setImage(const QImage &img);
void emitUpdated(int x, int y, int w, int h);
- void emitPasswordRequest();
void stop();
void setHost(const QString &host);
void setPort(int port);
- void setPassword(const QString &password);
- const QString password() const;
void setQuality(RemoteView::Quality quality);
- const RemoteView::Quality quality();
+ void setPassword(const QString &password) { m_password = password; }
+ const QString password() const { return m_password; }
+
+ RemoteView::Quality quality() const;
signals:
void imageUpdated(int x, int y, int w, int h);
@@ -60,21 +60,24 @@ signals:
public slots:
void mouseEvent(int x, int y, int buttonMask);
void keyEvent(int key, bool pressed);
- void cleanup();
protected:
void run();
private:
+ static char* passwdHandler(rfbClient *cl);
+ static void outputHandler(const char *format, ...);
+
QImage m_image;
rfbClient *cl;
- volatile bool m_stopped;
- volatile bool m_cleanup;
QString m_host;
QString m_password;
int m_port;
QMutex mutex;
RemoteView::Quality m_quality;
+
+ volatile bool m_stopped;
+ volatile bool m_passwordError;
};
#endif
--- krdc/vnc/vncclientthread.cpp
+++ krdc/vnc/vncclientthread.cpp
@@ -27,7 +27,7 @@
#include <QMutexLocker>
-extern rfbBool newclient(rfbClient *cl)
+static rfbBool newclient(rfbClient *cl)
{
int width = cl->width, height = cl->height, depth = cl->format.bitsPerPixel;
int size = width * height * (depth / 8);
@@ -90,19 +90,19 @@ extern void updatefb(rfbClient* cl, int
t->emitUpdated(x, y, w, h);
}
-extern char *passwd(rfbClient *cl)
+char *VncClientThread::passwdHandler(rfbClient *cl)
{
- Q_UNUSED(cl);
- kDebug(5011) << "password request";
+ kDebug(5011) << "password request" << kdBacktrace() ;
VncClientThread *t = (VncClientThread*)rfbClientGetClientData(cl, 0);
- t->emitPasswordRequest();
+ t->passwordRequest();
+ t->m_passwordError = true;
return strdup(t->password().toLocal8Bit());
}
-extern void output(const char *format, ...)
+void VncClientThread::outputHandler(const char *format, ...)
{
va_list args;
va_start(args, format);
@@ -125,11 +125,12 @@ VncClientThread::VncClientThread()
{
QMutexLocker locker(&mutex);
m_stopped = false;
- m_cleanup = false;
}
VncClientThread::~VncClientThread()
{
+ stop();
+ wait();
}
void VncClientThread::setHost(const QString &host)
@@ -144,26 +145,16 @@ void VncClientThread::setPort(int port)
m_port = port;
}
-void VncClientThread::setPassword(const QString &password)
-{
- m_password = password;
-}
-
void VncClientThread::setQuality(RemoteView::Quality quality)
{
m_quality = quality;
}
-const RemoteView::Quality VncClientThread::quality()
+RemoteView::Quality VncClientThread::quality() const
{
return m_quality;
}
-const QString VncClientThread::password() const
-{
- return m_password;
-}
-
void VncClientThread::setImage(const QImage &img)
{
QMutexLocker locker(&mutex);
@@ -185,11 +176,6 @@ void VncClientThread::emitUpdated(int x,
emit imageUpdated(x, y, w, h);
}
-void VncClientThread::emitPasswordRequest()
-{
- emit passwordRequest();
-}
-
void VncClientThread::stop()
{
QMutexLocker locker(&mutex);
@@ -199,47 +185,57 @@ void VncClientThread::stop()
void VncClientThread::run()
{
QMutexLocker locker(&mutex);
- rfbClientLog = output;
- rfbClientErr = output;
- cl = rfbGetClient(8, 3, 4);
- cl->MallocFrameBuffer = newclient;
- cl->canHandleNewFBSize = true;
- cl->GetPassword = passwd;
- cl->GotFrameBufferUpdate = updatefb;
- rfbClientSetClientData(cl, 0, this);
-
- // make a copy of the host string...
- QByteArray hostByteArray(m_host.toUtf8().constData());
- char *host = (char*) malloc(hostByteArray.size());
- strcpy(host, hostByteArray);
-
- cl->serverHost = host;
-
- if (m_port < 0 || !m_port) // port is invalid or empty...
- m_port = 5900; // fallback: try an often used VNC port
-
- if (m_port >= 0 && m_port < 100) // the user most likely used the short form (e.g. :1)
- m_port += 5900;
- cl->serverPort = m_port;
- if(!rfbInitClient(cl, 0, 0))
+ for (int c = 0; c < 3; ++c) {
+ m_passwordError = false;
+
+ rfbClientLog = outputHandler;
+ rfbClientErr = outputHandler;
+ cl = rfbGetClient(8, 3, 4);
+ cl->MallocFrameBuffer = newclient;
+ cl->canHandleNewFBSize = true;
+ cl->GetPassword = passwdHandler;
+ cl->GotFrameBufferUpdate = updatefb;
+ rfbClientSetClientData(cl, 0, this);
+
+ cl->serverHost = strdup(m_host.toUtf8().constData());
+
+ if (m_port < 0 || !m_port) // port is invalid or empty...
+ m_port = 5900; // fallback: try an often used VNC port
+
+ if (m_port >= 0 && m_port < 100) // the user most likely used the short form (e.g. :1)
+ m_port += 5900;
+ cl->serverPort = m_port;
+
+ kDebug() << "--------------------- trying init ---------------------";
+
+ if(rfbInitClient(cl, 0, 0))
+ break;
+
+ if (m_passwordError)
+ continue;
+
return;
+ }
locker.unlock();
+ // Main VNC event loop
while (!m_stopped) {
- if (m_cleanup) {
- rfbClientCleanup(cl);
- return;
- }
-
int i = WaitForMessage(cl, 500);
if (i < 0)
- return;
+ break;
if (i)
if(!HandleRFBServerMessage(cl))
- return;
+ break;
}
+
+ // Cleanup allocated ressources
+ locker.relock();
+ delete [] cl->frameBuffer;
+ cl->frameBuffer = 0;
+ rfbClientCleanup(cl);
+ m_stopped = true;
}
void VncClientThread::mouseEvent(int x, int y, int buttonMask)
@@ -252,10 +248,4 @@ void VncClientThread::keyEvent(int key,
SendKeyEvent(cl, key, pressed);
}
-void VncClientThread::cleanup()
-{
- QMutexLocker locker(&mutex);
- m_cleanup = true;
-}
-
#include "vncclientthread.moc"
--- krdc/mainwindow.cpp
+++ krdc/mainwindow.cpp
@@ -210,7 +210,8 @@ void MainWindow::slotNewConnection(const
KUrl url = newUrl.isEmpty() ? m_addressNavigator->uncommittedUrl() : newUrl;
- if (!url.isValid()) {
+ if (!url.isValid() || (url.host().isEmpty() && url.port()<0)
+ || !url.path().isEmpty()) {
KMessageBox::error(this,
i18n("The entered address does not have the required form."),
i18n("Malformed URL"));
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |