[PC-BSD Commits] r132 - in pcbsd/trunk: NetworkManager NetworkTray system-overlay/PCBSD/networkmanager

svn at pcbsd.org svn at pcbsd.org
Tue Mar 13 10:06:45 PST 2007


Author: kris
Date: 2007-03-13 19:06:45 +0100 (Tue, 13 Mar 2007)
New Revision: 132

Added:
   pcbsd/trunk/system-overlay/PCBSD/networkmanager/bin/
   pcbsd/trunk/system-overlay/PCBSD/networkmanager/pics/
Modified:
   pcbsd/trunk/NetworkManager/networkman.ui
   pcbsd/trunk/NetworkManager/networkman.ui.h
   pcbsd/trunk/NetworkTray/NetworkTray.cpp
Log:
Fixes for the network manager that charles sent in. 

Modified: pcbsd/trunk/NetworkManager/networkman.ui
===================================================================
--- pcbsd/trunk/NetworkManager/networkman.ui	2007-03-13 17:01:10 UTC (rev 131)
+++ pcbsd/trunk/NetworkManager/networkman.ui	2007-03-13 18:06:45 UTC (rev 132)
@@ -176,7 +176,7 @@
                             </sizepolicy>
                         </property>
                         <property name="text">
-                            <string>System Hostname:</string>
+                            <string>Hostname:</string>
                         </property>
                         <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
@@ -363,7 +363,7 @@
                             </sizepolicy>
                         </property>
                         <property name="text">
-                            <string>Remote gateway:</string>
+                            <string>Gateway:</string>
                         </property>
                         <property name="alignment">
                             <set>AlignVCenter|AlignRight</set>
@@ -772,7 +772,7 @@
 </widget>
 <images>
     <image name="image0">
-        <data format="PNG" length="4788">89504e470d0a1a0a0000000d4948445200000040000000400806000000aa6971de0000127b49444154789ced5b7f505cd775fe909fe4470299878bdcdd468ad9269285ba4e80e044103901aa343228290351648b28b2c14a228892a8223fdc5db5d6ec6a269a85346a769b2a6513d3eec68d0c7806ede29696558acd2ac581b4488007794023a9bb1aacd9a532595ed073befe71df83650d36e04872a639336f0e6777df7def3be7dcf3e3de0bf0ff9cd26ef503e43c47b60cfb0e55b36f97216f53a1de274bce6c55b3439664a89a0a19ce6b2aecafc8923ca06aeacf5438ff1d17d2a66ff5bbdd5252f2b853b1da023925bc59fb8d36324172888bd30dc10221926364d16ef78c92c77f96adb6ed771ac78a49b6da4a14abe3bfaa0ef9489289840e7276719e58e2f3e1b118d94ce66c779c55f26c85771ad75b92c9ca0cd96a7b3ad6497250076380d72dcc580ad8d812fcc642ee68e6cd9c6d6c428e43bed3381725c5ca2da642c72b6c25639302b5c1133a884824a6f3c49bcac67d919471fafac759fa285f92ad4736dc69bc0b48b172bba9d0f11a497252b75c6409cb8e2f934f2e218f91a5a71995adb62d771a3700015ec9b3bdb6d0928b5b307259f081a1c89bf2f1cbb105f7a78e3330146151e53b40094a1e736!
 4ab2dca499297750b19dcf000c37223820deb9cfd82f5f52f211b968fa47063fc1069dac68bf2071cd977067d0925d96afb45d5413d5a931c1f4fe1bac50db9a757a00a840c3ebca8dc1316f29c2719e35c5e387efdd1362a56db993b825fb6da9e1ad841b675a458662cc582bd82b5750deb7c79f29cc5f56c326c8cab73c3934c850e2a797cec7683cf51f21c33f54f060456dd03868774aecb81d038394bb69c1e5811373ce58d9e2394941c336abf41ca56dbab4a9e43b96d0a50ac7cba74770b3944f685532c65ccf15e923748776b1f1923ddadd4f93264723e765c363c448c17e85ee8596eef00fb4a48c56afbebd5e2b96b253f36153a4cd35af73f7c7053a3743e12c2fecf5b103e17c5c60733113a37818fe46721fc52141bcf67a2e942089af6718447c2f8bab6114d636168b3c5f3f248caf7ba6cbe278eacf7a663e24a1c591bd33171318ee28fa663702c8a4f14658af1755e3db919dfbed98e8b97bf6255d769dfc78d17b4d52a6259a4581d8d4a1e99bfd34d0e91017dceba5bfbc871d2d12c644773cfbc3caecb911439f5fb71bd17488e01e3299ea5f7123d86079c2239429ab639a858f9c86a30ada81b54ac7c5185fd63b22443c99031f1782342960984472d8016825d2e43fbc611543fbc15f6ef86e054cbd08820800a281921d8a77559ab00a4209a5!
 031f7bdc51446436d31a2afcec0bc3e1d131371582c5918b918c7d64d59183!
 c1f45c10
