# HG changeset patch
# User masneyb
# Date 1099623926 0
# Node ID 7b9779d175b6e9166aa279c3e87f413b77b59d79
# Parent  04aff709924af285087f84e188c1fc2c063b0823
2004-11-4 Brian Masney <masneyb@gftp.org>

        * src/gtk/gftp-gtk.c - added mnemonics for the host and user field
        in the toolbar

diff -r 04aff709924a -r 7b9779d175b6 ChangeLog
--- a/ChangeLog	Fri Nov 05 02:35:31 2004 +0000
+++ b/ChangeLog	Fri Nov 05 03:05:26 2004 +0000
@@ -1,4 +1,7 @@
 2004-11-4 Brian Masney <masneyb@gftp.org>
+	* src/gtk/gftp-gtk.c - added mnemonics for the host and user field
+	in the toolbar
+
 	* docs/sample.gftp/gftprc - updated the default config file
 
 	* src/gtk/bookmarks.c (entry_apply_changes) - more cleanups to this
@@ -3031,7 +3034,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.362 2004/11/05 02:35:31 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.363 2004/11/05 03:05:26 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 04aff709924a -r 7b9779d175b6 src/gtk/gftp-gtk.c
--- a/src/gtk/gftp-gtk.c	Fri Nov 05 02:35:31 2004 +0000
+++ b/src/gtk/gftp-gtk.c	Fri Nov 05 03:05:26 2004 +0000
@@ -322,7 +322,7 @@
     {N_("/Tools/tearoff"), NULL, 0, 0, MN_("<Tearoff>")},
     {N_("/Tools/Compare Windows"), NULL, compare_windows, 0, MN_(NULL)},
     {N_("/Tools/Clear Cache"), NULL, clear_cache, 0, MS_(GTK_STOCK_CLEAR)},
-    {N_("/_Help"), NULL, 0, 0, MN_("<Branch>")},
+    {N_("/Help"), NULL, 0, 0, MN_("<Branch>")},
     {N_("/Help/tearoff"), NULL, 0, 0, MN_("<Tearoff>")},
     {N_("/Help/About"), NULL, about_dialog, 0, MS_(GTK_STOCK_HELP)}
   };
@@ -444,7 +444,12 @@
   gtk_container_border_width (GTK_CONTAINER (openurl_btn), 1);
   gtk_box_pack_start (GTK_BOX (box), openurl_btn, FALSE, FALSE, 0);
 
+#if GTK_MAJOR_VERSION == 1
   tempwid = gtk_label_new (_("Host: "));
+#else
+  tempwid = gtk_label_new_with_mnemonic (_("_Host: "));
+#endif
+
   gtk_box_pack_start (GTK_BOX (box), tempwid, FALSE, FALSE, 0);
 
   hostedit = gtk_combo_new ();
@@ -460,6 +465,10 @@
 
   gtk_combo_disable_activate (GTK_COMBO (hostedit));
   gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (hostedit)->entry), "");
+#if GTK_MAJOR_VERSION > 1
+  gtk_label_set_mnemonic_widget (GTK_LABEL (tempwid),
+                                 GTK_COMBO (hostedit)->entry);
+#endif
   gtk_box_pack_start (GTK_BOX (box), hostedit, TRUE, TRUE, 0);
 
   tempwid = gtk_label_new (_("Port: "));
@@ -480,7 +489,11 @@
   gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (portedit)->entry), "");
   gtk_box_pack_start (GTK_BOX (box), portedit, FALSE, FALSE, 0);
 
+#if GTK_MAJOR_VERSION == 1
   tempwid = gtk_label_new (_("User: "));
+#else
+  tempwid = gtk_label_new_with_mnemonic (_("_User: "));
+#endif
   gtk_box_pack_start (GTK_BOX (box), tempwid, FALSE, FALSE, 0);
 
   useredit = gtk_combo_new ();
@@ -496,6 +509,10 @@
 
   gtk_combo_disable_activate (GTK_COMBO (useredit));
   gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (useredit)->entry), "");
+#if GTK_MAJOR_VERSION > 1
+  gtk_label_set_mnemonic_widget (GTK_LABEL (tempwid),
+                                 GTK_COMBO (useredit)->entry);
+#endif
   gtk_box_pack_start (GTK_BOX (box), useredit, TRUE, TRUE, 0);
 
   tempwid = gtk_label_new (_("Pass: "));