rpms/kde-plasma-networkmanagement/F-13 networkmanagement-0.9-disable_kded.patch, NONE, 1.1 networkmanagement-kdebug238325.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 kde-plasma-networkmanagement.spec, 1.39, 1.40 sources, 1.21, 1.22

Rex Dieter rdieter at fedoraproject.org
Fri Jun 11 16:10:05 UTC 2010 

Author: rdieter

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19110

Modified Files:
	.cvsignore kde-plasma-networkmanagement.spec sources 
Added Files:
	networkmanagement-0.9-disable_kded.patch 
	networkmanagement-kdebug238325.patch 
Log Message:
* Thu Jun 03 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.20.20100603
- 20100603 snapshot
- Add "Enable networking" button to knetworkmanager (rh#598765,kde#238325)


networkmanagement-0.9-disable_kded.patch:
 networkmanagement.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE networkmanagement-0.9-disable_kded.patch ---
diff -up networkmanagement-0.9/kded/networkmanagement.desktop.disable_kded networkmanagement-0.9/kded/networkmanagement.desktop
--- networkmanagement-0.9/kded/networkmanagement.desktop.disable_kded	2010-06-03 10:56:20.000000000 -0500
+++ networkmanagement-0.9/kded/networkmanagement.desktop	2010-06-08 13:56:39.092896564 -0500
@@ -36,6 +36,6 @@ X-KDE-ServiceTypes=KDEDModule
 X-KDE-ModuleType=Library
 X-KDE-Library=networkmanagement
 X-KDE-DBus-ModuleName=networkmanagement
-X-KDE-Kded-autoload=true
+X-KDE-Kded-autoload=false
 X-KDE-Kded-load-on-demand=true
 OnlyShowIn=KDE;

networkmanagement-kdebug238325.patch:
 applet/nmpopup.cpp                     |    8 ++++++++
 applet/nmpopup.h                       |    2 ++
 monolithic/knetworkmanagertrayicon.cpp |   31 ++++++++++++++++++++++++++++++-
 monolithic/knetworkmanagertrayicon.h   |   10 ++++++++++
 4 files changed, 50 insertions(+), 1 deletion(-)

--- NEW FILE networkmanagement-kdebug238325.patch ---
Index: applet/nmpopup.h
===================================================================
--- applet/nmpopup.h	(revision 1128863)
+++ applet/nmpopup.h	(working copy)
@@ -30,6 +30,7 @@
 #include <Plasma/PushButton>
 #include <Plasma/TabBar>
 
+#include <solid/networking.h>
 #include <solid/control/networkinterface.h>
 
 #include "activatable.h"
@@ -65,6 +66,7 @@
     void managerWirelessHardwareEnabledChanged(bool);
     void wirelessEnabledToggled(bool checked);
     void networkingEnabledToggled(bool checked);
+    void managerNetworkingEnabledChanged(bool);
     void manageConnections();
     void showMore();
     void showMore(bool);
Index: applet/nmpopup.cpp
===================================================================
--- applet/nmpopup.cpp	(revision 1128863)
+++ applet/nmpopup.cpp	(working copy)
@@ -118,6 +118,8 @@
     m_leftLayout->addItem(m_networkingCheckBox);
     connect(m_networkingCheckBox, SIGNAL(toggled(bool)),
             this, SLOT(networkingEnabledToggled(bool)));
+    connect(Solid::Control::NetworkManager::notifier(), SIGNAL(networkingEnabledChanged(bool)),
+            this, SLOT(managerNetworkingEnabledChanged(bool)));
 
     // flight-mode checkbox
     m_rfCheckBox = new Plasma::CheckBox(m_leftWidget);
@@ -384,6 +386,12 @@
     m_rfCheckBox->setEnabled(!enabled);
 }
 
