← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/knetworkmanager/gutsy

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_03_static_config.diff

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2007-02-19 12:33:16 UTC
  • Revision ID: james.westby@ubuntu.com-20070219123316-iuyymyjicwv2tajj
Tags: 0.1-0ubuntu9
Edit kubuntu_03_static_config.diff to move menu item
to below wireless (didn't show itself if no wireless available)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_03_static_config.diff
1
 
--- orig/knetworkmanager-0.1/knetworkmanager/src/knetworkmanager-tray.cpp       2006-09-27 09:02:59.000000000 +0100
2
 
+++ knetworkmanager-0.1/knetworkmanager/src/knetworkmanager-tray.cpp    2007-01-18 14:49:59.000000000 +0000
3
 
@@ -250,6 +250,15 @@
 
1
diff -Nur knetworkmanager-0.1/knetworkmanager/src/knetworkmanager-tray.cpp knetworkmanager-0.1.new/knetworkmanager/src/knetworkmanager-tray.cpp
 
2
--- knetworkmanager-0.1/knetworkmanager/src/knetworkmanager-tray.cpp    2007-02-19 12:29:55.000000000 +0000
 
3
+++ knetworkmanager-0.1.new/knetworkmanager/src/knetworkmanager-tray.cpp        2007-02-19 12:32:56.000000000 +0000
 
4
@@ -257,6 +257,14 @@
4
5
 }
5
6
 
6
7
 void
7
8
+Tray::staticConfiguration ()
8
9
+{
9
 
+  kdDebug() << "Tray::staticConfiguration()" << endl;
10
10
+  KProcess *proc = new KProcess;
11
11
+  *proc << "kdesu" << "kcmshell kcm_knetworkconfmodule";
12
12
+  proc->start();
16
16
 Tray::configureVPN ()
17
17
 {
18
18
        emit configureVPNConnections ();
19
 
@@ -694,6 +703,8 @@
20
 
                        KAction* hiddenAction = actionCollection ()->action ("connect_hidden");
21
 
                        menu->insertSeparator ();
22
 
                        hiddenAction->plug (menu);
23
 
+                       KAction* staticAction = actionCollection ()->action ("static_configuration");
24
 
+                       staticAction->plug (menu);
25
 
                        menu->insertSeparator ();
26
 
                        separated = true;
 
19
@@ -782,6 +790,9 @@
27
20
                }
28
 
@@ -1045,6 +1056,10 @@
 
21
        }
 
22
 
 
23
+       KAction* staticAction = actionCollection()->action("static_configuration");
 
24
+       staticAction->plug(menu);
 
25
+
 
26
        /* build-up the ``Options'' sub menu if NM is running */
 
27
        if (state->isNetworkManagerRunning ()) {
 
28
                if (!separated)
 
29
@@ -1095,6 +1106,10 @@
29
30
                                             SmallIcon ("wireless",  QIconSet::Automatic), 0,
30
31
                                             this, SLOT (connectHiddenNetwork ()), actionCollection (), "connect_hidden");
31
32
        
36
37
        configureVPNAction = new KAction (i18n ("Configure VPN..."),
37
38
                                          SmallIcon ("configure",  QIconSet::Automatic), 0,
38
39
                                          this, SLOT (configureVPN ()), actionCollection (), "configure_vpn");
39
 
--- orig/knetworkmanager-0.1/knetworkmanager/src/knetworkmanager-tray.h 2006-09-27 09:02:59.000000000 +0100
40
 
+++ knetworkmanager-0.1/knetworkmanager/src/knetworkmanager-tray.h      2007-01-18 14:55:34.000000000 +0000
 
40
diff -Nur knetworkmanager-0.1/knetworkmanager/src/knetworkmanager-tray.h knetworkmanager-0.1.new/knetworkmanager/src/knetworkmanager-tray.h
 
41
--- knetworkmanager-0.1/knetworkmanager/src/knetworkmanager-tray.h      2007-02-19 12:29:55.000000000 +0000
 
42
+++ knetworkmanager-0.1.new/knetworkmanager/src/knetworkmanager-tray.h  2007-02-19 12:29:56.000000000 +0000
41
43
@@ -110,6 +110,7 @@
42
44
          ~Tray ();
43
45
 
46
48
          KAction* configureVPNAction;
47
49
          KAction* disconnectVPNAction;
48
50
          KAction* configureDialUpAction;
49
 
@@ -148,6 +149,7 @@
 
51
@@ -152,6 +153,7 @@
50
52
        public slots:
51
53
          void updateTooltip          (void);
52
54
          void connectHiddenNetwork   (void);