Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit NetworkManager-kde
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Thu, 09 Aug 2007 20:28:12 +0200
  • Message-id: <20070809182812.5636067832C@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package NetworkManager-kde
checked in at Thu Aug 9 20:28:12 CEST 2007.

--------
--- KDE/NetworkManager-kde/NetworkManager-kde.changes   2007-08-06 09:27:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/NetworkManager-kde/NetworkManager-kde.changes  2007-08-09 11:57:20.824215000 +0200
@@ -1,0 +2,14 @@
+Thu Aug  9 11:35:10 CEST 2007 - hschaa@xxxxxxx
+
+- add patch knetworkmanager-show_message-hschaa-01.patch
+  (fixes b.n.c #264176)
+- add patch knetworkmanager-infodialog_tab-hschaa-01.patch
+  (fixes b.n.c #295593)
+
+-------------------------------------------------------------------
+Wed Aug  8 13:00:08 CEST 2007 - hschaa@xxxxxxx
+
+- add patch knetworkmanager-enablebutton-hschaa-01.patch
+  (fixes b.n.c #277720)
+
+-------------------------------------------------------------------

New:
----
  knetworkmanager-enablebutton-hschaa-01.patch
  knetworkmanager-infodialog_tab-hschaa-01.patch
  knetworkmanager-show_message-hschaa-01.patch

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

Other differences:
------------------
++++++ NetworkManager-kde.spec ++++++
--- /var/tmp/diff_new_pack.w11370/_old  2007-08-09 20:27:51.000000000 +0200
+++ /var/tmp/diff_new_pack.w11370/_new  2007-08-09 20:27:51.000000000 +0200
@@ -20,7 +20,7 @@
 Group:          System/GUI/KDE
 Autoreqprov:    on
 Version:        0.2r674918
-Release:        20
+Release:        22
 Summary:        KNetworkManager application for use with NetworkManager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       NetworkManager
@@ -33,6 +33,9 @@
 Patch3:         knetworkmanager-version-hschaa-01.patch
 Patch4:         knetworkmanager-fixnetworksui-hschaa-01.patch
 Patch5:         knetworkmanager-fixbuild_u64-hschaa-01.patch
+Patch6:         knetworkmanager-enablebutton-hschaa-01.patch
+Patch7:         knetworkmanager-show_message-hschaa-01.patch
+Patch8:         knetworkmanager-infodialog_tab-hschaa-01.patch
 
 %description
 KNetworkManager is a system tray applet for controlling network
@@ -104,6 +107,9 @@
 %patch3
 %patch4
 %patch5
+%patch6
+%patch7
+%patch8
 
 %build
 . /etc/opt/kde3/common_options
@@ -167,6 +173,14 @@
 /opt/kde3/share/services/%{appname}_vpnc.desktop
 
 %changelog
+* Thu Aug 09 2007 - hschaa@xxxxxxx
+- add patch knetworkmanager-show_message-hschaa-01.patch
+  (fixes b.n.c #264176)
+- add patch knetworkmanager-infodialog_tab-hschaa-01.patch
+  (fixes b.n.c #295593)
+* Wed Aug 08 2007 - hschaa@xxxxxxx
+- add patch knetworkmanager-enablebutton-hschaa-01.patch
+  (fixes b.n.c #277720)
 * Mon Aug 06 2007 - hschaa@xxxxxxx
 - add patch knetworkmanager-fixbuild_u64-hschaa-01.patch
   (fixes build on i386)


++++++ knetworkmanager-enablebutton-hschaa-01.patch ++++++
                                Index: knetworkmanager-dialogfab.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-dialogfab.cpp   (Revision 691203)
+++ knetworkmanager/src/knetworkmanager-dialogfab.cpp   (Arbeitskopie)
@@ -237,6 +237,8 @@
 */
        connect (this, SIGNAL (cancelClicked ()),
                 this, SLOT   (invalidateSecretMap ()));
+
+       updateModel();
 }
 
 AcquirePasswordDialog::~AcquirePasswordDialog ()
++++++ knetworkmanager-infodialog_tab-hschaa-01.patch ++++++
Index: knetworkmanager/src/knetworkmanager-tray.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-tray.cpp        (Revision 697650)
+++ knetworkmanager/src/knetworkmanager-tray.cpp        (Arbeitskopie)
@@ -872,7 +872,10 @@
                ConnectionInfoDialog* dlg = NULL;
                dlg = dynamic_cast<ConnectionInfoDialog*>(this->child("ConnectionInfoDialog", "ConnectionInfoDialog"));
                if (dlg)
-                       dlg->close();
+                       if (dlg->isHidden())
+                               dlg->show();
+                       else
+                               dlg->close();
                else
                        slotShowConnectionInfo();
        }
@@ -1107,7 +1110,7 @@
        ConnectionInfoDialog* dlg = NULL;
        dlg = dynamic_cast<ConnectionInfoDialog*>(this->child("ConnectionInfoDialog", "ConnectionInfoDialog"));
        if (!dlg)
-               dlg = new ConnectionInfoDialog(_ctx, this, "ConnectionInfoDialog", FALSE, Qt::WDestructiveClose);
+               dlg = new ConnectionInfoDialog(_ctx, this, "ConnectionInfoDialog", FALSE);
 
        // show the dialog
        dlg->show();
++++++ knetworkmanager-show_message-hschaa-01.patch ++++++
Index: knetworkmanager/src/knetworkmanager-dialogfab.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-dialogfab.cpp   (Revision 697651)
+++ knetworkmanager/src/knetworkmanager-dialogfab.cpp   (Arbeitskopie)
@@ -200,7 +200,7 @@
        }
 }
 
-AcquirePasswordDialog::AcquirePasswordDialog (QWidget* parent, const char *name, bool modal, WFlags fl, KNetworkManager* ctx, QString obj_path, QString net_path, QString essid)
+AcquirePasswordDialog::AcquirePasswordDialog (QWidget* parent, const char *name, bool modal, WFlags fl, KNetworkManager* ctx, QString obj_path, QString net_path, QString essid, QString message)
                             : WirelessDialog (parent, name, modal, fl, ctx), _obj_path(obj_path), _net_path(net_path), _essid(essid)
 {
        delete _net; // Free the object created in WirelessDialog constructor
@@ -210,6 +210,13 @@
        _net = _dev->getNetwork (net_path);
 
        QWidget * mainWid = mainWidget();
+
+       if (!message.isEmpty())
+       {
+               QLabel * label = new QLabel(mainWid);
+               label->setText("<b>" + message + "</b>");
+       }
+
        NetworkLabelWidget * labelWidget = new NetworkLabelWidget( mainWid );
        labelWidget->lblEssidVal->setText (essid);
        labelWidget->lblDeviceVal->setText ( QString("%1 %2 (%3)")
Index: knetworkmanager/src/knetworkmanager-dialogfab.h
===================================================================
--- knetworkmanager/src/knetworkmanager-dialogfab.h     (Revision 697650)
+++ knetworkmanager/src/knetworkmanager-dialogfab.h     (Arbeitskopie)
@@ -108,7 +108,7 @@
                                 bool modal = false, WFlags fl = 0,
                                 KNetworkManager* ctx = NULL,
                                 QString obj_path = NULL, QString net_path = NULL,
-                                QString essid = NULL);
+                                QString essid = NULL, QString message = QString::null);
        
          virtual ~AcquirePasswordDialog ();
 
Index: knetworkmanager/src/knetworkmanager-nminfo.cpp
===================================================================
--- knetworkmanager/src/knetworkmanager-nminfo.cpp      (Revision 697650)
+++ knetworkmanager/src/knetworkmanager-nminfo.cpp      (Arbeitskopie)
@@ -24,6 +24,7 @@
  **************************************************************************/
 
 #include <kdebug.h>
+#include <klocale.h>
 
 #include "knetworkmanager.h"
 #include "knetworkmanager-nminfo_dbus.h"
@@ -73,7 +74,10 @@
 void
 PassphraseRequest::acquireKeyFromDialog()
 {
-       _dlg = new AcquirePasswordDialog (_ctx->getTray (), "PassphraseDialog", true, 0, _ctx, _obj_path, _net_path, _essid);
+       QString msg = QString::null;
+       if (_new_key)
+               msg = i18n("The connection could not be established. Please verify your settings and try again.");
+       _dlg = new AcquirePasswordDialog (_ctx->getTray (), "PassphraseDialog", true, 0, _ctx, _obj_path, _net_path, _essid, msg);
        connect(_dlg, SIGNAL(sendPassphrase(Network*)), this, SLOT(slotKeyEntered(Network*)));
        connect(_dlg, SIGNAL(cancelClicked()), this, SLOT(slotCancelRequest()));
        _dlg->show ();

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



Remember to have fun...

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

< Previous Next >