Mercurial > gftp.yaz

--- a/ChangeLog	Thu Dec 02 22:43:32 2004 +0000
+++ b/ChangeLog	Thu Dec 02 23:19:31 2004 +0000
@@ -1,4 +1,17 @@
 2004-12-2 Brian Masney <masneyb@gftp.org>
+	* src/gtk/gtkui.c (gftpui_run_function_callback)
+	src/uicommon/gftpui.h - added toggled variable to the
+	gftpui_callback_data structure. If the edit dialog had a checkbox
+	in it, then put the checkbox value in the toggled variable
+
+	* src/gtk/gtkui.c (gftpui_site_dialog)
+	src/uicommon/gftpuicallbacks.c (gftpui_common_run_site) - allow the user
+	to not send the prepend the command with the SITE keyword
+
+	* docs/website/index.html.in docs/website/bats.gif
+	docs/website/generate-gftp-website.pl - updated bug reporting section.
+	Added link and graphic for the National Speleological Society (NSS)
+
 	* lib/sshv2.c (sshv2_rename) - fixed segfault that could occur (from
         Aurelien Jarno <aurelien@aurel32.net >) (closes #159963)

@@ -3121,7 +3134,7 @@

 	* cvsclean - added this script

-	* *.[ch] - added $Id: ChangeLog,v 1.374 2004/12/02 22:43:32 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.375 2004/12/02 23:19:30 masneyb Exp $ tags

 	* debian/* - updated files from Debian maintainer
Binary file docs/website/bats.gif has changed
--- a/docs/website/generate-gftp-website.pl	Thu Dec 02 22:43:32 2004 +0000
+++ b/docs/website/generate-gftp-website.pl	Thu Dec 02 23:19:31 2004 +0000
@@ -19,7 +19,7 @@
            "STABLE_I386DEB_GTK" => "gftp-gtk_" . $version . "-1_i386.deb",
            "STABLE_I386DEB_TEXT" => "gftp-text_" . $version . "-1_i386.deb");

-$tarfiles = "MD5SUMS changelog.html gftp-screenshot.png index.html logo.jpg readme.html robots.txt screenshots.html";
+$tarfiles = "MD5SUMS changelog.html gftp-screenshot.png index.html bats.gif logo.jpg readme.html robots.txt screenshots.html";

 print "Generating MD5SUMS...\n";
--- a/docs/website/index.html.in	Thu Dec 02 22:43:32 2004 +0000
+++ b/docs/website/index.html.in	Thu Dec 02 23:19:31 2004 +0000
@@ -72,10 +72,20 @@

 <H2>Bug Reporting</H2>

-<P>If you find any bugs in gFTP, please <A HREF="http://bugs.gnome.org/enter_bug.cgi?product=gftp">report</A> them using GNOME's Bugzilla. Please check the current list of <A HREF="http://bugs.gnome.org/buglist.cgi?short_desc_type=allwordssubstr&short_desc=&product=gftp&long_desc_type=allwordssubstr&long_desc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=anywords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&changedin=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&namedcmd=GFTP&newqueryname=&order=Bug+Number&field0-0-0=noop&type0-0-0=noop&value0-0-0=">known bugs</A> before reporting a new bug.</P>
+<P>If you find any bugs in gFTP, please <A HREF="http://bugs.gnome.org/enter_bug.cgi?product=gftp">report</A> them using GNOME's Bugzilla. Please check the current list of <A HREF="http://bugs.gnome.org/buglist.cgi?short_desc_type=allwordssubstr&short_desc=&product=gftp&long_desc_type=allwordssubstr&long_desc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=anywords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&changedin=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&namedcmd=GFTP&newqueryname=&order=Bug+Number&field0-0-0=noop&type0-0-0=noop&value0-0-0=">known bugs</A> before reporting a new bug. Please refrain from emailing bugs directly to me or through the gftp-users mailinglist. It is easier for me if they are reported through Bugzilla.</P>

 <P>
-Brian Masney <A HREF="mailto:masneyb@gftp.org">masneyb@gftp.org</A><BR>
-Morgantown, WV USA<BR>
+<TABLE WIDTH="100%">
+<TR>
+  <TD>
+    Brian Masney <A HREF="mailto:masneyb@gftp.org">masneyb@gftp.org</A><BR>
+    Morgantown, WV USA
+  </TD>
+  <TD ALIGN="right">
+    <A HREF="http://www.caves.org/"><IMG SRC="bats.gif" ALT="National Speleological Society" TITLE="National Speleological Society"></A>
+  </TD>
+</TR>
+</TABLE>
 </P>
+
 </FONT></BODY></HTML>
--- a/src/gtk/gtkui.c	Thu Dec 02 22:43:32 2004 +0000
+++ b/src/gtk/gtkui.c	Thu Dec 02 23:19:31 2004 +0000
@@ -278,6 +278,11 @@
       cdata->input_string = g_strdup (edttext);
     }

+  if (ddata->checkbox != NULL)
+    cdata->toggled = GTK_TOGGLE_BUTTON (ddata->checkbox)->active;
+  else
+    cdata->toggled = 0;
+
   gftpui_common_run_callback_function (cdata);
 }

@@ -371,7 +376,7 @@
     return;

   MakeEditDialog (_("Site"), _("Enter site-specific command"), NULL, 1,
-                  NULL, gftp_dialog_button_ok,
+                  _("Prepend with SITE"), gftp_dialog_button_ok,
                   gftpui_run_function_callback, cdata,
                   gftpui_run_function_cancel_callback, cdata);
 }
--- a/src/uicommon/gftpui.h	Thu Dec 02 22:43:32 2004 +0000
+++ b/src/uicommon/gftpui.h	Thu Dec 02 23:19:31 2004 +0000
@@ -40,7 +40,8 @@
   void (*disconnect_function) (gftpui_callback_data * cdata);
   unsigned int dont_check_connection : 1,
                dont_refresh : 1,
-               dont_clear_cache : 1;
+               dont_clear_cache : 1,
+               toggled : 1;
 };
--- a/src/uicommon/gftpuicallbacks.c	Thu Dec 02 22:43:32 2004 +0000
+++ b/src/uicommon/gftpuicallbacks.c	Thu Dec 02 23:19:31 2004 +0000
@@ -39,7 +39,7 @@
 int
 gftpui_common_run_site (gftpui_callback_data * cdata)
 {
-  return (gftp_site_cmd (cdata->request, 1, cdata->input_string));
+  return (gftp_site_cmd (cdata->request, cdata->toggled, cdata->input_string));
 }