Hello community,
here is the log from the commit of package NetworkManager-kde
checked in at Fri Apr 7 16:37:12 CEST 2006.
--------
--- KDE/NetworkManager-kde/NetworkManager-kde.changes 2006-03-29 17:50:12.000000000 +0200
+++ NetworkManager-kde/NetworkManager-kde.changes 2006-04-07 16:21:45.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Apr 7 16:20:43 CEST 2006 - wstephenson@suse.de
+
+- Update to KDE SVN r527269
+- fix wrong signal strength, spurious disconnect notifications.
+
+-------------------------------------------------------------------
Old:
----
knetworkmanager-0.1r5964.tar.bz2
New:
----
knetworkmanager-0.1r527269.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-kde.spec ++++++
--- /var/tmp/diff_new_pack.vby00e/_old 2006-04-07 16:33:05.000000000 +0200
+++ /var/tmp/diff_new_pack.vby00e/_new 2006-04-07 16:33:05.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package NetworkManager-kde (Version 0.1r5964)
+# spec file for package NetworkManager-kde (Version 0.1r527269)
#
# 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.1r5964
+Version: 0.1r527269
Release: 1
Summary: KNetworkManager application for use with NetworkManager
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -83,6 +83,9 @@
/opt/kde3/env
%changelog -n NetworkManager-kde
+* Fri Apr 07 2006 - wstephenson@suse.de
+- Update to KDE SVN r527269
+- fix wrong signal strength, spurious disconnect notifications.
* Wed Mar 29 2006 - thoenig@suse.de
- update to SVN r5964
- add "Provides: NetworkManager-client" to spec file (b.n.c.
++++++ knetworkmanager-0.1r5964.tar.bz2 -> knetworkmanager-0.1r527269.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5964/src/Makefile.am new/knetworkmanager-0.1r527269/src/Makefile.am
--- old/knetworkmanager-0.1r5964/src/Makefile.am 2006-03-29 16:44:14.000000000 +0200
+++ new/knetworkmanager-0.1r527269/src/Makefile.am 2006-04-03 18:49:37.000000000 +0200
@@ -14,7 +14,6 @@
METASOURCES = AUTO
messages: rc.cpp
- $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/knetworkmanager.pot
#########################################################################
@@ -26,6 +25,8 @@
lib_LTLIBRARIES =
kdeinit_LTLIBRARIES = knetworkmanager.la
+KDE_CXXFLAGS = -UQT_NO_ASCII_CAST
+
# the application source, library search path, and link libraries
knetworkmanager_la_SOURCES = main.cpp knetworkmanager.cpp knetworkmanager-dbus.cpp \
knetworkmanager-dbus_dispatch.cpp knetworkmanager-device.cpp knetworkmanager-devicestore.cpp \
@@ -44,15 +45,12 @@
knetworkmanager_la_LIBADD = -ldbus-qt-1 $(PACKAGE_LIBS) $(LIB_KDEUI) -lkwalletclient -lkdeui -lkio
# this is where the desktop file will go
-shelldesktopdir = $(kde_appsdir)/Utilities
-shelldesktop_DATA = knetworkmanager.desktop
+xdg_apps_DATA = knetworkmanager.desktop
# this is where the shell's XML-GUI resource file goes
shellrcdir = $(kde_datadir)/knetworkmanager
shellrc_DATA = knetworkmanagerui.rc
-kde_icon_KDEICON = cr16-app-knetworkmanager.png cr32-app-knetworkmanager.png cr48-app-knetworkmanager.png
-
EXTRA_DIST = $(shelldesktop_DATA) $(shellrc_DATA)
mydatadir = $(kde_datadir)/knetworkmanager
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5964/src/cryptowidget.ui new/knetworkmanager-0.1r527269/src/cryptowidget.ui
--- old/knetworkmanager-0.1r5964/src/cryptowidget.ui 2006-03-29 16:44:14.000000000 +0200
+++ new/knetworkmanager-0.1r527269/src/cryptowidget.ui 2006-03-30 15:49:35.000000000 +0200
@@ -398,7 +398,7 @@
</property>
<property name="sizePolicy">
<sizepolicy>
- <hsizetype>5</hsizetype>
+ <hsizetype>3</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
@@ -474,7 +474,7 @@
</property>
<property name="sizePolicy">
<sizepolicy>
- <hsizetype>7</hsizetype>
+ <hsizetype>3</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
@@ -533,7 +533,7 @@
</property>
<property name="sizePolicy">
<sizepolicy>
- <hsizetype>5</hsizetype>
+ <hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5964/src/knetworkmanager-dbus_dispatch.cpp new/knetworkmanager-0.1r527269/src/knetworkmanager-dbus_dispatch.cpp
--- old/knetworkmanager-0.1r5964/src/knetworkmanager-dbus_dispatch.cpp 2006-03-29 16:44:14.000000000 +0200
+++ new/knetworkmanager-0.1r527269/src/knetworkmanager-dbus_dispatch.cpp 2006-04-03 15:19:10.000000000 +0200
@@ -86,6 +86,7 @@
bool handled = true;
if (dbus_message_is_signal (msg, DBUS_INTERFACE_LOCAL, "Disconnected")) {
+ printf ("uhhh\n");
DBusConnection::triggerReconnect ();
}
/* Signal indicating that NetworkManager's D-BUS interface owner has changed
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5964/src/knetworkmanager-device.cpp new/knetworkmanager-0.1r527269/src/knetworkmanager-device.cpp
--- old/knetworkmanager-0.1r5964/src/knetworkmanager-device.cpp 2006-03-29 16:44:14.000000000 +0200
+++ new/knetworkmanager-0.1r527269/src/knetworkmanager-device.cpp 2006-04-03 15:27:29.000000000 +0200
@@ -353,11 +353,7 @@
bool
Device::hasCarrierDetect () const
{
- if (d->capabilities & NM_DEVICE_CAP_CARRIER_DETECT) {
- return true;
- } else {
- return false;
- }
+ return d->capabilities & NM_DEVICE_CAP_CARRIER_DETECT;
}
void
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5964/src/knetworkmanager-devicestore.cpp new/knetworkmanager-0.1r527269/src/knetworkmanager-devicestore.cpp
--- old/knetworkmanager-0.1r5964/src/knetworkmanager-devicestore.cpp 2006-03-29 16:44:14.000000000 +0200
+++ new/knetworkmanager-0.1r527269/src/knetworkmanager-devicestore.cpp 2006-03-30 21:32:25.000000000 +0200
@@ -98,7 +98,7 @@
* NM is running, KNM is started and reports hidden networks,
* NM then finds the network and tells signal strength about it
*/
- DeviceStoreDBus::updateNetwork (obj_path, net_path, "");
+ DeviceStoreDBus::updateNetwork (obj_path.ascii(), net_path.ascii(), "");
net = dev->getNetwork (net_path);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5964/src/knetworkmanager-devicestore_dbus.cpp new/knetworkmanager-0.1r527269/src/knetworkmanager-devicestore_dbus.cpp
--- old/knetworkmanager-0.1r5964/src/knetworkmanager-devicestore_dbus.cpp 2006-03-29 16:44:14.000000000 +0200
+++ new/knetworkmanager-0.1r527269/src/knetworkmanager-devicestore_dbus.cpp 2006-04-03 15:22:53.000000000 +0200
@@ -29,7 +29,8 @@
#include "knetworkmanager-network.h"
#include "knetworkmanager-encryption.h"
-#include
+#include "kdebug.h"
+#include "klocale.h"
KNetworkManager* DeviceStoreDBus::_ctx = NULL;
@@ -139,7 +140,7 @@
}
void
-DeviceStoreDBus::getHalProperty (const char* udi, const char* property, QString& result)
+DeviceStoreDBus::getHalProperty (const QCString& udi, const QCString& property, QCString& result)
{
DBusConnection* con = _ctx->getDBus ()->getConnection ();
LibHalContext* hal_ctx = NULL;
@@ -167,7 +168,6 @@
prop_val = libhal_device_get_property_string (hal_ctx, udi, property, NULL);
result = prop_val;
libhal_free_string (prop_val);
-
out:
if (hal_ctx) {
libhal_ctx_shutdown (hal_ctx, NULL);
@@ -180,17 +180,17 @@
void
DeviceStoreDBus::setHalDeviceInfo (Device* dev)
{
- QString device_udi = "";
- QString parent_udi = "";
- QString subsystem = "";
- QString vendor = "";
- QString product = "";
- bustype type = BUS_UNKNOWN;
+ QCString device_udi = "";
+ QCString parent_udi = "";
+ QCString subsystem = "";
+ QCString vendor = "";
+ QCString product = "";
+ bustype type = BUS_UNKNOWN;
- device_udi = dev->getUdi ();
+ device_udi = dev->getUdi ().utf8();
getHalProperty (device_udi, "info.parent", parent_udi);
getHalProperty (parent_udi, "linux.subsystem", subsystem);
- dev->setBustype (subsystem);
+ dev->setBustype(QString::fromUtf8( subsystem ) );
type = dev->getBustype ();
if (type == BUS_PCI || type == BUS_PCMCIA) {
@@ -204,8 +204,8 @@
getHalProperty (parent_udi, "info.product", product);
}
- dev->setVendor (vendor);
- dev->setProduct (product);
+ dev->setVendor (vendor.isNull () ? i18n ("Unknown") : QString::fromUtf8 (vendor));
+ dev->setProduct (product.isNull() ? i18n ("Unknown") : QString::fromUtf8 (product));
return;
}
@@ -375,7 +375,7 @@
if (pcall) {
dbus_pending_call_set_notify (pcall, DeviceStoreDBus::updateNetworkCallback, cbData, NULL);
}
- dbus_message_unref( msg );
+ dbus_message_unref (msg);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5964/src/knetworkmanager-devicestore_dbus.h new/knetworkmanager-0.1r527269/src/knetworkmanager-devicestore_dbus.h
--- old/knetworkmanager-0.1r5964/src/knetworkmanager-devicestore_dbus.h 2006-03-29 16:44:14.000000000 +0200
+++ new/knetworkmanager-0.1r527269/src/knetworkmanager-devicestore_dbus.h 2006-03-30 21:32:25.000000000 +0200
@@ -42,7 +42,7 @@
static void activateNetwork (Network*, Device*);
static void setHalDeviceInfo (Device*);
- static void getHalProperty (const char*, const char*, QString&);
+ static void getHalProperty (const QCString&, const QCString&, QCString&);
static void updateActivationStage (const char*, NMActStage);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5964/src/knetworkmanager-encryption.cpp new/knetworkmanager-0.1r527269/src/knetworkmanager-encryption.cpp
--- old/knetworkmanager-0.1r5964/src/knetworkmanager-encryption.cpp 2006-03-29 16:44:14.000000000 +0200
+++ new/knetworkmanager-0.1r527269/src/knetworkmanager-encryption.cpp 2006-03-30 21:32:25.000000000 +0200
@@ -152,7 +152,7 @@
return false;
}
- status = nmu_security_serialize_wep_with_cipher (msg, _currentCipher, essid, _secret["password"], _method);
+ status = nmu_security_serialize_wep_with_cipher (msg, _currentCipher, essid.utf8(), _secret["password"].utf8(), _method);
return status;
}
@@ -294,7 +294,7 @@
if (!msg || !essid || !isValid( essid ) )
return false;
- status = nmu_security_serialize_wpa_psk_with_cipher (msg, _currentCipher, essid, _secret["password"], _version, IW_AUTH_KEY_MGMT_PSK);
+ status = nmu_security_serialize_wpa_psk_with_cipher (msg, _currentCipher, essid.utf8(), _secret["password"].utf8(), _version, IW_AUTH_KEY_MGMT_PSK);
return status;
}
@@ -440,8 +440,8 @@
kdDebug () << "method: " << _method << " identity: " << _identity << " password: " << _secret[IdPasswordKey] << " anon ident: " << _anonIdentity << " cert priv passwd: " << _secret[CertPrivatePasswordKey] << " cert priv: " << _certPrivate << " cert client: " << _certClient << " cert CA: " << _certCA << " version: " << _version << endl;
dbus_message_iter_init_append (msg, &iter);
- status = nmu_security_serialize_wpa_eap_with_cipher (&iter, _method, keyType, _identity, _secret[IdPasswordKey], _anonIdentity,
- _secret[CertPrivatePasswordKey], _certPrivate, _certClient, _certCA, _version);
+ status = nmu_security_serialize_wpa_eap_with_cipher (&iter, _method, keyType, _identity.utf8(), _secret[IdPasswordKey].utf8(), _anonIdentity.utf8(),
+ _secret[CertPrivatePasswordKey].utf8(), _certPrivate.utf8(), _certClient.utf8(), _certCA.utf8(), _version);
return status;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5964/src/knetworkmanager-network.cpp new/knetworkmanager-0.1r527269/src/knetworkmanager-network.cpp
--- old/knetworkmanager-0.1r5964/src/knetworkmanager-network.cpp 2006-03-29 16:44:14.000000000 +0200
+++ new/knetworkmanager-0.1r527269/src/knetworkmanager-network.cpp 2006-03-30 11:29:57.000000000 +0200
@@ -162,17 +162,23 @@
_encryption = encryption;
}
-QString
+QStringList
Network::getEncryptionProtocol () const
{
+ QStringList encryptionProtocol;
+
+ /* string freeze
+ if (_capabilities & NM_802_11_CAP_PROTO_NONE)
+ encryptionProtocol.append (i18n ("None"));
+ */
if (_capabilities & NM_802_11_CAP_PROTO_WEP)
- return "WEP";
- else if (_capabilities & NM_802_11_CAP_PROTO_WPA)
- return "WPA";
- else if (_capabilities & NM_802_11_CAP_PROTO_WPA2)
- return "WPA2";
- else
- return "unknown";
+ encryptionProtocol.append ("WEP");
+ if (_capabilities & NM_802_11_CAP_PROTO_WPA)
+ encryptionProtocol.append ("WPA");
+ if (_capabilities & NM_802_11_CAP_PROTO_WPA2)
+ encryptionProtocol.append ("WPA2");
+
+ return encryptionProtocol;
}
bool
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5964/src/knetworkmanager-network.h new/knetworkmanager-0.1r527269/src/knetworkmanager-network.h
--- old/knetworkmanager-0.1r5964/src/knetworkmanager-network.h 2006-03-29 16:44:14.000000000 +0200
+++ new/knetworkmanager-0.1r527269/src/knetworkmanager-network.h 2006-03-30 11:29:57.000000000 +0200
@@ -44,34 +44,34 @@
bool operator == (Network);
- void setObjectPath (const QString&);
- QString getObjectPath (void) const;
- void setEssid (const QString&);
- QString getEssid (void) const;
- void insertHardwareAddress (const QString&);
- void removeHardwareAddress (const QString&);
- QStringList getHardwareAddresses(void) const;
- void setHardwareAddresses (const QStringList&);
- void setStrength (int);
- int getStrength (void) const;
- void setFrequency (double);
- double getFrequency (void) const;
- void setRate (int);
- int getRate (void) const;
- void setMode (int);
- int getMode (void) const;
- void setCapabilities (int);
- int getCapabilities (void) const;
- void setActive (bool);
- bool isActive (void) const;
- QString getEncryptionProtocol (void) const;
- bool isEncrypted (void) const;
- QDateTime getTimestamp (void) const;
- void setTimestamp (const QDateTime &);
- bool isTrusted (void) const;
- void setTrusted (bool);
- bool isHidden (void) const;
- void setHidden (bool);
+ void setObjectPath (const QString&);
+ QString getObjectPath (void) const;
+ void setEssid (const QString&);
+ QString getEssid (void) const;
+ void insertHardwareAddress (const QString&);
+ void removeHardwareAddress (const QString&);
+ QStringList getHardwareAddresses (void) const;
+ void setHardwareAddresses (const QStringList&);
+ void setStrength (int);
+ int getStrength (void) const;
+ void setFrequency (double);
+ double getFrequency (void) const;
+ void setRate (int);
+ int getRate (void) const;
+ void setMode (int);
+ int getMode (void) const;
+ void setCapabilities (int);
+ int getCapabilities (void) const;
+ void setActive (bool);
+ bool isActive (void) const;
+ QStringList getEncryptionProtocol (void) const;
+ bool isEncrypted (void) const;
+ QDateTime getTimestamp (void) const;
+ void setTimestamp (const QDateTime &);
+ bool isTrusted (void) const;
+ void setTrusted (bool);
+ bool isHidden (void) const;
+ void setHidden (bool);
Encryption* getEncryption (void) const;
void setEncryption (Encryption*);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5964/src/knetworkmanager-nminfo_dbus.cpp new/knetworkmanager-0.1r527269/src/knetworkmanager-nminfo_dbus.cpp
--- old/knetworkmanager-0.1r5964/src/knetworkmanager-nminfo_dbus.cpp 2006-03-29 16:44:14.000000000 +0200
+++ new/knetworkmanager-0.1r527269/src/knetworkmanager-nminfo_dbus.cpp 2006-04-03 15:19:10.000000000 +0200
@@ -158,6 +158,11 @@
NetworkManagerInfo* nmi = _ctx->getNetworkManagerInfo ();
QStringList networks = nmi->getNetworks();
+ if (networks.count () == 0) {
+ reply = dbus_message_new_error (msg, NMI_DBUS_INTERFACE ".NoNetworks", NULL);
+ return reply;
+ }
+
reply = dbus_message_new_method_return (msg);
dbus_message_iter_init_append (reply, &iter);
dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING_AS_STRING, &iter_array);
@@ -186,8 +191,7 @@
DBusMessage* reply = 0;
// get the essid from the msg
char * essid;
- if (dbus_message_get_args (msg, NULL, DBUS_TYPE_STRING, &essid, DBUS_TYPE_INVALID))
- {
+ if (dbus_message_get_args (msg, NULL, DBUS_TYPE_STRING, &essid, DBUS_TYPE_INVALID)) {
kdDebug() << " returning properties for " << essid << endl;
bool networkAdded = false;
DBusConnection* con = _ctx->getDBus ()->getConnection ();
@@ -351,11 +355,15 @@
{
NetworkManagerInfo* nmi = _ctx->getNetworkManagerInfo ();
QStringList names = nmi->getVPNConnectionNames ();
- bool added = false;
DBusMessage* reply = NULL;
DBusMessageIter iter;
DBusMessageIter iter_array;
+ if (names.count () == 0) {
+ reply = dbus_message_new_error (msg, NM_DBUS_NO_VPN_CONNECTIONS, "No VPN connections stored.");
+ return reply;
+ }
+
reply = dbus_message_new_method_return (msg);
dbus_message_iter_init_append (reply, &iter);
dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING_AS_STRING, &iter_array);
@@ -363,15 +371,9 @@
const char* name = strdup ((*i).utf8 ());
dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_STRING, &name);
kdDebug () << "returning vpn connection " << name << endl;
- added = true;
}
dbus_message_iter_close_container (&iter, &iter_array);
- if (!added) {
- dbus_message_unref (reply);
- reply = dbus_message_new_error (msg, NM_DBUS_NO_VPN_CONNECTIONS, "No VPN connections stored.");
- }
-
return reply;
}
@@ -414,7 +416,6 @@
dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &user);
out:
-
return reply;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5964/src/knetworkmanager-tray.cpp new/knetworkmanager-0.1r527269/src/knetworkmanager-tray.cpp
--- old/knetworkmanager-0.1r5964/src/knetworkmanager-tray.cpp 2006-03-29 16:44:14.000000000 +0200
+++ new/knetworkmanager-0.1r527269/src/knetworkmanager-tray.cpp 2006-04-03 17:34:04.000000000 +0200
@@ -47,7 +47,7 @@
#include "knetworkmanager-ui-networklistview.h"
#include "knetworkmanager-storage.h"
-Subhead::Subhead (QWidget* parent, const char* name, const char* caption, const QPixmap icon)
+Subhead::Subhead (QWidget* parent, const char* name, const QString & caption, const QPixmap icon)
: QWidget (parent, name)
{
QBoxLayout* l = new QHBoxLayout (this);
@@ -200,7 +200,7 @@
Tray::connectHiddenNetwork ()
{
NewWirelessNetworkDialog* dlg;
- dlg = new NewWirelessNetworkDialog (this, i18n("Connect to Wireless Network"), false, 0, _ctx);
+ dlg = new NewWirelessNetworkDialog (this, "connecthiddennetworkdialog", false, 0, _ctx);
dlg->show ();
}
@@ -318,6 +318,8 @@
QString tooltip;
if (dev) {
+ int speed = dev->getSpeed ();
+
tooltip = dev->getVendor () + " " + dev->getProduct () + "\n";
tooltip += i18n ("Device: ") + dev->getInterface () + "\n";
tooltip += i18n ("IP: ") + dev->getIPv4Address () + "\n";
@@ -326,13 +328,18 @@
tooltip += i18n ("Broadcast: ") + dev->getBroadcast () + "\n";
tooltip += i18n ("Active: ") + (dev->isActive () ? i18n ("yes") : i18n ("no")) + "\n";
tooltip += i18n ("Carrier detect: ") + (dev->hasCarrierDetect () ? i18n ("supported") : i18n ("not supported")) + "\n";
- tooltip += i18n ("Bandwidth: " ) + QString ("%1").arg (dev->getSpeed ()) + " Mb/s ";
+ if (speed)
+ tooltip += i18n ("Bandwidth: " )+ QString ("%1").arg (speed) + " Mb/s ";
} else if (net) {
DeviceStore* store = _ctx->getDeviceStore ();
bool isEncrypted = net->isEncrypted ();
dev = store->getDevice (net);
if (dev) {
+ int signalStrength = net->getStrength () ? net->getStrength () : dev->getStrength ();
+ int speed = net->getRate () / 1024;
+ double frequency = net->getFrequency ();
+
tooltip = dev->getVendor () + " " + dev->getProduct () + "\n";
tooltip += i18n ("Device: ") + dev->getInterface () + "\n";
tooltip += i18n ("IP: ") + dev->getIPv4Address () + "\n";
@@ -342,15 +349,28 @@
tooltip += i18n ("Network: ") + net->getEssid () + "\n";
tooltip += i18n ("Hidden: ") + QString ("%1").arg (net->isHidden () ? i18n ("yes") : i18n ("no")) + "\n";
tooltip += i18n ("Access point: ") + net->getHardwareAddresses ().join(", ") + "\n";
- tooltip += i18n ("Bandwidth: ") + QString ("%1").arg (net->getRate () / 1024) + QString (" Mb/s") + "\n";
- tooltip += i18n ("Signal strength: ") + QString ("%1").arg (net->getStrength ()) + "\n";
- tooltip += i18n ("Frequency: ") + QString ("%1").arg (net->getFrequency () / 1000000000, 0, 'f', 3) + " GHz" + "\n";
- tooltip += i18n ("Encrypted: ") + QString ("%1").arg (isEncrypted ? i18n("yes") : i18n("no")) + "\n";
+ tooltip += i18n ("Bandwidth: ");
+ if (speed)
+ tooltip += QString ("%1").arg (speed) + QString (" Mb/s") + "\n";
+ else
+ tooltip += i18n ("Unknown") + "\n";
+ tooltip += i18n ("Signal strength: ") + QString ("%1").arg (signalStrength) + "\n";
+ tooltip += i18n ("Frequency: ");
+ if (frequency)
+
+ tooltip += QString ("%1").arg (frequency / 1000000000, 0, 'f', 3) + " GHz" + "\n";
+ else
+ tooltip += i18n ("Unknown") + "\n";
+ tooltip += i18n ("Encrypted: ") + QString ("%1").arg (isEncrypted ? i18n ("yes") : i18n ("no")) + "\n";
if (isEncrypted) {
- tooltip += i18n ("Encryption protocol: ") + net->getEncryptionProtocol () + "\n";
+ QStringList encryptionProtocol = net->getEncryptionProtocol ();
+ tooltip += i18n ("Encryption protocol: ");
+ for (QStringList::Iterator it = encryptionProtocol.begin (); it != encryptionProtocol.end (); ++it)
+ tooltip += (*it) + " ";
+ tooltip += "\n";
}
- tooltip += i18n("Device active: ") + QString ("%1").arg (dev->isActive () ? i18n("yes") : i18n("no")) + "\n";
- tooltip += i18n("Network active: ") + QString ("%1").arg (net->isActive () ? i18n("yes") : i18n("no"));
+ tooltip += i18n ("Device active: ") + QString ("%1").arg (dev->isActive () ? i18n ("yes") : i18n ("no")) + "\n";
+ tooltip += i18n ("Network active: ") + QString ("%1").arg (net->isActive () ? i18n ("yes") : i18n ("no"));
}
}
@@ -472,11 +492,7 @@
int id;
QString item = QString::null;
- if (dialup->isActive () == false) {
- item = i18n ("Connect to ");
- } else {
- item = i18n ("Hang up ");
- }
+ item = dialup->isActive () ? i18n ("Hang up ") : i18n ("Connect to ");
item += dialup->getName ();
id = _dialUpMenu->insertItem (SmallIcon ("modem", QIconSet::Automatic), item, -1, -1);
@@ -497,13 +513,10 @@
return;
}
- wirelessNetworkItem = new WirelessNetworkItem (contextMenu (), net->getEssid (), (net->isActive () && dev->isActive ()), net->getStrength (), net->isEncrypted ());
+ wirelessNetworkItem = new WirelessNetworkItem (contextMenu (), net->getEssid (), (net->isActive () && dev->isActive ()), net->getStrength () ? net->getStrength () : dev->getStrength (), net->isEncrypted ());
id = contextMenu ()->insertItem (wirelessNetworkItem, -1, -1);
- if (online && net->isActive () && dev->isActive ()) {
- contextMenu ()->setItemChecked (id, true);
- } else {
- contextMenu ()->setItemChecked (id, false);
- }
+
+ contextMenu ()->setItemChecked (id, online && net->isActive () && dev->isActive ());
_networkMap[id] = net;
}
@@ -517,11 +530,8 @@
id = contextMenu ()->insertItem (descr, -1, -1);
- if (online && dev->isActive ()) {
- contextMenu ()->setItemChecked (id, true);
- } else {
- contextMenu ()->setItemChecked (id, false);
- }
+ contextMenu ()->setItemChecked (id, online && dev->isActive ());
+ contextMenu ()->setItemEnabled (id, dev->getLinkActive ());
_deviceMap[id] = dev;
}
@@ -544,9 +554,9 @@
}
void
-Tray::addSubheading (KPopupMenu* menu, QWidget* parent, const char* caption, const QPixmap icon)
+Tray::addSubheading (KPopupMenu* menu, QWidget* parent, const QString & caption, const QPixmap icon)
{
- Subhead* subhead = new Subhead (parent, QString::null, caption, icon);
+ Subhead* subhead = new Subhead (parent, "subhead", caption, icon);
menu->insertItem (subhead, -1, -1);
}
@@ -611,7 +621,7 @@
} else {
for (i = deviceList.begin (); i != deviceList.end (); ++i) {
if ((*i)->isWired ()){
- descr = (*i)->getVendor () + " " + (*i)->getProduct ();
+ descr = (*i)->getVendor () + " " + (*i)->getProduct () + " (" + (*i)->getInterface () + ")";
addWiredDevice (*i, descr);
}
}
@@ -628,12 +638,7 @@
/* only show vendor and product if system has more than one wireless device */
if (stat->wirelessDevices > 1) {
QString caption;
- caption += (*i)->getVendor ();
- caption += (*i)->getProduct ();
-
- if (caption.length () == 0)
- caption += (*i)->getInterface ();
-
+ caption += (*i)->getVendor () + " " + (*i)->getProduct () + " (" + (*i)->getInterface () + ")";
addSubheading (menu, this, caption, NULL);
}
addWirelessNetworks (*i);
@@ -865,7 +870,7 @@
int strength;
Network* net = _ctx->getDeviceStore()->getActiveNetwork (dev);
if (net)
- strength = net->getStrength ();
+ strength = net->getStrength () ? net->getStrength () : dev->getStrength ();
else
strength = dev->getStrength ();
if ( strength > 80 )
@@ -1014,10 +1019,10 @@
_tooltip = QString::null;
setPixmap (loadIcon ("knm-logo"));
- _vpnMenu = new KPopupMenu (this->contextMenu (), i18n ("VPN Connections"));
- _dialUpMenu = new KPopupMenu (this->contextMenu (), i18n ("Dial-Up Connections"));
- _optionsMenu = new KPopupMenu (this->contextMenu (), i18n ("Options"));
- _helpMenu = new KPopupMenu (this->contextMenu (), i18n ("Help"));
+ _vpnMenu = new KPopupMenu (this->contextMenu (), "vpnconnmenu" );
+ _dialUpMenu = new KPopupMenu (this->contextMenu (), "dialupconnmenu" );
+ _optionsMenu = new KPopupMenu (this->contextMenu (), "optionsmenu" );
+ _helpMenu = new KPopupMenu (this->contextMenu (), "helpmenu" );
_vpnMenu->setCheckable (true);
_optionsMenu->setCheckable (false);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5964/src/knetworkmanager-tray.h new/knetworkmanager-0.1r527269/src/knetworkmanager-tray.h
--- old/knetworkmanager-0.1r5964/src/knetworkmanager-tray.h 2006-03-29 16:44:14.000000000 +0200
+++ new/knetworkmanager-0.1r527269/src/knetworkmanager-tray.h 2006-03-30 21:32:25.000000000 +0200
@@ -96,7 +96,7 @@
class Subhead : public QWidget
{
public:
- Subhead (QWidget*, const char *, const char*, const QPixmap);
+ Subhead (QWidget*, const char *, const QString &, const QPixmap);
~Subhead ();
};
@@ -157,7 +157,7 @@
void vpnItemActivated (int);
void dialUpItemActivated (int);
void addWirelessNetworks (Device*);
- void addSubheading (KPopupMenu*, QWidget*, const char*, const QPixmap);
+ void addSubheading (KPopupMenu*, QWidget*, const QString &, const QPixmap);
void contextMenuAboutToShow (KPopupMenu*);
void showNetworksDialog();
void slotStateChanged();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5964/src/knetworkmanager-vpn.cpp new/knetworkmanager-0.1r527269/src/knetworkmanager-vpn.cpp
--- old/knetworkmanager-0.1r5964/src/knetworkmanager-vpn.cpp 2006-03-29 16:44:14.000000000 +0200
+++ new/knetworkmanager-0.1r527269/src/knetworkmanager-vpn.cpp 2006-03-31 15:36:01.000000000 +0200
@@ -26,6 +26,7 @@
#define GCONF_PRE "/.gconf"
#define VPN_PATH "/system/networking/vpn_connections"
+#include
#include
#include
@@ -249,7 +250,7 @@
{
KProcess* configureVPNHelper = new KProcess ();
- *configureVPNHelper << "/usr/bin/nm-vpn-properties";
+ *configureVPNHelper << "nm-vpn-properties";
connect (configureVPNHelper, SIGNAL (processExited (KProcess*)),
this, SLOT (configureVPNExited (KProcess*)));
@@ -333,7 +334,8 @@
kconfig->setGroup ("VPN Connection");
if (kconfig->readEntry ("service", QString::null) == vpnConnection->getServiceName ()) {
kconfig->setGroup ("GNOME");
- if (QString helper = kconfig->readEntry ("auth-dialog", QString::null)) {
+ QString helper = kconfig->readEntry ("auth-dialog", QString::null);
+ if ( !helper.isEmpty() ) {
vpnConnection->setAuthHelper (helper);
} else {
printf ("Warning: No authentication helper for service \"%s\" found.\n", vpnConnection->getServiceName ().ascii ());
@@ -366,7 +368,7 @@
for (QStringList::Iterator it = env.begin (); it != env.end (); ++it) {
QString* item = &(*it);
if (item->startsWith ("GNOME_KEYRING_SOCKET")) {
- setenv ("GNOME_KEYRING_SOCKET", item->section ('=', 1, 1), 1);
+ setenv ("GNOME_KEYRING_SOCKET", item->section ('=', 1, 1).ascii(), 1);
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5964/src/knetworkmanager-vpn_dbus.cpp new/knetworkmanager-0.1r527269/src/knetworkmanager-vpn_dbus.cpp
--- old/knetworkmanager-0.1r5964/src/knetworkmanager-vpn_dbus.cpp 2006-03-29 16:44:14.000000000 +0200
+++ new/knetworkmanager-0.1r527269/src/knetworkmanager-vpn_dbus.cpp 2006-04-03 15:19:10.000000000 +0200
@@ -105,7 +105,7 @@
if (pcall) {
dbus_pending_call_set_notify (pcall, VPNDBus::updateVPNConnectionCallback, NULL, NULL);
}
- dbus_message_unref( msg );
+ dbus_message_unref (msg);
}
return;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/knetworkmanager-0.1r5964/src/main.cpp new/knetworkmanager-0.1r527269/src/main.cpp
--- old/knetworkmanager-0.1r5964/src/main.cpp 2006-03-29 16:44:14.000000000 +0200
+++ new/knetworkmanager-0.1r527269/src/main.cpp 2006-03-29 17:21:40.000000000 +0200
@@ -35,7 +35,7 @@
static const char* knm_descr = I18N_NOOP("A NetworkManager front-end for KDE");
static const char* knm_copy = I18N_NOOP("Copyright (C) 2005, 2006 Novell, Inc.");
static const char* knm_webpage = I18N_NOOP("http://www.novell.com/linux");
-static const char* knm_bugaddr = I18N_NOOP("http://bugzilla.novell.com");
+static const char* knm_bugaddr = I18N_NOOP("http://bugs.kde.org");
extern "C" KDE_EXPORT int
kdemain (int argc, char* argv[])
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...