366845f8aa2f84133fccf8da0e6ca56d8a743085f28c3b9f3f636f5c2f1ddab51c2f2c0e75151ac362a79a4627550c9237377b8c8d9f9b9e96e1d2047c816bf905dde3e7292ac7f3240f693f54ffac86eb2f6904b97db741e107d835131a678805147ccd509bd224ed88ef7902364ede100953cc657836bd91e205b6dbb64493ea36a2a64c909a39fcf7fc08cd0963ad8a5109cdf2c83f3efc298b8540c39230875ba02403b806a64c91ec4a7a250910b59ae81aaf9214b3550b576c852358af30651b7b700d1e80ccce6240f188d636b6ed69ce5432f4ca0ec210b3c3f1c44f842012c1bc298b85a8c8eb37640c303eacbc72fac46116f494a1ebf6e583ed9134c8564f9011f635d645b679227509fd311d276cc4576915507c5ef9279a25b70f627593ca5ae1830ba4b3debf84e0f9311f2c85132d145e66c7751c92365aba37aa5b8969f05b2b54724e9a96daa668724c950b56e48d253989eb5233e358dd0e58b78e55201aec707d1f085020cfe52446dcf8f3df876c6d7d17829886b93d5f00f7991f69bfdf00f7991be6e3f7e3915842c55e3472ffab1e7fa0731911d4796251d2317e358bf291d83bf8ca2203f53649ba24c31f77fb5154d4383784a36e358248cf363573095e8828ca7fad5c963e756aa84659162e5d3a93120d513f277b9c57c352cd5ea13f3599fc3e5!
 077c1c6f258b76b7b0d44f561df09123e4de437a2c382a62c5de436d8c7490b5df681337ea73bfad936482747b8567394ef691a105efb3e27a60f91e70af562949729e61f9c53c617a5a8374af84e2ca8d089e0962e26a35e26983d8fc5133a25766f0a5cf17e078308857afefc1d47f36419dfd323cffeac1dab5fbe17dd18bd767f7e044d0032d6d3f3a2e78f1ebd91ac86b46b0b5743ddacf8ca07ae77a78db47f0256d3d9a2e84717eac184ffcc00eccbfcfcfd46b67ff63a54a5816090fd0359de758d2133849b69dee11b1c0232c3860ac0526f7fdfd644e898bb925820fec121e91bf6bde038a2a5bc8def97ac3779aa2c2f40e90e3c9ef615bb507ac59ee0f55d8af43b28be82f03aa6687214392e7e48a6f7951bdbb0cfe9ff8d1205723742e8a820780c1f371c0028c5c14bce1b976a86a23e2d34ea8aa8aafa47b01ad06b2e4c5d474359e78ce8facac3a147fdf8b8a1288b9bf0bf03c37880614c079260cc00e5976ce3f1fcea9952a60d9a458f91543d33925ae3758de90c75b458ee638d9d2dab3207a1b9ed0d64916558a8a7260a7e0b14eb27c9f8f91d364e9a38297eff39121d2d741d130f98745cf704a640ad33617872b93b380edcf578a6b2531e05d92243fa66addd8788f1dd7a616c60023265c7cbd1f7b1e2986e7192fbeb4ae1ac1d804363f9425a2!
 f9873231321ac72706d2e179c503ac6940e71a0f2cf735a0fb6a3b94f7ec41!
 d7583b5e
