[hamradio-commits] [xnec2c] 01/06: Fixed old quilt transgressions

[Dave Hibberd]

This is an automated email from the git hooks/post-receive script.

hibby-guest pushed a commit to branch master
in repository xnec2c.

commit d5d67ed96fd6616b6d494c2eec390588c0df08a6
Author: Hibby <d at vehibberd.com>
Date:   Thu Sep 8 20:54:09 2016 +0100

    Fixed old quilt transgressions
---
 po/POTFILES.in  | 8 +-------
 src/Makefile.am | 2 +-
 src/geom_edit.c | 4 ++--
 src/interface.c | 4 ++--
 xnec2c.glade    | 4 ++--
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 452c32a..b48df4f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,16 +11,10 @@ src/geom_edit.c
 src/geometry.c
 src/ground.c
 src/matrix.c
-src/utils.c
+src/misc.c
 src/nec2_model.c
 src/plot_freqdata.c
 src/radiation.c
 src/support.c
 src/xnec2c.c
 xnec2c.glade
-#List of source files to be added according to installer
-src/gnuplot.c
-src/input.c
-src/network.c
-src/somnec.c
-
diff --git a/src/Makefile.am b/src/Makefile.am
index a32b6ba..9886e76 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
 #AM_LDFLAGS = -Wl,--as-needed, -z,relro, -z,now
 
 AM_CFLAGS = --pedantic -Wall -std=gnu99 -O2 -D_FORTIFY_SOURCE=2 \
-		 -fstack-protector -Wformat -Werror=format-security
+		 -fstack-protector -Wformat -Werror=format-security -fpie
 
 AM_CPPFLAGS = \
 	-DPROGRAMNAME_LOCALEDIR=\""$(PROGRAMNAME_LOCALEDIR)"\" \
diff --git a/src/geom_edit.c b/src/geom_edit.c
index 7fd1228..f9d2769 100644
--- a/src/geom_edit.c
+++ b/src/geom_edit.c
@@ -667,7 +667,7 @@ Patch_Editor( int action )
 	  save = TRUE;
 	  break;
 
-	case PATCH_EDITOR_ARBT: /* Arbitrary-shaped patch */
+	case PATCH_EDITOR_ARBT: /* Arbitary-shaped patch */
 	  ptype = PATCH_ARBT;
 	  ptset = FALSE;
 	  save  = TRUE;
@@ -749,7 +749,7 @@ Patch_Editor( int action )
   /* Hide/Show parts of window as needed */
   switch( ptype )
   {
-	case PATCH_ARBT: /* Arbitrary shaped patch */
+	case PATCH_ARBT: /* Arbitary shaped patch */
 	  gtk_widget_hide( lookup_widget(patch_editor, "patch_sc_frame") );
 	  gtk_widget_hide( lookup_widget(patch_editor, "patch_sm_frame") );
 	  gtk_window_resize( GTK_WINDOW(patch_editor), 10, 10 );
diff --git a/src/interface.c b/src/interface.c
index 1bf12b7..b48e015 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -3659,7 +3659,7 @@ create_patch_editor (void)
   gtk_widget_show (hbox22);
   gtk_container_add (GTK_CONTAINER (alignment13), hbox22);
 
-  patch_arbitrary_radiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("Arbitrary"));
+  patch_arbitrary_radiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("Arbitary"));
   gtk_widget_show (patch_arbitrary_radiobutton);
   gtk_box_pack_start (GTK_BOX (hbox22), patch_arbitrary_radiobutton, TRUE, TRUE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (patch_arbitrary_radiobutton), 2);
@@ -10138,7 +10138,7 @@ create_aboutdialog (void)
   gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (aboutdialog), VERSION);
   gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (aboutdialog), _("Xnec2c"));
   gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG (aboutdialog), _("(C) 2007-2010 Neoklis Kyriazis"));
-  gtk_about_dialog_set_comments (GTK_ABOUT_DIALOG (aboutdialog), _("xnec2c is an interactive graphical wrapper around a modified version of nec2c, which is itself a translation to C of the original FORTRAN NEC2 Numerical Electromagnetics Code.\n\nxnec2c can display frequency-dependent data (gain, input impedance, vswr etc) in a graphical format. It can also display radiation pattern data in a rotatable wire frame format and near-field (E, H, S vectors) in a grid format.\n\nxnec2c has a b [...]
+  gtk_about_dialog_set_comments (GTK_ABOUT_DIALOG (aboutdialog), _("xnec2c is an interactive graphical wrapper around a modified version of nec2c, which is itself a translation to C of the original FORTRAN NEC2 Numerical Electromagnetics Code.\n\nxnec2c can display frequency-dependent data (gain, input impedance, vswr etc) in a graphical format. It can also display radiation pattern data in a rotatable wire frame format and near-field (E, H, S vectors) in a grid format.\n\nxnec2c has a b [...]
   gtk_about_dialog_set_license (GTK_ABOUT_DIALOG (aboutdialog), _("GPL v2 or higher"));
   gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (aboutdialog), "http://www.qsl.net/5b4az");
   gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (aboutdialog), authors);
diff --git a/xnec2c.glade b/xnec2c.glade
index d31a82d..042b65c 100644
--- a/xnec2c.glade
+++ b/xnec2c.glade
@@ -6183,7 +6183,7 @@ to Plane of Screen</property>
 		      <property name="border_width">2</property>
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Arbitrary</property>
+		      <property name="label" translatable="yes">Arbitary</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
@@ -19620,7 +19620,7 @@ xnec2c can display frequency-dependent data (gain, input impedance, vswr etc) in
 
 xnec2c has a built-in NEC2 input file editor that makes it easier to create or edit antenna description files and specify NEC2 commands.
 
-PLEASE read the documentation in the doc/ sub-directory as xnec2c is not fully compatible with NEC2 input files and it works in different ways!</property>
+PLEASE read the documantation in the doc/ sub-directory as xnec2c is not fully compatible with NEC2 input files and it works in different ways!</property>
   <property name="license" translatable="yes">GPL v2 or higher</property>
   <property name="wrap_license">False</property>
   <property name="website">http://www.qsl.net/5b4az</property>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/xnec2c.git