commit NetworkManager-kde

25 Sep 2006

Hello community,

here is the log from the commit of package NetworkManager-kde
checked in at Tue Sep 26 00:50:30 CEST 2006.

--------

--- KDE/NetworkManager-kde/NetworkManager-kde.changes	2006-09-20 18:02:32.000000000 +0200
+++ NetworkManager-kde/NetworkManager-kde.changes	2006-09-25 20:20:19.000000000 +0200
@@ -2 +2 @@
-Wed Sep 20 17:16:50 CEST 2006 - thoenig@suse.de
+Mon Sep 25 13:32:13 CEST 2006 - thoenig@suse.de
@@ -4 +4 @@
-- update to KDE SVN r586773 (pre-release for KNetworkManager 0.1)
+- update to KDE SVN r588186
@@ -6,0 +7,4 @@
+- ignore signal from NetworkManager if its state did not change
+  (b.n.c #165275)
+- move SuSE specific code to a separate patch
+  (knetworkmanager-kde-networkstatus-wstephenson-01.patch)
@@ -9,0 +14,2 @@
+- this version will be released as online update for SL10.1,
+  SLED10 and SLES10.

Old:
----
  knetworkmanager-0.1r586773.tar.bz2

New:
----
  knetworkmanager-0.1r588186.tar.bz2
  knetworkmanager-kde-networkstatus-wstephenson-01.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ NetworkManager-kde.spec ++++++
--- /var/tmp/diff_new_pack.Ja6a50/_old	2006-09-26 00:49:37.000000000 +0200
+++ /var/tmp/diff_new_pack.Ja6a50/_new	2006-09-26 00:49:37.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package NetworkManager-kde (Version 0.1r586773)
+# spec file for package NetworkManager-kde (Version 0.1r588186)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -19,7 +19,7 @@
 License:        GPL
 Group:          System/GUI/KDE
 Autoreqprov:    on
-Version:        0.1r586773
+Version:        0.1r588186
 Release:        1
 Summary:        KNetworkManager application for use with NetworkManager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -27,6 +27,7 @@
 Provides:       NetworkManager-client
 Source0:        %{appname}-%{version}.tar.bz2
 Source1:        knetworkmanager.default.sh
+Patch0:         knetworkmanager-kde-networkstatus-wstephenson-01.patch
 
 %description
 KNetworkManager is a system tray applet for controlling network
@@ -40,12 +41,13 @@
 
 %prep
 %setup -n %{appname}-%{version} -q
+%patch0 -R -p0
 . /etc/opt/kde3/common_options
 update_admin
 
 %build
 . /etc/opt/kde3/common_options
-./configure $configkde
+./configure $configkde --with-distro=suse
 do_make %{?jobs:-j %jobs}
 
 %install
@@ -84,13 +86,19 @@
 /opt/kde3/env
 
 %changelog -n NetworkManager-kde
-* Wed Sep 20 2006 - thoenig@suse.de
-- update to KDE SVN r586773 (pre-release for KNetworkManager 0.1)
+* Mon Sep 25 2006 - thoenig@suse.de
+- update to KDE SVN r588186
 - open KWallet only when connecting to an encrypted network (b.n.c
   [#204809])
+- ignore signal from NetworkManager if its state did not change
+  (b.n.c #165275)
+- move SuSE specific code to a separate patch
+  (knetworkmanager-kde-networkstatus-wstephenson-01.patch)
 - persist settings for "Offline Mode" and "Disable Wireless"
 - avoid flickering of the tray icon
 - remove absolute path to g-k-d
+- this version will be released as online update for SL10.1,
+  SLED10 and SLES10.
 * Wed Jun 14 2006 - dmueller@suse.de
 - build parallel
 * Mon Jun 12 2006 - thoenig@suse.de

++++++ knetworkmanager-0.1r586773.tar.bz2 -> knetworkmanager-0.1r588186.tar.bz2 ++++++
++++   24265 lines of diff (skipped)

++++++ knetworkmanager-kde-networkstatus-wstephenson-01.patch ++++++
--- knetworkmanager/src/knetworkmanager-tray.h	(revision 586995)
+++ knetworkmanager/src/knetworkmanager-tray.h	(revision 586996)
@@ -58,7 +58,6 @@
 #include "knetworkmanager-devicestore.h"
 #include "knetworkmanager-vpn.h"
 #include "knetworkmanager-state.h"
-#include "serviceiface_stub.h"
 
 #define NUM_CONNECTING_STAGES 3
 #define NUM_CONNECTING_FRAMES 11
@@ -208,9 +207,6 @@
 	  QPixmap m_wireless75;
 	  QPixmap m_wireless100;
 	  QPixmap m_background;
-	  
-	  // stub for kded networkstatus dcop interface
-	  ServiceIface_stub * m_serviceStub;
 };
 
 #endif /* KNETWORKMANAGER_TRAY_H */
--- knetworkmanager/src/knetworkmanager-tray.cpp	(revision 586995)
+++ knetworkmanager/src/knetworkmanager-tray.cpp	(revision 586996)
@@ -869,12 +869,9 @@
 					pixmap = m_wireless25;
 				else
 					pixmap = m_wireless00;
-				m_serviceStub->setNetworkStatus( KDED_NETWORK_NAME, NetworkStatus::Online );
 			}
-			else {
-				m_serviceStub->setNetworkStatus( KDED_NETWORK_NAME, NetworkStatus::Online );
+			else 
 				pixmap = m_wired;
-			}
 
 			m_animated = false;
 			
@@ -884,23 +881,13 @@
 			{
 				pixmap = pixmapForStage();
 				m_animated = true;
-				m_serviceStub->setNetworkStatus( KDED_NETWORK_NAME, NetworkStatus::Establishing );
 			}
-			else {
-				if ( _ctx->getDeviceStore()->getDeviceList().isEmpty() )
-					m_serviceStub->setNetworkStatus( KDED_NETWORK_NAME, NetworkStatus::NoNetworks );
-				else
-					m_serviceStub->setNetworkStatus( KDED_NETWORK_NAME, NetworkStatus::Offline );
+			else 
 				pixmap = m_disconnected;
-			}
 			break;
 		case NM_STATE_ASLEEP:
 		case NM_STATE_DISCONNECTED:
 		default:
-			if ( _ctx->getDeviceStore()->getDeviceList().isEmpty() )
-				m_serviceStub->setNetworkStatus( KDED_NETWORK_NAME, NetworkStatus::NoNetworks );
-			else
-				m_serviceStub->setNetworkStatus( KDED_NETWORK_NAME, NetworkStatus::Offline );
 			if (_ctx->getState ()->isDialupActive ())
 				pixmap = m_dialup;
 			else
@@ -1014,7 +1001,7 @@
 }
 
 
-Tray::Tray () : KSystemTray (), m_step( 0 ), m_serviceStub( 0 )
+Tray::Tray () : KSystemTray (), m_step( 0 )
 {
 /*	QMovie movie = KGlobal::iconLoader()->loadMovie("nm_detect", KIcon::Panel );
 // 	movie.setSpeed( 3 );
@@ -1086,17 +1073,6 @@
 	loadIcons();
 
 	connect ( &m_iconTimer, SIGNAL( timeout() ), SLOT( slotIconTimer() ) );
-	
-	// hack - talk to kded networkstatus on behalf of NM, as NM doesn't differentiate between 
-	// NM_STATE_DISCONNECTED when normally offline and when it has no networks/devices
-	m_serviceStub = new ServiceIface_stub( "kded", "networkstatus" );
-	NetworkStatus::Properties nsp;
-	nsp.internet = true; // we are the internet, we do mount it !
-	nsp.name = KDED_NETWORK_NAME;
-	nsp.onDemandPolicy = NetworkStatus::All;
-	nsp.service = kapp->dcopClient()->appId();
-	nsp.status = NetworkStatus::NoNetworks;
-	m_serviceStub->registerNetwork( KDED_NETWORK_NAME, nsp );
 }
 
 Tray::~Tray ()
--- knetworkmanager/src/Makefile.am	(revision 586995)
+++ knetworkmanager/src/Makefile.am	(revision 586996)
@@ -36,16 +36,14 @@
 	knetworkmanager-synchronizer.cpp knetworkmanager-dialup.cpp settings.kcfgc knetworkmanager-encryption.cpp \
 	knetworkmanager-tray.cpp activation.ui cryptowidget.ui networkchoicewidget.ui networklabelwidget.ui \
 	knetworkmanager-ui-networklistview.cpp \
-	knetworkmanager-vpn.cpp knetworkmanager-vpn_dbus.cpp serviceiface.stub
+	knetworkmanager-vpn.cpp knetworkmanager-vpn_dbus.cpp
 
-serviceiface_DIR = /opt/kde3/include
 
-
 kde_kcfg_DATA = knetworkmanager.kcfg
 
 knetworkmanager_la_LDFLAGS = -module $(KDE_RPATH) $(all_libraries) \
 	$(KDE_PLUGIN)
-knetworkmanager_la_LIBADD = -lnetworkstatus -ldbus-qt-1 $(PACKAGE_LIBS) \
+knetworkmanager_la_LIBADD = -ldbus-qt-1 $(PACKAGE_LIBS) \
 	$(LIB_KDEUI) -lkwalletclient -lkdeui -lkio
 
 # this is where the desktop file will go 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠suse.de

tags

participants (1)