> Ross Vandegrift schrieb: > > Hello everyone, > > > > As I mentioned earlier, I've been playing a bit with getting > > NetworkManager support to do good stuff in E. This patch updates > > e_dbus to use the most accurate NM interface that I could find. > > > > The patch adds all the functionality required, but I am too dumb to > > figure out how to get "cvs diff -N" to work like "diff -N" and > > actually include the new file. Instead, I've attached the missing > > file which will need to go into src/lib/nm/ for e_dbus. > >
I'm not able to apply this patch cleanly. Which is surprising, as viewvc shows no changes have to been made to e_dbus/src/lib/nm in 4 months. Here's what a dry run shows me: patching file src/lib/nm/E_Nm.h patching file src/lib/nm/Makefile.am Hunk #1 FAILED at 12. 1 out of 1 hunk FAILED -- saving rejects to file src/lib/nm/Makefile.am.rej patching file src/lib/nm/e_nm_device.c Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file src/lib/nm/e_nm_device.c.rej patching file src/lib/nm/e_nm_manager.c Hunk #1 succeeded at 1 with fuzz 1. Hunk #2 FAILED at 9. Hunk #3 FAILED at 20. 2 out of 3 hunks FAILED -- saving rejects to file src/lib/nm/e_nm_manager.c.rej patching file src/lib/nm/e_nm_private.h patching file src/lib/nm/e_nm_util.c Hunk #1 FAILED at 1. Hunk #2 FAILED at 135. 2 out of 2 hunks FAILED -- saving rejects to file src/lib/nm/e_nm_util.c.rej Could you please do a "cvs add e_nm_network.c" and attach the output of "cvs diff -uN". Thanks ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
