Docky

Merge lp://qastaging/~florian-dorn/docky/networkmonitor into lp://qastaging/docky

networkmonitor
Merge into trunk

Proposed by Florian Dorn on 2011-02-24

Status:	Merged
Merged at revision:	1795
Proposed branch:	lp://qastaging/~florian-dorn/docky/networkmonitor
Merge into:	lp://qastaging/docky
Diff against target:	615 lines (+523/-0) 10 files modified Docky-2.sln (+7/-0) StandardPlugins/Makefile.am (+2/-0) StandardPlugins/NetworkMonitor/Makefile.am (+28/-0) StandardPlugins/NetworkMonitor/NetworkMonitor.csproj (+94/-0) StandardPlugins/NetworkMonitor/Resources/NetworkMonitor.addin.xml.in (+24/-0) StandardPlugins/NetworkMonitor/src/DeviceInfo.cs (+111/-0) StandardPlugins/NetworkMonitor/src/NetworkMonitor.cs (+100/-0) StandardPlugins/NetworkMonitor/src/NetworkMonitorDockItem.cs (+110/-0) StandardPlugins/NetworkMonitor/src/NetworkMonitorItemProvider.cs (+45/-0) configure.ac (+2/-0)
To merge this branch:	bzr merge lp://qastaging/~florian-dorn/docky/networkmonitor
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Rico Tzschichholz	2011-02-24	Needs Fixing on 2011-02-24
Robert Dyer (community)	2011-02-24	Needs Fixing on 2011-02-24
Review via email: mp+51084@code.qastaging.launchpad.net

Description of the change

Adds a new Docklet to monitor network traffic.

Revision history for this message

Robert Dyer (psybers) wrote on 2011-02-24:

You should probably update the copyrights (in the comment headers) and make sure all NEW .cs files have a copyright header (with the right copyright, 2011 and your name).

review: Needs Fixing

Revision history for this message

Rico Tzschichholz (ricotz) wrote on 2011-02-24:

Please really use my proposed patch!
https://bugs.launchpad.net/docky/+bug/719608/+attachment/1854201/+files/NetworkMonitor.diff.gz

* unpack it
* bzr branch lp:docky (pull a new clean docky trunk)
* go into the branch and apply the patch with "patch -p0 < NetworkMonitor.diff"

Now you can fix some left-overs like "spaces to tabs"
and remove obsolete code fragments.

* bzr commit
* bzr push lp:~florian-dorn/docky/networkmonitor --overwrite

review: Needs Fixing

lp://qastaging/~florian-dorn/docky/networkmonitor updated on 2011-02-24

1785. By Florian Dorn on 2011-02-24: Cleaned up code for megre (added Copyright, tabs/spaces, removed unused code)

Revision history for this message

Rico Tzschichholz (ricotz) wrote on 2011-02-24:

Thanks this is getting better for an actual review ;-)

Sorry, I should have given you this link earlier, but take a look at:
http://www.mono-project.com/Coding_Guidelines

Revision history for this message

Rico Tzschichholz (ricotz) wrote on 2011-02-24:

If you look at the current diff at this site, you will also notice some issues.

lp://qastaging/~florian-dorn/docky/networkmonitor updated on 2011-02-24

1786. By Florian Dorn on 2011-02-24: fixes coding guideline issues

Revision history for this message

Florian Dorn (florian-dorn) wrote on 2011-02-24:

bit by bit, little by little ;)

Revision history for this message

Rico Tzschichholz (ricotz) wrote on 2011-02-24:

Ok, i had a closer look and there are a lot of clean ups needed to make it nicer and understandable ;-)

for a start apply this http://people.ubuntu.com/~ricotz/docky/fixes_for_1786.diff

review: Needs Fixing

lp://qastaging/~florian-dorn/docky/networkmonitor updated on 2011-02-24

1787. By Florian Dorn on 2011-02-24: included patch by rico
reworked /proc/net/dev parsing

Revision history for this message

Rico Tzschichholz (ricotz) wrote on 2011-02-25:

@florian: i made a new branch with some changes lp:~ricotz/docky/networkmonitor. You should be able to pull from there or merge if you made any changes.

lp://qastaging/~florian-dorn/docky/networkmonitor updated on 2011-02-27