Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit NetworkManager-kde
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 03 Aug 2007 21:25:33 +0200
  • Message-id: <20070803192534.2A93D678331@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package NetworkManager-kde
checked in at Fri Aug 3 21:25:33 CEST 2007.

--------
--- KDE/NetworkManager-kde/NetworkManager-kde.changes   2007-07-02 14:19:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/NetworkManager-kde/NetworkManager-kde.changes  2007-08-03 11:43:01.085856000 +0200
@@ -1,0 +2,6 @@
+Fri Aug  3 11:43:07 CEST 2007 - hschaa@xxxxxxx
+
+- add patch knetworkmanager-fixnetworksui-hschaa-01.patch
+  (fixes b.n.c #293449)
+
+-------------------------------------------------------------------

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

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

Other differences:
------------------
++++++ NetworkManager-kde.spec ++++++
--- /var/tmp/diff_new_pack.u28265/_old  2007-08-03 21:25:09.000000000 +0200
+++ /var/tmp/diff_new_pack.u28265/_new  2007-08-03 21:25:09.000000000 +0200
@@ -20,7 +20,7 @@
 Group:          System/GUI/KDE
 Autoreqprov:    on
 Version:        0.2r674918
-Release:        3
+Release:        17
 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-version-hschaa-01.patch
+Patch4:         knetworkmanager-fixnetworksui-hschaa-01.patch
 
 %description
 KNetworkManager is a system tray applet for controlling network
@@ -100,6 +101,7 @@
 %patch2
 %patch0
 %patch3
+%patch4
 
 %build
 . /etc/opt/kde3/common_options
@@ -163,6 +165,9 @@
 /opt/kde3/share/services/%{appname}_vpnc.desktop
 
 %changelog
+* Fri Aug 03 2007 - hschaa@xxxxxxx
+- add patch knetworkmanager-fixnetworksui-hschaa-01.patch
+  (fixes b.n.c #293449)
 * Mon Jul 02 2007 - hschaa@xxxxxxx
 - add patch knetworkmanager-version-hschaa-01.patch which
   fixes broken autoconnecting on kde start

++++++ knetworkmanager.default.sh ++++++
--- KDE/NetworkManager-kde/knetworkmanager.default.sh   2007-07-02 14:19:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/NetworkManager-kde/knetworkmanager.default.sh  2007-08-03 12:14:51.136731000 +0200
@@ -1,13 +1,15 @@
+kdehome=$HOME/.kde
+test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
 
 knetworkmanager_autostart=
-if test ! -f $HOME/.kde/share/config/knetworkmanagerrc; then
+if test ! -f $kdehome/share/config/knetworkmanagerrc; then
     knetworkmanager_autostart=$(. /etc/sysconfig/network/config && echo "$NETWORKMANAGER")
-elif test $HOME/.kde/share/config/knetworkmanagerrc -ot  /etc/sysconfig/network/config; then
+elif test $kdehome/share/config/knetworkmanagerrc -ot  /etc/sysconfig/network/config; then
     knetworkmanager_autostart=$(. /etc/sysconfig/network/config && echo "$NETWORKMANAGER")
 fi
 
 # kconfig will merge it in case we overwrite another setting
 if test -n "$knetworkmanager_autostart"; then
-    echo "[General]" >> $HOME/.kde/share/config/knetworkmanagerrc
-    echo "Autostart=$knetworkmanager_autostart" >> $HOME/.kde/share/config/knetworkmanagerrc
+    echo "[General]" >> $kdehome/share/config/knetworkmanagerrc
+    echo "Autostart=$knetworkmanager_autostart" >> $kdehome/share/config/knetworkmanagerrc
 fi

++++++ knetworkmanager-fixnetworksui-hschaa-01.patch ++++++
Index: knetworkmanager-ui-networklistview.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-ui-networklistview.cpp      (Revision 691203)
+++ knetworkmanager/src/knetworkmanager-ui-networklistview.cpp      (Arbeitskopie)
@@ -210,7 +210,8 @@
                        }
                        //save changes
                        m_changedNetworks.append( netLvi->net );
-                       m_changedNetworks.append( oldParentLvi->net );
+                       if ( oldParentLvi )
+                               m_changedNetworks.append( oldParentLvi->net );
                }
        }
        else


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



Remember to have fun...

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

< Previous Next >