diff options
Diffstat (limited to 'src/plugins/fs/upload.c')
-rw-r--r-- | src/plugins/fs/upload.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c index 329e085d..8c037e5f 100644 --- a/src/plugins/fs/upload.c +++ b/src/plugins/fs/upload.c | |||
@@ -105,7 +105,7 @@ void fs_upload_stopped(UploadList * list) { | |||
105 | &iter, | 105 | &iter, |
106 | path); | 106 | path); |
107 | gtk_tree_path_free(path); | 107 | gtk_tree_path_free(path); |
108 | gtk_tree_row_reference_free(list->summaryViewRowReference); | 108 | gtk_tree_row_reference_free(list->summaryViewRowReference); |
109 | list->summaryViewRowReference = NULL; | 109 | list->summaryViewRowReference = NULL; |
110 | gtk_tree_store_remove(upload_summary, | 110 | gtk_tree_store_remove(upload_summary, |
111 | &iter); | 111 | &iter); |
@@ -113,7 +113,7 @@ void fs_upload_stopped(UploadList * list) { | |||
113 | if (list->uri != NULL) { | 113 | if (list->uri != NULL) { |
114 | ECRS_freeUri(list->uri); | 114 | ECRS_freeUri(list->uri); |
115 | list->uri = NULL; | 115 | list->uri = NULL; |
116 | } | 116 | } |
117 | if (upload_head == list) | 117 | if (upload_head == list) |
118 | upload_head = list->next; | 118 | upload_head = list->next; |
119 | else { | 119 | else { |
@@ -129,7 +129,7 @@ void fs_upload_stopped(UploadList * list) { | |||
129 | FREE(list); | 129 | FREE(list); |
130 | } | 130 | } |
131 | 131 | ||
132 | UploadList * | 132 | UploadList * |
133 | fs_upload_started(struct FSUI_UploadList * fsui, | 133 | fs_upload_started(struct FSUI_UploadList * fsui, |
134 | UploadList * parent, | 134 | UploadList * parent, |
135 | const char * filename, | 135 | const char * filename, |
@@ -175,7 +175,7 @@ fs_upload_started(struct FSUI_UploadList * fsui, | |||
175 | UPLOAD_FILENAME, filename, | 175 | UPLOAD_FILENAME, filename, |
176 | UPLOAD_PROGRESS, progress, | 176 | UPLOAD_PROGRESS, progress, |
177 | UPLOAD_URISTRING, "", /* FIXME: set if URI != NULL! */ | 177 | UPLOAD_URISTRING, "", /* FIXME: set if URI != NULL! */ |
178 | UPLOAD_INTERNAL, ret, | 178 | UPLOAD_INTERNAL, ret, |
179 | -1); | 179 | -1); |
180 | path = gtk_tree_model_get_path(GTK_TREE_MODEL(upload_summary), | 180 | path = gtk_tree_model_get_path(GTK_TREE_MODEL(upload_summary), |
181 | &iter); | 181 | &iter); |
@@ -325,7 +325,7 @@ void on_fsinsertuploadbutton_clicked_fs(gpointer dummy, | |||
325 | 325 | ||
326 | #ifndef MINGW | 326 | #ifndef MINGW |
327 | 327 | ||
328 | static char * | 328 | static char * |
329 | selectFile(const char * oldfilename) { | 329 | selectFile(const char * oldfilename) { |
330 | GladeXML * uploadXML; | 330 | GladeXML * uploadXML; |
331 | GtkFileChooser * dialog; | 331 | GtkFileChooser * dialog; |
@@ -341,10 +341,10 @@ selectFile(const char * oldfilename) { | |||
341 | gtk_file_chooser_set_filename(dialog, | 341 | gtk_file_chooser_set_filename(dialog, |
342 | oldfilename); | 342 | oldfilename); |
343 | if (getToggleButtonValue(getMainXML(), | 343 | if (getToggleButtonValue(getMainXML(), |
344 | "scopeRecursiveButton")) | 344 | "scopeRecursiveButton")) |
345 | gtk_file_chooser_set_action(dialog, | 345 | gtk_file_chooser_set_action(dialog, |
346 | GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); | 346 | GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); |
347 | if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_CANCEL) | 347 | if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_CANCEL) |
348 | ret = gtk_file_chooser_get_filename(dialog); | 348 | ret = gtk_file_chooser_get_filename(dialog); |
349 | else | 349 | else |
350 | ret = NULL; | 350 | ret = NULL; |
@@ -355,7 +355,7 @@ selectFile(const char * oldfilename) { | |||
355 | 355 | ||
356 | #else /* MINGW */ | 356 | #else /* MINGW */ |
357 | 357 | ||
358 | static char * | 358 | static char * |
359 | selectFile(const char * oldfilename) { | 359 | selectFile(const char * oldfilename) { |
360 | if (getToggleButtonValue(getMainXML(), | 360 | if (getToggleButtonValue(getMainXML(), |
361 | "scopeFileOnlyButton")) | 361 | "scopeFileOnlyButton")) |
@@ -380,7 +380,7 @@ void on_mainFileSharingInsertBrowseButton_clicked_fs(GtkWidget * browseButton, | |||
380 | "uploadFilenameComboBoxEntry"); | 380 | "uploadFilenameComboBoxEntry"); |
381 | entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(uploadLine))); | 381 | entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(uploadLine))); |
382 | oldfilename = gtk_entry_get_text(entry); | 382 | oldfilename = gtk_entry_get_text(entry); |
383 | if (oldfilename == NULL) | 383 | if (oldfilename == NULL) |
384 | oldfilename = getenv("PWD"); | 384 | oldfilename = getenv("PWD"); |
385 | if (oldfilename == NULL) | 385 | if (oldfilename == NULL) |
386 | oldfilename = getenv("HOME"); | 386 | oldfilename = getenv("HOME"); |
@@ -390,7 +390,7 @@ void on_mainFileSharingInsertBrowseButton_clicked_fs(GtkWidget * browseButton, | |||
390 | filename = selectFile(ofn); | 390 | filename = selectFile(ofn); |
391 | FREE(ofn); | 391 | FREE(ofn); |
392 | if (NULL == filename) | 392 | if (NULL == filename) |
393 | return; | 393 | return; |
394 | gtk_entry_set_text(entry, | 394 | gtk_entry_set_text(entry, |
395 | filename); | 395 | filename); |
396 | model = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(uploadLine))); | 396 | model = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(uploadLine))); |
@@ -401,7 +401,7 @@ void on_mainFileSharingInsertBrowseButton_clicked_fs(GtkWidget * browseButton, | |||
401 | 0, | 401 | 0, |
402 | filename, | 402 | filename, |
403 | -1); | 403 | -1); |
404 | free(filename); | 404 | free(filename); |
405 | } | 405 | } |
406 | 406 | ||
407 | /* FIXME: handlers for clear and stop! */ | 407 | /* FIXME: handlers for clear and stop! */ |
@@ -443,13 +443,13 @@ clearCompletedUploadCallback(GtkTreeModel * model, | |||
443 | } | 443 | } |
444 | 444 | ||
445 | void on_clearCompletedUploadsButton_clicked_fs(void * unused, | 445 | void on_clearCompletedUploadsButton_clicked_fs(void * unused, |
446 | GtkWidget * clearButton) { | 446 | GtkWidget * clearButton) { |
447 | gtk_tree_model_foreach(GTK_TREE_MODEL(upload_summary), | 447 | gtk_tree_model_foreach(GTK_TREE_MODEL(upload_summary), |
448 | &clearCompletedUploadCallback, | 448 | &clearCompletedUploadCallback, |
449 | NULL); | 449 | NULL); |
450 | } | 450 | } |
451 | 451 | ||
452 | static void | 452 | static void |
453 | fsuiCallUploadCallback(GtkTreeModel * model, | 453 | fsuiCallUploadCallback(GtkTreeModel * model, |
454 | GtkTreePath * path, | 454 | GtkTreePath * path, |
455 | GtkTreeIter * iter, | 455 | GtkTreeIter * iter, |