1 files changed, 15 insertions, 5 deletions

diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 103cdce9..c742bd13 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -365,6 +365,7 @@ selectFile(const char * oldfilename) {
 void on_mainFileSharingInsertBrowseButton_clicked_fs(GtkWidget * browseButton,
                                                      gpointer dummy) {
   char * filename;
+  char * ofn;
   const char *oldfilename;
   GtkWidget * uploadLine;
   GtkEntry * entry;
@@ -375,8 +376,17 @@ void on_mainFileSharingInsertBrowseButton_clicked_fs(GtkWidget * browseButton,
                                     "uploadFilenameComboBoxEntry");
   entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(uploadLine)));
   oldfilename = gtk_entry_get_text(entry);
-  if (NULL == (filename = selectFile(oldfilename)))
-    return;  
+  if (oldfilename == NULL) 
+    oldfilename = getenv("PWD");
+  if (oldfilename == NULL)
+    oldfilename = getenv("HOME");
+  if (oldfilename == NULL)
+    oldfilename = "/";
+  ofn = string_expandFileName(ectx, oldfilename);
+  filename = selectFile(ofn);
+  FREE(ofn);
+  if (NULL == filename)
+    return;    
   gtk_entry_set_text(entry,
                      filename);
   model = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(uploadLine)));
@@ -435,7 +445,7 @@ void on_clearCompletedUploadsButton_clicked_fs(void * unused,
   uploadList = glade_xml_get_widget(getMainXML(),
                                     "activeUploadsList");
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(uploadList));
-  gtk_tree_selection_selected_foreach
+  ggc_tree_selection_selected_foreach
     (selection,
      &clearCompletedUploadCallback,
      NULL);
@@ -469,7 +479,7 @@ void on_abortUploadButton_clicked_fs(void * unused,
   uploadList = glade_xml_get_widget(getMainXML(),
                                     "activeUploadsList");
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(uploadList));
-  gtk_tree_selection_selected_foreach
+  ggc_tree_selection_selected_foreach
     (selection,
      &fsuiCallUploadCallback,
      &FSUI_abortUpload);
@@ -483,7 +493,7 @@ void on_stopUploadButton_clicked_fs(void * unused,
   uploadList = glade_xml_get_widget(getMainXML(),
                                     "activeUploadsList");
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(uploadList));
-  gtk_tree_selection_selected_foreach
+  ggc_tree_selection_selected_foreach
     (selection,
      &fsuiCallUploadCallback,
      &FSUI_stopUpload);