d7f6e0a7235eac5db31fe1a920be7d6033bccf8ea04edb0acfd0201a34331a4241a8d38f41fb441897aeeec1b5293b001cd5265f88ad5409cb229395198ad57653c9237377ba68dab6440c30aa35922d5ebd824be91aab0ef8385c29b246692b597bb88dec5dc8135dc213625d7adebf9114fd9bfb682a24ab1ef725c782e86a70adb417f83715f61da66c05e91210bdde88053b3c921365f94d68ff5123a2d128ccd966045f9c4045a905a1735194159951f3553f46276a0078003400f0c0b2b1018adc0e48d57395a12cb5c32355a3017e78b6d4c08f106a50068f2a2a3fcfb376ecfda413aad68eae1746a16aaa4fbd707cdf6a94b06c92adb627943cb11253ea5f3c1b0cec9c8ff6c343c30b7a05db891e8efbc9a24ab78801956e0e5792a58fb69083a4a3b94df403465768ac0b18fb08c63ec308c918597fd4c79cedfaf3adac580da69579409e435135f58a2c39332c391e406bc0e825fb82de0050113fec04be20ee99989880c56241fbb3219c1b2d03e0c7cc740d207b61c9ae83d91c44cdee0a4c5c9c806593059801900ee02680b5f37c666606e9e9e96f7827ff4f82f03c5371f55ca0d8029cbbb5eb014209fc9e62b5b16f87b05c6e494a45b88d2cdfe7e202322c98ba5f904aa996be9ce4499cf7acb99d239d06fa076e92fcec6af0ac787758ceb365cb9a7c111!
 294fc4d76a8f0201a9dc1b5a929c892134a861366b31d55dbfd68fc6acddc7df157e3c85a9f35c7e748b7703c1a4796390bc13341545ca940e3d52644af37624a75021a004d45f0034ef8adeda8d95b8de89528cc1bcd73c384cf85b5e2a2e24fa7a5a5fdcb6a14b12252acb62f1bf5c0b85f78424e09a9143a38b0932cddd7425e261d27448ddfd6211650fb7af5353f3d2bb49d6e1351fdb8a8f8f61e7233d145963fdea2d7032d1cf78b3ac1785ee4b4be9e309be4113af5f5f6bd4a72457b05ab3e1f205b6dcfcb92bcd3b2210b4a66032079a1be5607551551bda870108d5201caced8a1aa4ec87223b2d2654002002764b909aad608485e007580e601a406a8aac80e339a9e25340fa6661a003441c96c840afd39d3768c3ceec4c44322c61831227826d8b2eb33bb0eac16d7b2492964b662b55d34150a4bc53a457e4f74937b0f89fcec384926bac9f2471d8c5492a5953646fc428e9d26abf6b918eb20ab1e37b89bb10eb27c5f12ef24ab0eb430d2213caba8752efbbc74e4b0edb1053141ac1fcc043a03cbf682b7754244b1720b24e75945914d5b2d5950e43a40f2c36caa116b80196568b824d600a7a6bd50a7eaa0aa76c8b2becb2dd90134cd8d274b8d50754f90652f14b90eaae4c7d4f51aa89a17336a1d462f3aa16a785955a74ad5979bafb59c6a395ff7c!
 53aab3146f0f9202a1eaef8725a5adaa9b7836dd994b39d5b72b6bbaee4efd!
 257767af
5be7e9c749cd457834f8af96a6bee2107c9dac32d6437b9f7805829aa3de82643fae761f2c8519fbe3e207a81aa032226e46c7730671b47e52d0e93f17c8ef07ba9d9a1ed74db33cb7dffdfca19a1dced34436e7a56c968fc98d9ec8729bb06e9194198322a00298c46a9181e84d12015c38341344805f068a2abf3a86134a0184d5a084019542d043bca60d78250d50ac4affb71ed7a0d26a24d808640f49afae8d4cb47e7ce0fb98ebbbed3f8978ddf32e4e0f34154c42b7e915693f6e06f039b4169fa7517807500de054001702f800d00de2fcbca03f925b61f96faa9551df489caee24c9497d8df0c6fc6ab1b1aeef3b2d727e8b7f40df49123582eb94d867a87f32c058275954e9fe555f098f03b80f8009c03d003201c89ce4cfe72a46bdbef0b5fa266e35701380f701d80ce083003e02e021009f34e5e47fb174b7abbfeaa08ff4e8e01264a05b1433a9e708e6f612f5ef0db9fe68805507a815ed72f428a6dc47009402280650a83f734bfdc1facf07ba020b5261a02b40b6f26daf0b1ac0d7e8e0ef82284c6500efc6bcf5df07e00300ac003eac2be153002a73b6947ead7c9f23c85edeb09d10d6f175e8155d68a12704ba49ceea961f226b0ff9629156064c1bf2bf06e0b3003e03e061007faa3fe3a34585453b7c5edfff2483372a469fdfd7ba12a06fa584e4bf!
 0d395929927ead85f09277eb573a80759064b9685bd5fde64db97f6231d937c972fbbdce8cea4cbb16842c5540d58270aa15ff5b37e59d9cba36313e7a3efcf2e885b39701507f96a65f3701cc0298cdb7e667341c6e3859575b779f51491a9561f86c18c5578a1f49db9fd601e07500bf59ad02922975e9ccf08ed4cb50829c74a503b85bff7b6d92f2eed2ef4956ec5bd1cd5865ecfed0ded05f54efae9eafa75f05b01ec04b001ec4a5acf5594553d7a76e4028ec3778132548cb7cf06203189f19ca49d31fa802f815e6c11ab143c6bc22d6257143196faa04d3065346f460747fb834fc67d545f3fb1ff1b8e82d065f1a44c18305b0ff95fde8d4f5a9d79789ebb6901144d74278432644143701c801b00522a815022802f071003b00ec04f06945513e77e4f0911f938ccf759306a59c246939d5f203884ca14028dbf0b07714adc1e2a9d402e07e88809a6fda602a711c75fc6da0331023c98471e4546f99c7c745f5333028b6e15abc2dcf4364a53fd4c736a6d83b83fa2e7343b99f8f917cda16623032c6cd003230ef0d1b015812fec44e77b3fbc7246fcced112652b8715e40b7bcdbe3f603c805f047101eb6168b5bfff67983d24c25dfc3ca723fdd3672b44d7fe980bee1d933ced738cb4600ebf3f3f2373b8e39be493f7f3ed02f2c9ab89158c06393c659a4e1!
 64cbab8e630e870efebd00de03e15d46504ea55ba88041ca4a334b06227496!
 b6f2e724
6fba8cbedfb058eac16951bbbf12e8a69a24bf91cf9d14d1eb8830c91b1cadaaacaa8298366608cb2f053e358dff7649696676792b5fdb3b4bd67692b5246bbb481bc980017e098ae94a19d6cf03266246a5a89f1c1d1b5f003ed019b8c163fcae2ccb1f06f07e881892813777fb5b071e004c27f80449b6e97b0203fadcf5e93b4103a9d1dba0d4cf8d3540c3d2c6b940e1f6bf7635bb7e9abb25b714c0568898710f4466919601fed629a0aa9581b62e31776da185961d4f590035943130b2b85622badbf785fbe62cee3aeefac7fcc2fc8721d2e51f4344fa4c8854975c502d06da28da6e0d99c69869ebe40cfb49f7f17ad1f88c2d0465c82dc6490fe3fbd985bf3364b79fe438fffbc8a1230e45511e029007d173bc174016165afd8e80378a1bc9743cf11849d61f3e4226aae8f3d79327c9b641e1023d7a00ebd14f92be01b44e7d913925c5f3b7957e06c08300f2210aa58d00fe00a2c75887852eff66e06f19a541049dbb63933ce36e0d885d9c5e0749d275dac5d808e9d6cf0cf52df5bf42930b3d44e76d003ea4037f1f806c1df8dd4b00bfede08d07de05e0eedce6d8a1f213ec1dee754c9164acdf46d2c540978df494d376546c92187dbef13f42739e91c2ab9ef47d0ea244ce8688eec9c0976a9e6e1bf06432babfbb01bc9b4c5ce558bd4031283c61a0c3418!
 e91ae53faa245cab97f0374528c1887486b46805b6c9ebfa3686e2ab89fcc5f4f563dc3a15a952423610749071dc71ce449b2a73fb22868a3487287d97f24c187f1c6b4f68e049e4c46a45d0be06e32f2058eecbd49ea31a19f6ce9d0778452c0fb86789364a0d63bfc29180b284b97b1bf339446965b12835567c9da9923275ae224d9339248b6f88c2bccbfa99de5fdf81db3f6b289b3a5193c559a4df2ef8d5323ee7e46497eabb693b7ef1f1cee34eded600ec97f3ad2cdfda5c7b8dc15a8dfd3efe936d1ff01ab219539b82ae1d30000000049454e44ae426082</data>
