Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
filesystem.c layout_ewl_simple.c
Log Message:
* sFTP support
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/filesystem.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- filesystem.c 2 Feb 2006 21:58:31 -0000 1.40
+++ filesystem.c 5 Feb 2006 11:49:50 -0000 1.41
@@ -245,6 +245,8 @@
/*If the calling request is currently NULL, we must go to the hash to
retrieve that caller */
if (!calling_request) {
+
+ printf("Looking for calling request with folder '%s'\n", folder);
calling_request = ecore_hash_get (evfs_dir_requests, folder);
//printf("Received a file from the hash, path is '%s'\n",
calling_request->file->path);
@@ -330,8 +332,13 @@
entropy_core_gui_event_get
(ENTROPY_GUI_EVENT_FOLDER_CHANGE_CONTENTS_EXTERNAL);
gui_event->data = file_list;
- entropy_core_layout_notify_event (calling_request->requester, gui_event,
+
+ if (calling_request) {
+ entropy_core_layout_notify_event (calling_request->requester,
gui_event,
ENTROPY_EVENT_LOCAL);
+ } else {
+ printf(" [*] Could not get calling request for dir list -
Abort!\n");
+ }
}
@@ -723,6 +730,7 @@
ecore_hash_set (evfs_dir_requests, "/", new_request);
}
else {
+ printf("Setting dir request hash to '%s'\n", path->files[0]->path);
ecore_hash_set (evfs_dir_requests, path->files[0]->path, new_request);
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/layout_ewl_simple.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- layout_ewl_simple.c 4 Feb 2006 01:06:39 -0000 1.41
+++ layout_ewl_simple.c 5 Feb 2006 11:49:50 -0000 1.42
@@ -82,6 +82,7 @@
/*Tmp */
Ewl_Widget *samba_radio;
Ewl_Widget *posix_radio;
+ Ewl_Widget *sftp_radio;
Ewl_Widget *location_add_window;
Ewl_Widget *location_add_name;
Ewl_Widget *location_add_path;
@@ -178,8 +179,14 @@
layout_ewl_simple_add_config_location (instance, display_name, new_uri);
- }
- else if (ewl_checkbutton_is_checked (EWL_CHECKBUTTON (viewer->samba_radio)))
{
+ } else if (ewl_checkbutton_is_checked (EWL_CHECKBUTTON
(viewer->sftp_radio))) {
+ snprintf (new_uri, 2048, "sftp:///%s%s", server,path);
+ printf ("New URI is: '%s'\n", new_uri);
+ layout_ewl_simple_add_header (instance, display_name, new_uri);
+
+ layout_ewl_simple_add_config_location (instance, display_name, new_uri);
+
+ } else if (ewl_checkbutton_is_checked (EWL_CHECKBUTTON
(viewer->samba_radio))) {
if (server) {
if (username && password) {
snprintf (new_uri, 2048, "smb://%s:%s@/%s%s", username, password,
@@ -199,6 +206,7 @@
printf ("Server required for remote file systems!\n");
}
}
+
else {
printf ("No filesystem selected!\n");
}
@@ -335,6 +343,21 @@
samba_radio);
ewl_widget_show (((entropy_layout_gui *) instance->data)->samba_radio);
+ ((entropy_layout_gui *) instance->data)->sftp_radio =
+ ewl_radiobutton_new ();
+ ewl_button_label_set (EWL_BUTTON
+ (((entropy_layout_gui *) instance->data)->
+ sftp_radio), "Sftp");
+ ewl_radiobutton_chain_set (EWL_RADIOBUTTON
+ (((entropy_layout_gui *) instance->data)->
+ sftp_radio),
+ EWL_RADIOBUTTON (((entropy_layout_gui *)
+ instance->data)->samba_radio));
+ ewl_container_child_append (EWL_CONTAINER (vbox2),
+ ((entropy_layout_gui *) instance->data)->
+ sftp_radio);
+ ewl_widget_show (((entropy_layout_gui *) instance->data)->sftp_radio);
+
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs