Commit Graph
39 Commits
Author SHA1 Message Date
Robby Workman c526c47c84 Merged NaCl's latest revision (used bzr merge --weave as it handled the
conflicts much better) (and no, I'm not even sure *why* there were
conflicts).
2009-01-12 00:21:09 -06:00
Robby Workman 04f4a31cd5 Merged Adam's latest 1.6-noexpander branch. There was a conflict in
data/wicd.glade around line 450-something -- the y_options flag was
removed in the noexpander branch.  I wasn't sure whether that was
intentional or not, so I left it in to resolve the conflict.  If that
was the wrong decision, it can be fixed later :)
2009-01-12 00:17:20 -06:00
Robby Workman f5993ea659 Merged upstream experimental branch. 2009-01-12 00:16:34 -06:00
Robby Workman b7fd14cdda Merged r238 of NaCl's branch. 2009-01-07 22:26:31 -06:00
Robby Workman bb8cfb2b9d Added logic for kde4-config (kde4's equivalent to kde-config) 2009-01-05 23:12:49 -06:00
Robby Workman e00f80c757 Merged latest changes from NaCl. 2009-01-05 10:25:59 -06:00
Robby Workman c60713cdd6 s/Tenative/Tentative/g in wicd-curses(8) 2009-01-04 02:31:01 -06:00
Robby Workman f29e6cb1f4 Merged latest nacl branch. 2009-01-04 02:27:44 -06:00
Robby Workman 944c53f7cd Removed a blank line from the end of the slackware init script.
Trivial, but annoying on upgrades for the config() .new stuff.
2009-01-03 00:08:53 -06:00
Robby Workman 1a7d9cc071 Merged in the frankencurses branch, which is basically NaCl's branch
plus integration with setup.py and related files.
2009-01-02 21:43:55 -06:00
Robby Workman 48910f50ea Merged in latest from NaCl's branch. 2009-01-02 21:22:17 -06:00
Robby Workman feedd7b6c5 Merged r237 of mainline. 2009-01-02 20:57:47 -06:00
Robby Workman 40bc486b2e Merged mainline r237 (which includes the changes from here). 2009-01-02 20:54:12 -06:00
Robby Workman 93ef894c45 Removed "in keys" from line 415 per NaCl's suggestion. 2009-01-02 20:25:16 -06:00
Robby Workman 066237718f Fixed up setup.py and wpath.py to install the curses client.
Added a wicd-curses wrapper script to /usr/bin
Made curses *.py files executable
All of this passes the build test, but not the "WFM" test. :)
2009-01-01 02:02:26 -06:00
Robby Workman 4798d26f9a Merged my experimental branch into this. 2009-01-01 01:43:00 -06:00
Robby Workman 908267f059 Merged NaCl's curses branch into this. 2009-01-01 01:42:20 -06:00
Robby Workman 62ce9b9852 If kde-config fails, then assume kde is not installed, and don't
install the autostart file for kde.
2008-12-31 23:53:30 -06:00
Robby Workman f67c171b2c Merged r234 from mainline. 2008-12-31 15:52:27 -06:00
Robby Workman 5de0569fab Merged r233 from mainline 2008-12-30 20:07:52 -06:00
Robby Workman 4e1ac3e43f Merged r232 from mainline. 2008-12-28 19:24:37 -06:00
Robby Workman b3d695d0ba Fix permissions on peap-tkip template. 2008-12-28 19:22:15 -06:00
Robby Workman da5fc2dfdf Merged autoconnect.py and suspend.py changes from trunk (fixes for
the pm-utils sleep hook usage).
2008-12-28 00:19:25 -06:00
Robby Workman f35e5513ca Merged latest changes from mainline experimental branch. 2008-12-27 19:38:12 -06:00
Robby Workman 744324eb2e Merge in the changes to trunk's pm-utils sleep hook. 2008-12-27 19:21:45 -06:00
Robby Workman ad6ddbfbae Fixup pm-utils hook to return proper exit codes and fix logging. 2008-12-27 00:37:03 -06:00
Robby Workman d0918cb0b8 Merged r229 from mainline experimental. 2008-12-24 11:30:07 -06:00
Robby Workman 2842180265 Add "CHANGES" file to the list of documentation installed. 2008-12-23 01:50:16 -06:00
Robby Workman 48160df95b Add support for configurable Unix group to be used - basically, users
must be a member of this group in order to use Wicd.  Note that this
  does not apply on systems configured to use ConsoleKit/PAM/et al.
This defaults to use the "users" group so that it will work "out of the
  box" for most people, but distributions are encouraged to edit it
  as needed with the "--wicdgroup=whatever" configure argument.
2008-12-23 01:47:53 -06:00
Robby Workman c9b25937b3 Removed execute perms from other/wicd.conf 2008-12-23 01:20:48 -06:00
Robby Workman cb9a78968a Fix (I think) dbus errors, or at least this is one way to fix them.
If this is the *right* way, then it still needs work to support it
in setup.py
2008-12-23 01:17:30 -06:00
Robby Workman 2d6a33f1b0 Merged new prefs dialog from mainline experimental 2008-12-22 23:34:47 -06:00
Robby Workman 165181b8ec Merge r220 upstream. 2008-12-23 04:40:47 +00:00
Robby Workman 7a987061df Merged r219 from main experimental branch. 2008-12-22 17:14:55 +00:00
Robby Workman 3db1b46a0a Merged r213 of main experimental branch 2008-12-15 17:40:07 +00:00
Robby Workman 19691e2b7c Remove extraneous comments from setup.py and clean up a few of them.
This is definitely trivial crap...
2008-12-14 07:58:58 +00:00
Robby Workman f3d9dcaf1e Merged main experimental branch
Fixed kde autostart directory setting
2008-12-14 07:43:44 +00:00
Robby Workman 7b305dc3fa Merged main experimental branch changes as of r208. 2008-12-13 22:11:56 +00:00
Robby Workman 7c3f9ca5c1 Fixed (I think) the pkg-config and kde-config tests. This needs more
testing though before I'm sure.  Big thanks to "nanotube" for the
  suggestions and code for this.
2008-12-13 22:06:00 +00:00