+        <data format="PNG" length="4770">89504e470d0a1a0a0000000d4948445200000040000000400806000000aa6971de0000126949444154789ced5b7f505cd775fe909fe44782320f17a5bb8d14b34d240b759d00c189207202546964505206a2c8165664839544102551213fdc5db5d6ec6a269a85246a77db2a6513d3ee260d06328376718786558acb2a83027191000df28006a9ac066b76a94c9617f49caf7fdcf76059830d24929c69cecc9bc3d9dd77dffbce39f7fcb8f702fc3fa7943bfd0039db9121c3be5bd5ecbb64c83b55a80fca923343d5ec902519aaa64286f3860afb2bb224f7ab9afa3315ce9fe252cacc9d7eb73b4a4a36f728565b20b390b7abbed64ace911ce4d2744bb04088e41899bfcf3dab64f3df64ab6dd7bdc6b16a92adb642c5ea78b9fca88f24198feb20e796e6f1653e1f1a8d928d64e62ec73925db9677af71bd2599ac4c93adb6e7e39d240774300678ddc28c26818d2ec36f2de68e46decedcc906643ae47b8d734952acdc6eca73bcc266323a25501b3cae83989c8cea3cfea6b271df64d238bd7d632c7a8217646bdde67b8d77112956ee32e5395e23494ee9969b5cc6b2632be453cbc8a364513b23b2d5b6fd5ee30620c02bd9b6d7165b72690b4e4e08de3f38f9a67c6c22bae8fee471fa0727995ff636508292cd4cd!
 96a8b304a7242b790c10d0f302c372cd890ced927586fdf32b261f9c9246e8c1f224d3b79457ebf23e3dea02fa4245b6dbf283fa2476b926363495cb7b82177f708548190c1879694bbc3429ef724639c89c5e3d71c6fa562b59dbd27f865abedb9a1dd646b7b926546932cd823586be790ce5726cf5b5ccf2643c6b83a373cc994e7a092cda7ee36f84c25db315bf36c4060d53d606850e7ba6c58b6a9a57f55dcf094377a8e505262cca8fa1a295b6daf2ad90ee5ae2940b1f2f9a27d4de430d91b4eb29431c77b48c64977732f798b743753e72b90c985d831617888182fd095303e49b7b79ffd85a462b5fded5af1dcb79a1f9bf21ca619adeb9f3fb0b55eba783d84434f5a103e1fc196473622747e1c1fce4947f842045b2e6e44c360089af631842f85f1556d0b1a2e87a1cd152cc89792bed765f30331a4bf2715e3d76248df928af12b31147c2415039723f878fe4631bece2ba6b6a1fe761bae4c7cc9aa6ed0fe1eb75ed2d6aa8815916275d42bd964ce1e37394c06f439eb6eee25274847a3901d8ddd0bf2842e4f25c9c9df4fe8bd40620c184bf22cbd97e8363ce00cc951d2b4d341c5cac7d7826955dda062e57fa9b07f549664286932c69fae47c8328ef08805d042b0cbc568db328c8ac776c0feed109c6a31ea1104500a252d04fb8c2e6ba5801444034ae7b!
 fb798c2a8ad2a40e4d5599837a5627c3c068b251dc35762d8b1351d031723c!
 87dd88cf
085080a1e31c3ff9361545edb01fb4c08e14bc5387fd1deaa5e3ab96f2d4a5819f86c2a8ad546259b54ac0e2ad964d66e9708505d8627f493a364935fc82e6f2f19256b9e0d900364cdb33e3244561d75e972abce03a23f302ac6240f30ea88f93aa147fcd676b29b1c25ab8e05a86433b6165c2bf600d96adb2b4bf2595553214b4e18fd7ccec36684b657c32e85e0fc7a319cff10c6f8d502c86941a833a500da0054205df620361d818a2cc8722554cd0f59aa84aab541962a50903d80ea03b988446661362778c0480c3bb2d2e72d1f7a691cc58f5ae0f9de00c2977261d91cc6f8f502b49fb3031a1e562f9fbcb41645bc2529d9fcaa61f9444f30e59125877d8c7791ad1d099e407d4e4f91b6132eb28b2c3f227e97c819d2f94082c593ea8a7ea3bbd4b38eaf65889c22eb8e93ec223377b9a86493b2d551b15a5c2bcf0219dae392f4dc4e55b3439264a85a1724e939ccccd9119b9e41d7d52b78e56a2e6ec60650fbb95c0cfc52446d8fd7836fa67d15f56341dc98aa40f3cb5ea4fce6109a5ff62275c3215c8806214b15f87e8f1ffb6f7e00e31931a45b52317c25864d5b5331f0cb087273368a6c93bf51ccfd5fed40c3cb03784e36c37e3d8c8ba3d7301def848ce7fad4a913e757ab84159162e5f3c93120d91372f6ba85d50c4b35fb444ed7e770c9611f27fd64!
 febe2616b590e5877de42879e0a81e0b8e8b5871e0682ba31d64d5d75ac58dfadc6fed203947babdc2b31ca77bc99e45efb3ea7a60e51ef06ead4c92e46cc3f24b79c2cc8c0629434241d91604cf06317ebd02310e60db47cc885c9bc5179eccc589b341bc7a733fa6cf37409dfb223c2f7ab07efd21787bbc787d6e3f4e9df5404b398496412f7e3d570979dd3076146d42dbd961547c6a13bc3f1ec617b44d68180ce3e268019ef1d88185f7f9997ae3dc7fae56092b22e101baa6b31dcb7a02a3646b4bb788051e61c17e632d30b1ef1f20330b5dcc2a147c68aff0889cbd0b1e905fd6448617ea0d5f0b4585e9ed272712dfc3b6660f58b7d21faab0df846417d15f0654cd0e438624cfcba5755e54ec2b86ff877ed4ca15089d8f20f76160e0620cb000c35704af7da10daa5a8fd88c13aaaae299542fa0554296bc989ea9c0932ff8919e5e8d82ef7851ba1b62ee97019e1706508b5c387f120660872c3b179e0fe7f46a15b06252acfc92a1e9cc42d71b2c6fc8937e313f39413635772f8ade8627b47690f965a2a21cda2378bc932c39e863b49d2c7a42f092833eb287f4e95d67937f48f40c6744ad60dae9e258596216b0fde56a71ad2606bc4392e4a754ad0b5b1eb0e3c6f4e21860c48491db7dd8ff78013c7e2fbeb0a102c1e838b63d9a2ea2f90737627824868f!
 f7a7c2f38a0758578bf6751e581eac45e7441b9477ed47c7e536bcaeed87ff!
 9217ebd7
