Download as
Browse Code »

Commit f064b6ad67153428f660e48f22abb59f7cb49421

Authored by Perry Werneck
1 parent 9374f881
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Renaming application transfer file dialog to avoid conflicts.

Showing 2 changed files with 6 additions and 4 deletions   Show diff stats
src/pw3270/ft/filetransfer.c
  Diff comments   View file @f064b6a
@@ -223,7 +223,7 @@ static void ft_update(H3270 *hSession, unsigned long current, unsigned long leng @@ -223,7 +223,7 @@ static void ft_update(H3270 *hSession, unsigned long current, unsigned long leng
223 v3270_ft_progress_update(GTK_WIDGET(widget), current, length, kbytes_sec); 223 v3270_ft_progress_update(GTK_WIDGET(widget), current, length, kbytes_sec);
224 } 224 }
225 225
226 -gint v3270_transfer_file(GtkWidget *widget, LIB3270_FT_OPTION options, const gchar *local, const gchar *remote, int lrecl, int blksize, int primspace, int secspace, int dft) 226 +gint pw3270_transfer_file(GtkWidget *widget, LIB3270_FT_OPTION options, const gchar *local, const gchar *remote, int lrecl, int blksize, int primspace, int secspace, int dft)
227 { 227 {
228 g_return_val_if_fail(GTK_IS_V3270(widget),0); 228 g_return_val_if_fail(GTK_IS_V3270(widget),0);
229 229
@@ -245,7 +245,6 @@ gint v3270_transfer_file(GtkWidget *widget, LIB3270_FT_OPTION options, const gch @@ -245,7 +245,6 @@ gint v3270_transfer_file(GtkWidget *widget, LIB3270_FT_OPTION options, const gch
245 245
246 lib3270_ft_set_user_data(hSession,progress); 246 lib3270_ft_set_user_data(hSession,progress);
247 247
248 -  
249 struct lib3270_ft_callbacks *cbk = lib3270_get_ft_callbacks(hSession,sizeof(struct lib3270_ft_callbacks)); 248 struct lib3270_ft_callbacks *cbk = lib3270_get_ft_callbacks(hSession,sizeof(struct lib3270_ft_callbacks));
250 249
251 cbk->complete = ft_complete; 250 cbk->complete = ft_complete;
@@ -314,7 +313,7 @@ void download_action(GtkAction *action, GtkWidget *widget) @@ -314,7 +313,7 @@ void download_action(GtkAction *action, GtkWidget *widget)
314 ft_dialog_save(dialog,name); 313 ft_dialog_save(dialog,name);
315 gtk_widget_hide(dialog); 314 gtk_widget_hide(dialog);
316 315
317 - v3270_transfer_file( widget, 316 + pw3270_transfer_file( widget,
318 v3270_ft_dialog_get_options(dialog), 317 v3270_ft_dialog_get_options(dialog),
319 v3270_ft_dialog_get_local_filename(dialog), 318 v3270_ft_dialog_get_local_filename(dialog),
320 v3270_ft_dialog_get_host_filename(dialog), 319 v3270_ft_dialog_get_host_filename(dialog),
@@ -358,7 +357,7 @@ void upload_action(GtkAction *action, GtkWidget *widget) @@ -358,7 +357,7 @@ void upload_action(GtkAction *action, GtkWidget *widget)
358 ft_dialog_save(dialog,name); 357 ft_dialog_save(dialog,name);
359 gtk_widget_hide(dialog); 358 gtk_widget_hide(dialog);
360 359
361 - v3270_transfer_file( widget, 360 + pw3270_transfer_file( widget,
362 v3270_ft_dialog_get_options(dialog), 361 v3270_ft_dialog_get_options(dialog),
363 v3270_ft_dialog_get_local_filename(dialog), 362 v3270_ft_dialog_get_local_filename(dialog),
364 v3270_ft_dialog_get_host_filename(dialog), 363 v3270_ft_dialog_get_host_filename(dialog),
src/pw3270/ft/v3270ft.h
  Diff comments   View file @f064b6a
@@ -97,6 +97,9 @@ @@ -97,6 +97,9 @@
97 LIB3270_EXPORT void v3270_ft_progress_set_filenames(GtkWidget *widget, const gchar *from, const gchar *to); 97 LIB3270_EXPORT void v3270_ft_progress_set_filenames(GtkWidget *widget, const gchar *from, const gchar *to);
98 LIB3270_EXPORT void v3270_ft_progress_complete(GtkWidget *widget,unsigned long length,double kbytes_sec); 98 LIB3270_EXPORT void v3270_ft_progress_complete(GtkWidget *widget,unsigned long length,double kbytes_sec);
99 99
  100 + // File transfer
  101 + LIB3270_EXPORT gint pw3270_transfer_file(GtkWidget *widget, LIB3270_FT_OPTION options, const gchar *local, const gchar *remote, int lrecl, int blksize, int primspace, int secspace, int dft);
  102 +
100 103
101 G_END_DECLS 104 G_END_DECLS
102 105