[Pkg-utopia-commits] r891 - packages/unstable/knetworkmanager/debian/patches

[Michael Biebl]

Author: mbiebl-guest
Date: 2006-07-25 21:41:49 +0000 (Tue, 25 Jul 2006)
New Revision: 891

Added:
   packages/unstable/knetworkmanager/debian/patches/02-dialup.patch
Removed:
   packages/unstable/knetworkmanager/debian/patches/02-no_dialup.patch
Log:
Reenable dialup support. 


Added: packages/unstable/knetworkmanager/debian/patches/02-dialup.patch
===================================================================
--- packages/unstable/knetworkmanager/debian/patches/02-dialup.patch	2006-07-25 21:40:33 UTC (rev 890)
+++ packages/unstable/knetworkmanager/debian/patches/02-dialup.patch	2006-07-25 21:41:49 UTC (rev 891)
@@ -0,0 +1,31 @@
+Index: src/knetworkmanager-tray.cpp
+===================================================================
+--- src/knetworkmanager-tray.cpp	(Revision 565631)
++++ src/knetworkmanager-tray.cpp	(Arbeitskopie)
+@@ -45,6 +45,7 @@
+ #include <klocale.h>
+ #include <kstdguiitem.h>
+ #include <khelpmenu.h>
++#include <kmessagebox.h>
+ 
+ #include <kiconloader.h>
+ 
+@@ -235,11 +236,13 @@
+ void
+ Tray::configureDialUp ()
+ {
+-	KProcess* yast2 = new KProcess ();
+-
+-	*yast2 << "kdesu" << "--nonewdcop" << "/sbin/yast2" << "modem";
+-
+-	yast2->start ();
++	if ( QFile::exists ("/usr/sbin/pppconfig") ) {
++		KProcess* config = new KProcess ();
++		*config << "kdesu" << "--nonewdcop" << "x-terminal-emulator -e pppconfig";
++		config->start ();
++	} else {
++		KMessageBox::error (0, "Please install the \"pppconfig\" package");
++	}
+ }
+ 
+ void

Deleted: packages/unstable/knetworkmanager/debian/patches/02-no_dialup.patch
===================================================================
--- packages/unstable/knetworkmanager/debian/patches/02-no_dialup.patch	2006-07-25 21:40:33 UTC (rev 890)
+++ packages/unstable/knetworkmanager/debian/patches/02-no_dialup.patch	2006-07-25 21:41:49 UTC (rev 891)
@@ -1,73 +0,0 @@
-Index: src/knetworkmanager-tray.cpp
-===================================================================
---- src/knetworkmanager-tray.cpp	(Revision 528045)
-+++ src/knetworkmanager-tray.cpp	(Arbeitskopie)
-@@ -567,7 +567,6 @@
- 	State*       state      = _ctx->getState ();
- 	VPN*         vpn        = _ctx->getVPN ();
- 	DeviceList  deviceList = store->getDeviceList ();
--	DialUpList  dialUpList = store->getDialUpList ();
- 	VPNList*     vpnList    = vpn->getVPNList ();
- 
- 	s_status*    stat       = store->getStatus ();
-@@ -581,11 +580,9 @@
- 	menu->clear ();
- 	
- 	_vpnMenu->clear ();
--	_dialUpMenu->clear ();
- 	_optionsMenu->clear ();
- 	
- 	_vpnMap.clear ();
--	_dialUpMap.clear ();
- 	_deviceMap.clear ();
- 
- 	menu->insertTitle (SmallIcon ("knetworkmanager",  QIconSet::Automatic), "KNetworkManager", -1, -1);
-@@ -658,19 +655,6 @@
- 			contextMenu ()->insertItem (noDeviceFound);
- 		}
- 
--		/* always show dialup menu */
--		if (stat->dialUpConnections) {
--			/* show existing dialup connections */
--			for (DialUpList::iterator i = dialUpList.begin (); i != dialUpList.end (); ++i) {
--				addDialUp (*i);
--			}
--			_dialUpMenu->insertSeparator ();
--		}
--		KAction* configureDialUpAction = actionCollection ()->action ("configure_dialup");
--		configureDialUpAction->plug (_dialUpMenu);
--		/* add menu item to fire up YaST to configure dial connections */
--		menu->insertItem (SmallIcon ("modem",  QIconSet::Automatic), i18n ("Dial-Up Connections"), _dialUpMenu, -1);
--
- 		/* show entry for VPN if services are available */
- 		if (vpn->isAvailable ()) {
- 			bool isActive = vpn->isActive ();
-@@ -1020,7 +1004,6 @@
- 	setPixmap (loadIcon ("knm-logo"));
- 
- 	_vpnMenu     = new KPopupMenu (this->contextMenu (), "vpnconnmenu" );
--	_dialUpMenu  = new KPopupMenu (this->contextMenu (), "dialupconnmenu" );
- 	_optionsMenu = new KPopupMenu (this->contextMenu (), "optionsmenu" );
- 	_helpMenu    = new KPopupMenu (this->contextMenu (), "helpmenu" );
- 
-@@ -1041,10 +1024,6 @@
- 			 		   SmallIcon ("connect_no",  QIconSet::Automatic), 0,
- 					   this, SLOT (disconnectVPN ()), actionCollection (), "disconnect_vpn");
- 
--	configureDialUpAction = new KAction (i18n ("Configure Dial-Up Connections..."),
--					     SmallIcon ("configure",  QIconSet::Automatic), 0,
--					     this, SLOT (configureDialUp ()), actionCollection (), "configure_dialup");
--
- 	switchOnAction = new KAction (i18n ("Switch to Online Mode"),
- 					    SmallIconSet ("ok",  QIconSet::Automatic), 0,
- 					    this, SLOT (switchState ()), actionCollection (), "switch_on");
-@@ -1075,9 +1054,6 @@
- 	connect (this->_vpnMenu, SIGNAL (activated (int)),
- 		 this,           SLOT   (vpnItemActivated (int)));
- 	
--	connect (this->_dialUpMenu, SIGNAL (activated (int)),
--		 this,              SLOT   (dialUpItemActivated (int)));
--
- 	loadIcons();
- 
- 	connect ( &m_iconTimer, SIGNAL( timeout() ), SLOT( slotIconTimer() ) );