comparison src/gtk/bookmarks.c @ 555:7f54d0c0edbc

2004-9-17 Brian Masney <masneyb@gftp.org> * lib/misc.c lib/cache.c lib/config_file.c lib/gftp.h lib/protocols.c lib/rfc2068.c lib/sshv2.c src/gtk/bookmarks.c src/gtk/dnd.c src/gtk/gftp-gtk.c src/gtk/gtkui.c src/gtk/menu-items.c src/gtk/misc-gtk.c src/gtk/transfer.c src/uicommon/gftpui.c - added gftp_request argument to gftp_build_path() and expand_path(). Renamed expand_path() to gftp_expand_path() * lib/gftp.h - fixed compile error in gftp_need_username macro
author masneyb
date Fri, 17 Sep 2004 23:37:47 +0000
parents 79908ac335d2
children 447f40a61ee8
comparison
equal deleted inserted replaced
554:a8ca3e349d4a 555:7f54d0c0edbc
689 { 689 {
690 tempchar = *pos; 690 tempchar = *pos;
691 *pos = '\0'; 691 *pos = '\0';
692 } 692 }
693 693
694 origpath = newpath = gftp_build_path (entry->path, gtk_entry_get_text (GTK_ENTRY (bm_pathedit)), NULL); 694 origpath = newpath = gftp_build_path (NULL, entry->path,gtk_entry_get_text (GTK_ENTRY (bm_pathedit)), NULL);
695 *pos = tempchar; 695 *pos = tempchar;
696 696
697 str = gtk_entry_get_text (GTK_ENTRY (bm_hostedit)); 697 str = gtk_entry_get_text (GTK_ENTRY (bm_hostedit));
698 if (entry->hostname) 698 if (entry->hostname)
699 g_free (entry->hostname); 699 g_free (entry->hostname);
755 g_hash_table_remove (new_bookmarks_htable, tempentry->path); 755 g_hash_table_remove (new_bookmarks_htable, tempentry->path);
756 756
757 if (*(tempentry->path + oldpathlen) == '\0') 757 if (*(tempentry->path + oldpathlen) == '\0')
758 tempstr = g_strdup (newpath); 758 tempstr = g_strdup (newpath);
759 else 759 else
760 tempstr = gftp_build_path (newpath, tempentry->path + oldpathlen, NULL); 760 tempstr = gftp_build_path (NULL, newpath,
761 tempentry->path + oldpathlen, NULL);
761 762
762 g_free (tempentry->path); 763 g_free (tempentry->path);
763 tempentry->path = tempstr; 764 tempentry->path = tempstr;
764 g_hash_table_insert (new_bookmarks_htable, tempentry->path, 765 g_hash_table_insert (new_bookmarks_htable, tempentry->path,
765 tempentry); 766 tempentry);