+void NMPopup::managerNetworkingEnabledChanged(bool enabled)
+{
+    kDebug() << "NM daemon changed networking enable state" << enabled;
+    m_networkingCheckBox->setChecked(Solid::Control::NetworkManager::isNetworkingEnabled());
+}
+
 void NMPopup::showMore()
 {
     showMore(m_showMoreButton->isChecked());
Index: monolithic/knetworkmanagertrayicon.h
===================================================================
--- monolithic/knetworkmanagertrayicon.h	(revision 1128863)
+++ monolithic/knetworkmanagertrayicon.h	(working copy)
@@ -91,6 +91,11 @@
     void networkingStatusChanged(Solid::Networking::Status);
 
     /**
+     * Enable networking in response to user action
+     */
+    void enableNetworking(bool);
+
+    /**
      * Enable wireless in response to user action
      */
     void enableWireless(bool);
@@ -101,6 +106,11 @@
     void wirelessEnabledChanged();
 
     /**
+     * Update UI in response to system network management networkong state changes
+     */
+    void networkingEnabledChanged();
+
+    /**
      * Starts monitoring new network interfaces' state changes
      */
     void networkInterfaceAdded(const QString&);
Index: monolithic/knetworkmanagertrayicon.cpp
===================================================================
--- monolithic/knetworkmanagertrayicon.cpp	(revision 1128863)
+++ monolithic/knetworkmanagertrayicon.cpp	(working copy)
@@ -66,6 +66,7 @@
     KNetworkManagerTrayIconPrivate()
         : list(0),
         iconName(QLatin1String("networkmanager")),
+        networkingEnableAction(0),
         flightModeAction(0),
         prefsAction(0),
         copyIpAddrAction(0),
@@ -77,6 +78,7 @@
     QHash<Knm::Activatable *, QWidgetAction *> actions;
     QStringList deviceUnis;
     QString iconName;
+    KAction * networkingEnableAction;
     KAction * flightModeAction;
     KAction * prefsAction;
     KAction * copyIpAddrAction;
@@ -112,6 +114,13 @@
     setAssociatedWidget(contextMenu());
     setStatus( (!d->active || Solid::Control::NetworkManager::status() == Solid::Networking::Unknown )? PARENT_ICON_CLASS::Passive : PARENT_ICON_CLASS::Active);
 
+    d->networkingEnableAction = new KAction(i18nc("@action:inmenu turns off networking", "Enable networking"), this);
+    d->networkingEnableAction->setCheckable(true);
+    d->networkingEnableAction->setChecked(Solid::Control::NetworkManager::isNetworkingEnabled());
+    connect(d->networkingEnableAction, SIGNAL(toggled(bool)), this, SLOT(enableNetworking(bool)));
+    connect(Solid::Control::NetworkManager::notifier(), SIGNAL(networkingEnabledChanged(bool)),
+            this, SLOT(networkingEnabledChanged()));
+
     if (types.testFlag(Solid::Control::NetworkInterface::Ieee80211)) {
         d->flightModeAction = new KAction(i18nc("@action:inmenu turns off wireless networking", "Enable wireless"), this);
         d->flightModeAction->setCheckable(true);
@@ -202,7 +211,7 @@
         }
     }
 
-    // if not active, add a warning notice and stop
+    // if not active, add a warning notice, show Networking and Wireless check buttons and stop
     if (Solid::Control::NetworkManager::status() == Solid::Networking::Unknown) {
         QString passiveText = i18nc("@action:inmenu Disable action text used when the NetworkManager daemon is not running", "Network Management disabled");
         QString passiveTooltip = i18nc("@info:tooltip NetworkManager is not running, this client cannot do anything", "The system Network Management service is not running");
@@ -211,6 +220,12 @@
         passiveAction->setToolTip(passiveTooltip);
         passiveAction->setEnabled(false);
         contextMenu()->addAction(passiveAction);
+
+        // show "Enable" check buttons
+        contextMenu()->addAction(d->networkingEnableAction);
+        if (!wirelessDeviceUnis.isEmpty() /*TODO Bluetooth too */ && d->interfaceTypes.testFlag(Solid::Control::NetworkInterface::Ieee80211)) {
+            contextMenu()->addAction(d->flightModeAction);
+        }
         return;
     }
 
@@ -311,9 +326,11 @@
     // add the housekeeping actions
     contextMenu()->addSeparator();
 
+    contextMenu()->addAction(d->networkingEnableAction);
     if (!wirelessDeviceUnis.isEmpty() /*TODO Bluetooth too */ && d->interfaceTypes.testFlag(Solid::Control::NetworkInterface::Ieee80211)) {
         contextMenu()->addAction(d->flightModeAction);
     }
