# HG changeset patch
# User masneyb
# Date 1154087470 0
# Node ID afe56dd107ca55d7eca5a6a4bdf9579a7e5f25de
# Parent  0e7ab0a51dddc878f3349769c58be751b1d3a068
2006-7-28 Brian Masney <masneyb@gftp.org>

        * src/gtk/gftp-gtk.h src/gtk/gftp-gtk.c - remember the last protocol
        that was used in the toolbar

diff -r 0e7ab0a51ddd -r afe56dd107ca ChangeLog
--- a/ChangeLog	Fri Jul 28 11:20:05 2006 +0000
+++ b/ChangeLog	Fri Jul 28 11:51:10 2006 +0000
@@ -1,4 +1,7 @@
 2006-7-28 Brian Masney <masneyb@gftp.org>
+	* src/gtk/gftp-gtk.h src/gtk/gftp-gtk.c - remember the last protocol
+	that was used in the toolbar
+
 	* src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h src/gtk/misc-gtk.c - warning
 	fixes when creating the system menus. Removed some unused global
 	variables.
@@ -3501,7 +3504,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.458 2006/07/28 11:20:04 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.459 2006/07/28 11:51:09 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 0e7ab0a51ddd -r afe56dd107ca src/gtk/gftp-gtk.c
--- a/src/gtk/gftp-gtk.c	Fri Jul 28 11:20:05 2006 +0000
+++ b/src/gtk/gftp-gtk.c	Fri Jul 28 11:51:10 2006 +0000
@@ -22,12 +22,12 @@
 
 static GtkItemFactory *log_factory, *dl_factory;
 static GtkWidget * local_frame, * remote_frame, * log_table, * transfer_scroll,
-                 * gftpui_command_toolbar;
+                 * gftpui_command_toolbar, * protocol_menu;
 
 gftp_window_data window1, window2, *other_wdata, *current_wdata;
 GtkWidget * stop_btn, * hostedit, * useredit, * passedit, * portedit, * logwdw,
-          * dlwdw, * protocol_menu, * optionmenu, * gftpui_command_widget,
-          * download_left_arrow, * upload_right_arrow, * openurl_btn;
+          * dlwdw, * optionmenu, * gftpui_command_widget, * download_left_arrow,
+          * upload_right_arrow, * openurl_btn;
 GtkTooltips * openurl_tooltip;
 GtkAdjustment * logwdw_vadj;
 #if GTK_MAJOR_VERSION > 1
@@ -58,6 +58,7 @@
 _gftp_exit (GtkWidget * widget, gpointer data)
 {
   const char *tempstr;
+  GtkWidget * tempwid;
   intptr_t ret;
 
   ret = GTK_WIDGET (local_frame)->allocation.width;
@@ -109,6 +110,10 @@
   tempstr = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (useredit)->entry));
   gftp_set_global_option ("user_value", tempstr);
 
+  tempwid = gtk_menu_get_active (GTK_MENU (protocol_menu));
+  ret = GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (tempwid)));
+  gftp_set_global_option ("default_protocol", gftp_protocols[ret].name);
+
   gftp_shutdown ();
   exit (0);
 }
diff -r 0e7ab0a51ddd -r afe56dd107ca src/gtk/gftp-gtk.h
--- a/src/gtk/gftp-gtk.h	Fri Jul 28 11:20:05 2006 +0000
+++ b/src/gtk/gftp-gtk.h	Fri Jul 28 11:51:10 2006 +0000
@@ -178,7 +178,7 @@
 
 extern gftp_window_data window1, window2, * other_wdata, * current_wdata;
 extern GtkWidget * stop_btn, * hostedit, * useredit, * passedit,
-                 * portedit, * logwdw, * dlwdw, * protocol_menu, * optionmenu,
+                 * portedit, * logwdw, * dlwdw, * optionmenu,
                  * gftpui_command_widget, * download_left_arrow,
                  * upload_right_arrow, * openurl_btn;
 extern GtkTooltips * openurl_tooltip;