1d42381ac4376bb6c1fbc361546b3be0797900b59a19b53f0d429d790aeac7c3b87a7d3f6e4cdb01e0b836f55274b54a581199ac4c53acb6db4a3699b5c745d3ce65628091b3493679f50a2ea96b2c3fece35899c81a457eb2ea582b194ee25dc213e25d7ade8f2744ffc65e9af2c8f2a77d89b120b2165cabed05fe43857db7294341aa04446ed663d10e8fe444714e03dabe5f8f482402b3d98ce0b971941659103a1f4171be19955ff66364bc128007402d000f2c5b6aa1c86d8054315f19ca521b3c52056ae187677b25fc08a112c5f0a8a2f2f3bc60c7814f38a16a6de87c6904aaa6fad44b270fae45092b26d96a7b46c9162b31452d4b6783a13d0bd17e68505ff6d27b05dba96e4eb690f9656e1103cadc1c2b238b9e682207494763abd80b30ba42635dc0d84730f6198649de226b8efb98b94b7fbe95a56bc1b43a0fc87628aaa65e9325679a25d30368b518b96a5fd41b002a62c79cc0e7c43de3e3e3b0582c687b2184f323c500fc989da904642f2c19d5309b83a8dc578af12be3b06cb500b3005201dc06b07e81cfcece223535f50defe4ff61109e1f955e3f1f28b000e7efec7a805002bfab586decdf2d2c9755985411ee244b0ebab8880c0b26ef172453b2a527167bd27c1d718b8ba8bfafff36c9cfac05cfaa7787e56c5b86acc9572041c9d96a870a0f229!
 159dc989e862c39a1a4396136db51becb8ffa2f57cedf177b3586f44de9f37c9e740bc72231a49bd3113c1b44e9b552d45f6f40e4663da65527a001d05404dfef84dfda86ca0315885c8bc0bcc53c3f4cf87c582bc82ff8544a4acabfaf4511ab22c56afba2510f4cb6084fc82c24953c0787f69045079bc849d2714ad4f8aded6201b5b7475ff3d3b3426b4bab88ea2745c577e0a89bec224b9e6ed2eb81264eb6883ac1785eb45d5f4f48f4089d7a7b7a5f25b9aabd82359f0f90adb6176549de63d99c0e65632d2079a1be560d5515513d3f6f00f5522e8acfdaa1aa4ec8723dd253654002002764b901aa560f485e00d580e601a45aa8aac80eb39a9e25340fa6676b013440d9580f15fa7366ec187eda89f147458c316244f06cb069efa7f71e5e2bae159392c70cc56abb62ca13968a77eadd5d883c7054e467c7699221b2e40907a3656451998dd11621c7dbc9f2832ec63bc8f2a70dee66bc832c3998c03bc9f2c34d8c7608cfcaf7cf679f0b75c76c4f2d8a0962fd6036d01158b117fc562744142bb743729e5314d9b4c3920e45ae06243fcca64ab10698568cdaab620d707ac60b75ba1aaa6a872cebbbdc921d40c3fc78b2540f55f70459f64291aba14a7e4cdfac84aa7931ab5663e48a13aa86cbaa3a5da45e6ebcd174a6e962f5e7abadc618c11783287dacf48!
 b292929677e1b6c2ba6cc5ddc9eb9cb752d67afbeb213d6fbfa09d2715a5f0!
 d3e2d22b
