From f171f14b1f2b0232f2634e517d2839194e70d59b Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Wed, 11 Feb 2009 22:00:10 -0600 Subject: [PATCH 1/5] Removed the date, as it's pointless. Added NaCl to the AUTHORS list (still needs email addy). Something else minor that I forgot :/ --- in/man=wicd.8.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/in/man=wicd.8.in b/in/man=wicd.8.in index 9ca7591..55a5afb 100644 --- a/in/man=wicd.8.in +++ b/in/man=wicd.8.in @@ -1,5 +1,5 @@ .\" Written by Robby Workman -.TH WICD 8 "June 2008" "wicd-%VERSION%" +.TH WICD 8 "wicd-%VERSION%" .SH NAME .B Wicd \- Wired and Wireless Network Connection Manager @@ -139,6 +139,7 @@ log if you are having connection or other problems. .BR wicd-manager-settings.conf (5), .BR wicd-wired-settings.conf (5), .BR wicd-wireless-settings.conf (5), +.BR wicd-curses (8), .BR ifconfig (8), .BR iwconfig (8), .BR wpa_supplicant (8), @@ -155,6 +156,8 @@ log if you are having connection or other problems. Adam Blackburn .br Dan O'Reilly +.br +Andrew Psaltis (curses client) .SH MANPAGE AUTHOR Robby Workman From 06fce10acffaf31cf95fab95868af888f230f664 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Wed, 11 Feb 2009 22:01:24 -0600 Subject: [PATCH 2/5] Removed date ; added references to wicd-curses(8). --- in/man=wicd-wired-settings.conf.5.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/in/man=wicd-wired-settings.conf.5.in b/in/man=wicd-wired-settings.conf.5.in index 55a66cf..6d0b06c 100644 --- a/in/man=wicd-wired-settings.conf.5.in +++ b/in/man=wicd-wired-settings.conf.5.in @@ -1,5 +1,5 @@ .\" Written by Robby Workman -.TH WICD-WIRED-SETTINGS.CONF 5 "June 2008" "wicd-%VERSION%" +.TH WICD-WIRED-SETTINGS.CONF 5 "wicd-%VERSION%" .SH NAME wicd-wired-settings.conf \- controls Wicd's wired network settings @@ -70,6 +70,7 @@ Static DNS address if "use_static_dns = True" and "use_global_dns = False" .SH "SEE ALSO" .BR wicd (8), +.BR wicd-curses (8), .BR wicd-manager-settings.conf (5), .BR wicd-wireless-settings.conf (5). From 6d2cd5bfa788b062437009eb5355ec3d7705e383 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Wed, 11 Feb 2009 22:01:58 -0600 Subject: [PATCH 3/5] Removed date ; added references to wicd-curses(8). --- in/man=wicd-wireless-settings.conf.5.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/in/man=wicd-wireless-settings.conf.5.in b/in/man=wicd-wireless-settings.conf.5.in index cf1afd3..79ac751 100644 --- a/in/man=wicd-wireless-settings.conf.5.in +++ b/in/man=wicd-wireless-settings.conf.5.in @@ -1,5 +1,5 @@ .\" Written by Robby Workman -.TH WICD-WIRELESS-SETTINGS.CONF 5 "June 2008" "wicd-%VERSION%" +.TH WICD-WIRELESS-SETTINGS.CONF 5 "wicd-%VERSION%" .SH NAME wicd-wired-settings.conf \- controls Wicd's wireless network settings @@ -122,6 +122,7 @@ of the stanza will be in this format: .SH "SEE ALSO" .BR wicd (8), +.BR wicd-curses (8), .BR wicd-manager-settings.conf (5), .BR wicd-wired-settings.conf (5). From b168381bc55fc92a04391967fd591b6d3a9ec842 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Wed, 11 Feb 2009 22:03:24 -0600 Subject: [PATCH 4/5] Removed date ; added reference to wicd-curses(8). Minor formatting fixes. Documented the backend=, prefer_wired=, and global_dns_dom= parameters in manager-settings.conf --- in/man=wicd-manager-settings.conf.5.in | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/in/man=wicd-manager-settings.conf.5.in b/in/man=wicd-manager-settings.conf.5.in index 847e2f1..551824b 100644 --- a/in/man=wicd-manager-settings.conf.5.in +++ b/in/man=wicd-manager-settings.conf.5.in @@ -1,5 +1,5 @@ .\" Written by Robby Workman -.TH WICD-MANAGER-SETTINGS.CONF 5 "June 2008" "wicd-%VERSION%" +.TH WICD-MANAGER-SETTINGS.CONF 5 "wicd-%VERSION%" .SH NAME wicd-manager-settings.conf \- contains settings that control Wicd's behavior @@ -26,6 +26,9 @@ This file is located at %ETC%manager-settings.conf .br 2 = route .TP +.BI "backend = " +Default is ioctl backend. +.TP .BI "signal_display_type = " <0|1> 0 = Show signal strength as a percentage .br @@ -37,8 +40,18 @@ This file is located at %ETC%manager-settings.conf 1 = dhclient .br 2 = dhcpcd +.br 3 = pump .TP +.BI "sudo_app = " <0|1|2|3> +0 = autodetect +.br +1 = gksu +.br +2 = kdesu +.br +3 = ktsuss +.TP .BI "wired_interface = " .TP .BI "always_show_wired_interface = " @@ -48,6 +61,11 @@ This file is located at %ETC%manager-settings.conf .br 1 = do not connect to wired interface automatically .TP +.BI "prefer_wired = " +True = Switch to wired interface if a link is detected, even if already connected to wireless +.br +False = Do not switch to wired interface automatically +.TP .BI "wireless_interface = " .TP .BI "wpa_driver = " @@ -60,6 +78,9 @@ This settings determines whether Wicd will attempt to reconnect on connection lo If set to "True" and values are specified in the global DNS settings below, this will cause Wicd to use these DNS settings. .TP +.BI "global_dns_dom = " +This specifies the default search domain to be used by the resolver. +.TP .BI "global_dns_1 = " .TP .BI "global_dns_2 = " @@ -86,6 +107,7 @@ This determines the width of the "Preferences" window when launched from the cli .SH "SEE ALSO" .BR wicd (8), +.BR wicd-curses (8), .BR wicd-wired-settings.conf (5), .BR wicd-wireless-settings.conf (5). From d369bc05875a2e0917d41532a7bd47e378fa61e8 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Wed, 11 Feb 2009 22:04:44 -0600 Subject: [PATCH 5/5] Removed a relic from 1.4.x :) --- in/other=postinst.in | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100755 in/other=postinst.in diff --git a/in/other=postinst.in b/in/other=postinst.in deleted file mode 100755 index 0a1f0b2..0000000 --- a/in/other=postinst.in +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -# Stop daemon -if [ -f %INIT%%INITFILENAME% ]; then - %INIT%%INITFILENAME% stop -fi - -# Remove Wicd from the boot sequence -if which update-rc.d &>/dev/null ; then - update-rc.d -f wicd remove -fi - -# Remove pyc files -# They may exist if you are upgrading Wicd -rm -f /opt/wicd/*.pyc - -# Add Wicd to the startup sequence -# 80 to make sure that dbus is running when Wicd starts -if which update-rc.d &>/dev/null ; then - update-rc.d wicd start 80 2 3 4 5 . stop 20 0 1 6 . -fi - -# Start the daemon -if [ -f %INIT%%INITFILENAME% ]; then - %INIT%%INITFILENAME% start -fi