diff src/gtk/dnd.c @ 129:fe0b21c006f6

2003-4-13 Brian Masney <[e-mail]> * lib/config_file.c - implemented gftp_set_global_option() * lib/gftp.h lib/misc.c - added gftp_tdata_new() * src/text/gftp-text.c src/gtk/transfer.c - use gftp_tdata_new() * src/gtk/bookmarks.c - In run_bookmark(), use gftp_parse_bookmark() function. Renamed all instances of gftp_bookmarks to gftp_bookmarks_var * src/gtk/gftp-gtk.[ch] - added global variables viewedit_processes and viewedit_processes_done. These used to be declared in lib/options.h * src/gtk/gftp-gtk.h (struct gftp_window_data) - removed sortcol and sortasds variables. Added prefix_col_str variable. This will either be local or remote * src/gtk/misc-gtk.c - removed r_gethostbyname() and r_getservbyname() * src/gtk/transfer.c - removed gftp_gtk_calc_kbs(), get_status() and parse_attribs(). These are in the lib/ directory now. Also, use g_static_mutex_*() functions from glib instead of pthread_mutex_*() * src/gtk/bookmark.c src/gtk/dnd.c src/gtk/menu-items.c src/gtk/transfer.c - use g_strdup() instead of g_malloc()/strcpy() * src/gtk/options_dialog.c - commented out large parts of this file. This file is busted at the moment * src/gtk/*.[ch] - Use new configuration interface in all source files. Updated copyright dates on all source files

--- a/src/gtk/dnd.c	Fri Apr 11 06:35:43 2003 +0000
+++ b/src/gtk/dnd.c	Sun Apr 13 15:21:13 2003 +0000
@@ -78,12 +78,10 @@
     fromwdata = NULL;
 
   *(pos - 1) = '/';
-  newfle->file = g_malloc (strlen (current_ftpdata->directory) + 1);
-  strcpy (newfle->file, current_ftpdata->directory);
+  newfle->file = g_strdup (current_ftpdata->directory);
   *(pos - 1) = '\0';
   
-  newfle->destfile = g_strconcat (GFTP_GET_DIRECTORY (wdata->request),
-                                     "/", pos, NULL);
+  newfle->destfile = g_strconcat (wdata->request->directory, "/", pos, NULL);
   templist = g_malloc0 (sizeof (*templist));
   templist->data = newfle;
   templist->next = NULL;
@@ -151,32 +149,32 @@
         continue;
 
       oldlen = totlen;
-      if (GFTP_GET_HOSTNAME (wdata->request) == NULL || 
+      if (wdata->request->hostname == NULL || 
           wdata->request->protonum == GFTP_LOCAL_NUM)
         {
           tempstr = g_strdup_printf ("%s://%s/%s ", 
-                                 GFTP_GET_URL_PREFIX (wdata->request),
-                                 GFTP_GET_DIRECTORY (wdata->request), 
+                                 wdata->request->url_prefix,
+                                 wdata->request->directory, 
                                  tempfle->file);
         }
-      else if (GFTP_GET_USERNAME (wdata->request) == NULL 
-               || *GFTP_GET_USERNAME (wdata->request) == '\0')
+      else if (wdata->request->username == NULL 
+               || *wdata->request->username == '\0')
         {
           tempstr = g_strdup_printf ("%s://%s:%d%s/%s ", 
-                                 GFTP_GET_URL_PREFIX (wdata->request),
-                                 GFTP_GET_HOSTNAME (wdata->request),
-                                 GFTP_GET_PORT (wdata->request),
-                                 GFTP_GET_DIRECTORY (wdata->request), 
+                                 wdata->request->url_prefix,
+                                 wdata->request->hostname,
+                                 wdata->request->port,
+                                 wdata->request->directory, 
                                  tempfle->file);
         }
       else
         {
           tempstr = g_strdup_printf ("%s://%s@%s:%d%s/%s ", 
-                                 GFTP_GET_URL_PREFIX (wdata->request),
-                                 GFTP_GET_USERNAME (wdata->request), 
-                                 GFTP_GET_HOSTNAME (wdata->request),
-                                 GFTP_GET_PORT (wdata->request),
-                                 GFTP_GET_DIRECTORY (wdata->request), 
+                                 wdata->request->url_prefix,
+                                 wdata->request->username, 
+                                 wdata->request->hostname,
+                                 wdata->request->port,
+                                 wdata->request->directory, 
                                  tempfle->file);
         }