aadb19b1c24ab8e35094f392c568aaa8eb8c91efdf33eb2eeb84f5f1f10bd40f961111332773998b99323f27687c9783e47f9dde4ecd0dad2faa395beffefe48c50d62e9a2137bca0a4d57fd46cf6c3945189d4b4204c69a5801446bd54000fc2a8950ae0c1006aa55c7834d1d579d4306a5180062d04a018aa16821dc5b06b41a86a296237fdb871b312e3910640432072437d62faf2f1f9f343ae93ae6fd5ff75fd370c39f86210a5b1d25fa454a63cf2bbc066508a7edd0760038077005000bc1bc06600ef9365e5e19c42dbf78a5aa8951ff189caeeb4c8f9eee67e32beb05a6cacebfb5a44ee6ff2f7eb3b49c28aae33629fa1e6d900e39d647e99fb57fd853c09e0410026000f00d8084066943f9faf18f5fac2d7ec1bbfd3c04d00de0b601b800f00f8308047017cc29499f3f9a27daebef2233ed2a3839b23035da298493e4730bf97a87f6fc835c7032c3f4c2d7fafa35b31653d0ea0084001803cfd99db6b8ed43c19e80c2c4a8581ce00d9ccdf7a5dd000be4e077f1f44612a03782716acff5e00ef076005f0215d099f045096b9bde82b25071d418679cb764a58d6d7ae5774a1c59e60f40aae33bde4305975d4178dfa19306dcef90a80cf00f83480c700fcb9fe8c8fe4e7e5eff6797dff9308dea8187d7e5ff36a80be951212ff36e444a548fab51ec24bdea95f!
 a900364092e5fc9de50f99b766fd99c564df2acb6def76a6556cb46b41c85229542d08a75afabfd5d3dea9e91be3632317c397472e9d9b0040fd599a7edd063007602ec79a93567bacf6747555f5834625695486e17361145c2b783ce5504a3b80d701fc66ad0a48a4e4a533c33b922f430972c2950ae07efdeff509cabb4fbf2751b16f45b7e365f1873a0f74fe55c5be8a857afa55009b005c00f008aea66f4acf9fbe397d0b4261bfc19b28415ae183971ac0f8cc504e8afe4015c0afb000d6881d321614b121811bca78532598369bd222472287c245e1bfa8c85fd8ff88c5446f31706100b98fe4c2fe37f6e3d337a75f5f21aebb4246105d0fe10d1b21a2b809402680ed10412d0f403e808f01d80d600f804f298af2d9ba63753f20199bef260d4a3a49d274a6e91f21328502a16cc3c3de56b40e4ba7520b808720026a8e69b3a9d071dcf177818e409424e3c69153bd651e1b13d54fff807ec2c4dbf4224456fa637d6c638abd3da87f929b4bfc7c8ae4f3b61083d1316e039086056fd802c0c216ee7137ba7f40f2d6fc1e613c891be70574cbbb3d6e3f802c007f02e161ebb1b4f5ef9e37288d54723c2c2bf1d36d23475af5970ee81b9edd637c8d643d804d39d939db1c271c5fa79f3fefef13168ddf8a2fe2d129e32cd250a2e555c709874307ff1e00ef82f02e!
 232827d31d54c02065a591854353741635f3e7246fbb8cbedfb058f2c16951!
 bbbf12e8
a29a20bf91cf9f14d1eb8830c93847cacbcacb21a68d19c2f2cb814f4ee3bf5b521a9951d2ccd70e90acea20ab4856759236920103fc3214d59532a49f078c478d4a513f393a3ab6087ca023708b27f86d59963f04e07d1031240d6feef6770e3c00984ef119926cd57771fbf5b9ebd37782fa93a3b741c99f1b6b8086a58d7381c2ed7fed6a74fd386b7b5611801d1031e30188cc22ad00fc9d5340793303ad9d62eeda428b2d3b96b4006a28a37f7869ad4cea6edf1bee9db7b8eba4eb5f72f2721e8348977f0a11e93742a4bac4826a29d046d17667c834c68db60ece7280749fac118dcfe8625086dc64ec1a19dfcf2dfe9d21bbfd2427f8df7547eb1c8aa23c0a201ba2e7780f80742cb6fa3d016f143792e964fc2992ac395647ce95d3e7af214f93ad03c205baf500d6ad9f247d03689d7a27e79514cbd959f469008f00c8812894b600f823881e630316bbfc9b81bf6394021174ee8f4779d6dd1c10bd788f8324e96a71313e4abaf53343bdcbfdafd0d4620fd1792b800feac0df0b2043077eff32c0ef3a78e381f701b83fab317ab4e4147b867a1cd32419edb3917431d069233d25b41d174bd8469f6ffc8fd0bc6724f1f2677d9f8528913320a27b22f0e59aa7bb063c918ceeef7e00ef24799da33502c580f084fe76073946bacee88b1649e7fe0dd00931620c22a!
 d19016ea979feb6a2f9a9e07e36671359fe230e56a9243919769074d071c2419e26bbfb2697046d1449ee30fbeae6f818de98d6de96c013c988b4eb01dc4f463fc7e103b7493d260c904dedfa8e501278df206f930c5479873e09630165f932f6f78652c8124b7ca0fc1c59355b77aa294692ddc3f1448bcfbac2fc4e15f9107ecfacbd62228bd278a62883e43f19e7fcdc7d8c90fc465507efde3f38dc6b3ad0ce4c92ff5ad7c5434527b8d215a83fd01fe82ed1ff01f3939a0d5db0b5f70000000049454e44ae426082</data>
     </image>
 </images>
 <connections>

