Mailinglist Archive: opensuse-commit (1082 mails)

< Previous Next >
commit NetworkManager-kde
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 07 May 2007 14:41:18 +0200
  • Message-id: <20070507124119.4BCCC678168@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package NetworkManager-kde
checked in at Mon May 7 14:41:18 CEST 2007.

--------
--- KDE/NetworkManager-kde/NetworkManager-kde.changes   2007-04-11 16:02:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/NetworkManager-kde/NetworkManager-kde.changes  2007-05-07 13:38:04.376181000 +0200
@@ -1,0 +2,6 @@
+Mon May  7 13:22:13 CEST 2007 - hschaa@xxxxxxx
+
+- add patch knetworkmanager-newnetwork_crash-hschaa-01.patch
+  (fixes b.n.c #269253)
+
+-------------------------------------------------------------------

New:
----
  knetworkmanager-newnetwork_crash-hschaa-01.patch

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

Other differences:
------------------
++++++ NetworkManager-kde.spec ++++++
--- /var/tmp/diff_new_pack.xE3732/_old  2007-05-07 14:40:32.000000000 +0200
+++ /var/tmp/diff_new_pack.xE3732/_new  2007-05-07 14:40:32.000000000 +0200
@@ -20,7 +20,7 @@
 Group:          System/GUI/KDE
 Autoreqprov:    on
 Version:        0.1r646731
-Release:        8
+Release:        16
 Summary:        KNetworkManager application for use with NetworkManager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       NetworkManager
@@ -31,6 +31,7 @@
 Patch1:         knetworkmanager-fallback-thoenig-03.patch
 Patch2:         fix-desktop-icon.diff
 Patch3:         knetworkmanager-wpaeap_storage-hschaa-01.patch
+Patch4:         knetworkmanager-newnetwork_crash-hschaa-01.patch
 
 %description
 KNetworkManager is a system tray applet for controlling network
@@ -100,6 +101,7 @@
 %patch1 -p0
 %patch2
 %patch3
+%patch4
 
 %build
 . /etc/opt/kde3/common_options
@@ -163,6 +165,9 @@
 /opt/kde3/share/services/%{appname}_vpnc.desktop
 
 %changelog
+* Mon May 07 2007 - hschaa@xxxxxxx
+- add patch knetworkmanager-newnetwork_crash-hschaa-01.patch
+  (fixes b.n.c #269253)
 * Wed Apr 11 2007 - hschaa@xxxxxxx
 - Use the right source file (instead of the wrong one which was
   checked in on Apr 4)


++++++ knetworkmanager-newnetwork_crash-hschaa-01.patch ++++++
--- knetworkmanager/src/knetworkmanager-dialogfab.cpp
+++ knetworkmanager/src/knetworkmanager-dialogfab.cpp
@@ -233,6 +233,7 @@
 void
 NewWirelessNetworkDialog::slotOk()
 {
+       bool new_network = true;
        updateModel();
 
        /*
@@ -249,11 +250,20 @@
                        // next steps should take our list network
                        delete _net;
                        _net = (*it);
+                       // the network is known -> not new
+                       new_network = false;
                        break;
                }
        }
 
-       _dev->setPendingNetwork (_net);
+       /*
+         If the network is already in our list do not set is as pending!
+         Instead clear the current pending network because this is no more pending.
+       */
+       if (new_network)
+               _dev->setPendingNetwork (_net);
+       else
+               _dev->clearPendingNetwork ();
 
        emit activateNetwork (_net, _dev);
 

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



Remember to have fun...

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

< Previous Next >
This Thread