+    contextMenu()->addSeparator();
     contextMenu()->addAction(d->prefsAction);
 }
 
@@ -533,6 +550,12 @@
     }
 }
 
+void KNetworkManagerTrayIcon::enableNetworking(bool enabled)
+{
+    kDebug() << enabled;
+    Solid::Control::NetworkManager::setNetworkingEnabled(enabled);
+}
+
 void KNetworkManagerTrayIcon::enableWireless(bool enabled)
 {
     kDebug() << enabled;
@@ -550,6 +573,12 @@
     }
 }
 
+void KNetworkManagerTrayIcon::networkingEnabledChanged()
+{
+    Q_D(KNetworkManagerTrayIcon);
+    d->networkingEnableAction->setChecked(Solid::Control::NetworkManager::isNetworkingEnabled());
+}
+
 void KNetworkManagerTrayIcon::setActive(bool active)
 {
     Q_D(KNetworkManagerTrayIcon);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-13/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	19 Apr 2010 15:01:57 -0000	1.8
+++ .cvsignore	11 Jun 2010 16:10:05 -0000	1.9
@@ -1 +1 @@
-networkmanagement-0.9-20100419.tar.bz2
+networkmanagement-0.9-20100603.tar.bz2


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-13/kde-plasma-networkmanagement.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- kde-plasma-networkmanagement.spec	19 Apr 2010 15:01:57 -0000	1.39
+++ kde-plasma-networkmanagement.spec	11 Jun 2010 16:10:05 -0000	1.40
@@ -3,12 +3,12 @@
 %define plasma_applet 1
 %define monolithic 1
 
-%define snap 20100419
+%define snap 20100603
 
 Name:           kde-plasma-networkmanagement
 Epoch:          1
 Version:        0.9
-Release:        0.19.%{snap}%{?dist}
+Release:        0.20.%{snap}%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -16,15 +16,23 @@ License:        (GPLv2 or GPLv3) and GPL
 URL:            http://en.opensuse.org/KNetworkManager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# adds to NM_* cmake build options used below.  Mostly for testing purposes.
-Patch1: networkmanagement-0.9-build_options.patch
-
 # The source for this package was pulled from upstream's Subversion repository
 # using the create_tarball.rb script from kdesdk trunk:
 # ./create_tarball.rb -n -a networkmanagement
 # Please always use create_tarball.rb so translations get included.
 Source0:        networkmanagement-%{version}-%{snap}.tar.bz2
 
+# adds to NM_* cmake build options used below.  Mostly for testing purposes.
+Patch1: networkmanagement-0.9-build_options.patch
+
+# Disable kded module by default, as was versions initially shipped in < f14
+Patch2: networkmanagement-0.9-disable_kded.patch
+
+## upstreamable patches
+# Adding "Enable networking" button to knetworkmanager
+# https://bugs.kde.org/238325
+Patch50: networkmanagement-kdebug238325.patch
+
 BuildRequires:  kdelibs4-devel
 BuildRequires:  kdebase-workspace-devel
 BuildRequires:  NetworkManager-glib-devel >= 0.7.0
@@ -40,8 +48,8 @@ Obsoletes: kde-plasma-networkmanagement-
 
 Requires: knetworkmanager-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-# FIXME/TODO: only want one of knetworkmanager or kde-plasma-networkmanagement installed
-#Conflicts: knetworkmanager
+# only want one of knetworkmanager-autostart or kde-plasma-networkmanagement installed
+#Conflicts: knetworkmanager-autostart
 
 %description
 A Plasma applet to control your wired and wireless network(s) in KDE 4 using
@@ -51,17 +59,35 @@ This Plasma applet is beta software with
 testing purposes only.  We recommend using knetworkmanager (the system tray
 version) for production use.
 
+%package -n kde-plasma-networkmanagement-autostart
+Summary: autostart support for kde-plasma-networkmanagement 
+Group: Applications/Internet
+Requires: kde-plasma-networkmanagement = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: kde-plasma-networkmanagement < 1:0.9-0.20
+# only want one of knetworkmanager or kde-plasma-networkmanagement installed
+#Conflicts: knetworkmanager
+%description -n kde-plasma-networkmanagement-autostart
+%{summary}.
+
 %package -n knetworkmanager
 Summary: NetworkManager KDE 4 integration
 Group: Applications/Internet
 Requires: knetworkmanager-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: knetworkmanager4 < %{?epoch:%{epoch}:}%{version}-%{release}
-# FIXME/TODO: only want one of knetworkmanager or kde-plasma-networkmanagement installed
-#Conflicts: kde-plasma-networkmanagement
 %description -n knetworkmanager
 KNetworkManager is a system tray applet for controlling network
 connections on systems that use the NetworkManager daemon.
 
+%package -n knetworkmanager-autostart
+Summary: autostart support for knetworkmanager 
+Group: Applications/Internet
+Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: knetworkmanager < 1:0.9-0.20 
+# only want one of knetworkmanager or kde-plasma-networkmanagement installed
+Conflicts: kde-plasma-networkmanagement
+%description -n knetworkmanager-autostart
+%{summary}.
+
 %package -n knetworkmanager-libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
@@ -119,6 +145,10 @@ Obsoletes:      knetworkmanager4-vpnc < 
 %setup -q -n networkmanagement-%{version}
 
 %patch1 -p1 -b .build_options
+%if 0%{?fedora} && 0%{?fedora} < 14
+%patch2 -p1 -b .disable_kded
+%endif
+%patch50 -p0 -b .kdebug238325
 
 
 %build
@@ -127,7 +157,7 @@ pushd %{_target_platform}
 %{cmake_kde4} \
   -DDBUS_SYSTEM_POLICY_DIR=%{_sysconfdir}/dbus-1/system.d \
   %{?plasma_applet:-DNM_PLASMA_APPLET=BOOL:ON} \
-  %{?monolithic:-DNM_MONOLITHIC=BOOL:ON} \
+  %{?monolithic:-DNM_MONOLITHIC=BOOL:ON -DINSTALL_KNM_AUTOSTART=BOOL:ON} \
   ..
 popd
 
@@ -184,10 +214,13 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %files -f plasma_applet_networkmanagement.lang
 %defattr(-,root,root,-)
 %if 0%{?plasma_applet}
-%{_kde4_appsdir}/desktoptheme/default/widgets/wireless.svgz
+%{_kde4_appsdir}/desktoptheme/default/icons/*
 %{_kde4_datadir}/kde4/services/plasma-applet-networkmanagement.desktop
 %{_kde4_datadir}/kde4/services/kded/networkmanagement.desktop
 %{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so
+#files autostart
+#defattr(-,root,root,-)
+%{_kde4_datadir}/kde4/services/kded/networkmanagement.desktop
 %{_kde4_libdir}/kde4/kded_networkmanagement.so
 %endif
 
@@ -195,11 +228,12 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %defattr(-,root,root,-)
 %if 0%{?monolithic}
 %{_kde4_bindir}/knetworkmanager
-%{_kde4_datadir}/autostart/kde4-knetworkmanager-autostart.desktop
 %{_kde4_datadir}/applications/kde4/knetworkmanager.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
-%endif
+#files -n knetworkmanager-autostart
+#defattr(-,root,root,-)
+%{_kde4_datadir}/autostart/kde4-knetworkmanager-autostart.desktop
 
 %files -n knetworkmanager-libs -f libknetworkmanager.lang
 %defattr(-,root,root,-)
@@ -239,9 +273,14 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/networkmanagement_pptpui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_pptpui.desktop
+%endif
 
 
 %changelog
+* Thu Jun 03 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.20.20100603
+- 20100603 snapshot
+- Add "Enable networking" button to knetworkmanager (rh#598765,kde#238325)
+
 * Mon Apr 19 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.19.20100419
 - 20100419 snapshot
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-13/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	19 Apr 2010 15:01:57 -0000	1.21
+++ sources	11 Jun 2010 16:10:05 -0000	1.22
@@ -1 +1 @@
-756972829c69247e01adcb9669c9be50  networkmanagement-0.9-20100419.tar.bz2
+3f8ec1c26de7689adbc7eb0c5e0cf252  networkmanagement-0.9-20100603.tar.bz2

More information about the scm-commits mailing list