Modified: pcbsd/trunk/NetworkManager/networkman.ui.h
===================================================================
--- pcbsd/trunk/NetworkManager/networkman.ui.h	2007-03-13 17:01:10 UTC (rev 131)
+++ pcbsd/trunk/NetworkManager/networkman.ui.h	2007-03-13 18:06:45 UTC (rev 132)
@@ -87,7 +87,7 @@
 	    
 	    Buffer.remove(0, Buffer.find(" ") +1);
 	    
-	    if ( Devs[i].find("lo0") == -1 && Devs[i].find("fwe") == -1 && Devs[i].find("plip") == -1 && Devs[i].find("pfsync") == -1 && Devs[i].find("pflog") == -1)
+	    if ( Devs[i].find("lo0") == -1 && Devs[i].find("fwe") == -1 && Devs[i].find("plip") == -1 && Devs[i].find("pfsync") == -1 && Devs[i].find("pflog") == -1 && Devs[i].find("tun") == -1)
 	    {		
 		qDebug("Found device: " + Devs[i]);
 		// Determine if its a wireless or wired device
@@ -630,11 +630,12 @@
 void NetworkMan::restartNetwork()
 {
     
-   restartDialog= new restartPopup();
+   restartDialog= new restartPopup(this);
    restartDialog->init();
    restartDialog->exec();
    
    runCommand("/etc/rc.d/routing restart &");
+   runCommand("/etc/rc.d/ppp restart &");
 
 }
 
@@ -1053,9 +1054,12 @@
 
 void NetworkMan::disablePPPOEConfig()
 {
-	// Update the ppp.conf file to remove any old profile
+	// Update the ppp.conf file to remove any old profile information
 	updatePPPconf();
 	saveValue( "/etc/rc.conf", "ppp_enable", "", -1);
+	saveValue( "/etc/rc.conf", "ppp_mode", "", -1);
+	saveValue( "/etc/rc.conf", "ppp_nat", "", -1);
+	saveValue( "/etc/rc.conf", "ppp_profile", "", -1);
 }
 
 
@@ -1096,9 +1100,9 @@
 	  // If we are running as root
 	  if ( getuid() == 0 )
 	  {
-	  popup->insertSeparator();
-	  popup->insertItem( tr("Enable device"), this, SLOT(slotEnableDevice()));
-	  popup->insertItem( tr("Disable device"), this, SLOT(slotDisableDevice()));
+	  //popup->insertSeparator();
+	  //popup->insertItem( tr("Enable device"), this, SLOT(slotEnableDevice()));
+	  //popup->insertItem( tr("Disable device"), this, SLOT(slotDisableDevice()));
                 popup->insertSeparator();
                 popup->insertItem( tr("Restart the Network"), this, SLOT(restartNetwork()));
 	  }
@@ -1112,7 +1116,7 @@
 {
         int currentItem = listNetDev->currentItem();
     if ( currentItem != -1 ) {
-	runCommand("ifconfig " + Devs[currentItem] + " down");		
+	runCommand("ifconfig " + Devs[currentItem] + " down");
     }
 
 }

Modified: pcbsd/trunk/NetworkTray/NetworkTray.cpp
===================================================================
--- pcbsd/trunk/NetworkTray/NetworkTray.cpp	2007-03-13 17:01:10 UTC (rev 131)
+++ pcbsd/trunk/NetworkTray/NetworkTray.cpp	2007-03-13 18:06:45 UTC (rev 132)
@@ -117,8 +117,8 @@
 		if ( line.find(ProfileName) != -1 ) {
 		    // If we find the existing profile for this device, add the context menu shortcuts
 		     contextMenu()->insertSeparator();
-  		     contextMenu()->insertItem( tr("Connect PPPOE"), this, SLOT(slotEnablePPPOE()));
-		     contextMenu()->insertItem( tr("Disconnect PPPOE"), this, SLOT(slotDisablePPPOE()));
+  		     contextMenu()->insertItem( tr("Connect to PPPoE service."), this, SLOT(slotEnablePPPOE()));
+		     contextMenu()->insertItem( tr("Disconnect from PPPoE service."), this, SLOT(slotDisablePPPOE()));
 
 		} 
 	    }
@@ -560,7 +560,7 @@
 
 // If the user wants to restart the network, do so
 void NetworkTray::slotRestartNetwork() {
-    QProcess  process(QStringList::split(' ', "/usr/local/bin/kdesu --noignorebutton -d /etc/rc.d/netif restart ; /etc/rc.d/routing restart"));
+    QProcess  process(QStringList::split(' ', "/usr/local/bin/kdesu --noignorebutton -d /etc/rc.d/netif restart ; /etc/rc.d/routing restart ; /etc/rc.d/ppp restart"));
     if(!process.start())
         KMessageBox::error(this,  tr("Can not restart the network!"));
 }



More information about the Commits mailing list