GNOME.org
 

[genius] Mon Dec 19 20:07:44 2016 Jiri (George) Lebl <jirka 5z com>

commit d008da7932e77dbc1035aaec81f4867f9bd21196
Author: Jiri (George) Lebl <jiri lebl gmail com>
Date:   Mon Dec 19 20:07:46 2016 -0600

    Mon Dec 19 20:07:44 2016  Jiri (George) Lebl <jirka 5z com>
    
        * po/eo.po: Add some translations.
    
        * configure.ac: move file to new name.  Require vte 0.26
    
        * src/gnome-genius.c: remove deprecated vte functions

 ChangeLog                    |    8 +++++
 autogen.sh                   |    2 +-
 configure.in => configure.ac |    4 ++-
 gtkextra/Makefile.am         |    2 +-
 po/eo.po                     |   72 +++++++++++++++++++++---------------------
 src/Makefile.am              |    2 +-
 src/funclib.c                |    2 +-
 src/gnome-genius.c           |   43 +++++++++++++++++-------
 ve/Makefile.am               |    2 +-
 9 files changed, 82 insertions(+), 55 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c63e5f1..6a39341 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Dec 19 20:07:44 2016  Jiri (George) Lebl <jirka 5z com>
+
+       * po/eo.po: Add some translations.
+
+       * configure.ac: move file to new name.  Require vte 0.26
+
+       * src/gnome-genius.c: remove deprecated vte functions
+
 Fri Dec 16 17:36:16 2016  Jiri (George) Lebl <jirka 5z com>
 
        * examples/complex-analysis-argument-principle.gel: Add argument
diff --git a/autogen.sh b/autogen.sh
index b36a429..bfe7632 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,7 +8,7 @@ test -z "$srcdir" && srcdir=.
 
 PKG_NAME="Genius"
 
-(test -f $srcdir/configure.in \
+(test -f $srcdir/configure.ac \
   && test -d $srcdir/src \
   && test -f $srcdir/src/calc.h) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
diff --git a/configure.in b/configure.ac
similarity index 99%
rename from configure.in
rename to configure.ac
index 0cdd5ab..815a3c0 100644
--- a/configure.in
+++ b/configure.ac
@@ -2,6 +2,8 @@ AC_INIT([genius], [1.0.21])
 AC_CONFIG_SRCDIR([src/calc.c])
 AM_INIT_AUTOMAKE([dist-xz])
 
+AC_CONFIG_MACRO_DIRS([m4])
+
 AM_CONFIG_HEADER(config.h)
 
 dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
@@ -13,7 +15,7 @@ AC_PROG_INTLTOOL([0.21])
 
 dnl ================= Requirements ================================================
 
-VTE_REQUIRED=0.17.1
+VTE_REQUIRED=0.26.0
 GTK_REQUIRED=2.18.0
 GLIB_REQUIRED=2.12.0
 GTKSOURCEVIEW_REQUIRED=0.3.0
diff --git a/gtkextra/Makefile.am b/gtkextra/Makefile.am
index ecdafdd..f2d6290 100644
--- a/gtkextra/Makefile.am
+++ b/gtkextra/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce makefile.in
 SUBDIRS=.
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(srcdir)                                             \
        -I$(includedir)                                         \
        -I$(top_srcdir)                                         \
diff --git a/po/eo.po b/po/eo.po
index 5b91cbf..3d8b28e 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -34,7 +34,7 @@ msgstr ""
 
 #: ../lib/library-strings.c:4
 msgid "Make a string"
-msgstr "Fari signovicon"
+msgstr "Fari ĉenon"
 
 #: ../lib/library-strings.c:5
 msgid "Tolerance of the Chop function"
@@ -706,7 +706,7 @@ msgstr ""
 
 #: ../lib/library-strings.c:157
 msgid "Return the Vandermonde matrix"
-msgstr ""
+msgstr "Liveri la matrico de Vandermonde"
 
 #: ../lib/library-strings.c:158
 msgid "The angle of two vectors, given an inner product"
@@ -2034,9 +2034,9 @@ msgid "%s: Cannot compare complex numbers"
 msgstr "%s: Ne povas kompari kompleksaj nombroj"
 
 #: ../src/funclib.c:3100
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Input not a number or a matrix of numbers."
-msgstr "%s: %d-a argumento ne estas nombro aŭ matrico"
+msgstr "%s: enigo ne estas nombro aŭ matrico de nombroj"
 
 #: ../src/funclib.c:3196
 #, fuzzy, c-format
@@ -2112,7 +2112,7 @@ msgstr ""
 #: ../src/funclib.c:6043 ../src/funclib.c:6057
 #, c-format
 msgid "%s: value out of range"
-msgstr ""
+msgstr "%s: valoro ekster amplekso"
 
 #: ../src/funclib.c:6266
 #, c-format
@@ -2122,7 +2122,7 @@ msgstr "%s: nedefinita funkcio"
 #: ../src/funclib.c:6272
 #, c-format
 msgid "%s: flags argument must be a string"
-msgstr ""
+msgstr "%s: argumento flags devas esti ĉeno"
 
 #: ../src/funclib.c:6400 ../src/symbolic.c:734
 #, c-format
@@ -2132,16 +2132,16 @@ msgstr ""
 #: ../src/funclib.c:6612 ../src/funclib.c:6647 ../src/funclib.c:6892
 #, c-format
 msgid "%s: argument should be between %d and %d"
-msgstr ""
+msgstr "%s: argumento devas esti inter %d kaj %d"
 
 #: ../src/funclib.c:6800
 msgid "OutputStyle must be one of normal, troff, latex or mathml"
-msgstr ""
+msgstr "OutputStyle devas esti unu de normal, troff, latex, aŭ mathml"
 
 #: ../src/funclib.c:6840
 #, c-format
 msgid "%s: argument should be larger or equal to 0"
-msgstr ""
+msgstr "%s: argumento devas esti egala aŭ pli granda ol 0"
 
 #: ../src/funclib.c:6953
 msgid "Basic"
@@ -2683,11 +2683,11 @@ msgstr ""
 
 #: ../src/funclib.c:7218
 msgid "Is a matrix square"
-msgstr ""
+msgstr "Ĉu matrico estas kvadrata"
 
 #: ../src/funclib.c:7219
 msgid "Is argument a horizontal or a vertical vector"
-msgstr ""
+msgstr "Ĉu argumento estas horizontala aŭ vertikala vektoro"
 
 #: ../src/funclib.c:7220
 msgid "Is a matrix upper triangular"
@@ -3026,12 +3026,12 @@ msgstr ""
 #: ../src/funclibhelper.cP:40
 #, c-format
 msgid "%s: argument number %d not an integer"
-msgstr ""
+msgstr "%s: %d-a argumento ne estas entjero"
 
 #: ../src/funclibhelper.cP:53
 #, c-format
 msgid "%s: argument number %d not an integer or a matrix"
-msgstr ""
+msgstr "%s: %d-a argumento ne estas entjero aŭ matrico"
 
 #: ../src/funclibhelper.cP:65 ../src/funclibhelper.cP:76
 #, c-format
@@ -3041,17 +3041,17 @@ msgstr "%s: %d-a argumento ne estas nombro aŭ matrico"
 #: ../src/funclibhelper.cP:89
 #, c-format
 msgid "%s: argument number %d not a nonnegative integer"
-msgstr ""
+msgstr "%s: %d-a argumento ne estas nenegativa entjero"
 
 #: ../src/funclibhelper.cP:101
 #, c-format
 msgid "%s: argument number %d not a nonnegative number"
-msgstr ""
+msgstr "%s: %d-a argumento ne estas nenegativa nombro"
 
 #: ../src/funclibhelper.cP:115
 #, c-format
 msgid "%s: argument number %d not a positive integer"
-msgstr ""
+msgstr "%s: %d-a argumento ne estas positiva entjero"
 
 #: ../src/funclibhelper.cP:125 ../src/graphing.c:3378
 #, c-format
@@ -3076,7 +3076,7 @@ msgstr "%s: %d-a argumento ne estas matrico"
 #: ../src/funclibhelper.cP:168
 #, c-format
 msgid "%s: argument number %d not a square matrix"
-msgstr ""
+msgstr "%s: %d-a argumento ne estas kvadrata matrico"
 
 #: ../src/funclibhelper.cP:179
 #, c-format
@@ -4315,15 +4315,15 @@ msgstr "Grafeaj limoj ne estas 6-vektoro"
 
 #: ../src/graphing.c:3710 ../src/graphing.c:3728 ../src/graphing.c:3742
 msgid "Ticks must be between 2 and 200"
-msgstr ""
+msgstr "Markoj devas esti inter 2 kaj 200"
 
 #: ../src/graphing.c:3719 ../src/graphing.c:3733
 msgid "Ticks not given as numbers"
-msgstr ""
+msgstr "Markoj ne estas donita kiel nombroj"
 
 #: ../src/graphing.c:3747
 msgid "Ticks not given as a number or a 2-vector"
-msgstr ""
+msgstr "Markoj ne estas donita kiel nombroj aŭ 2-vektoro"
 
 #: ../src/graphing.c:5407
 #, c-format
@@ -4449,12 +4449,12 @@ msgstr "Pa_rametra"
 #. # of ticks
 #: ../src/graphing.c:6066 ../src/graphing.c:6118
 msgid "Vertical ticks:"
-msgstr ""
+msgstr "Vertikalaj markoj:"
 
 #. # of ticks
 #: ../src/graphing.c:6070 ../src/graphing.c:6122
 msgid "Horizontal ticks:"
-msgstr ""
+msgstr "Horizontalaj markoj:"
 
 #: ../src/graphing.c:6075
 msgid "Sl_ope field"
@@ -4550,7 +4550,7 @@ msgstr "Nevalida dependa amplekso"
 #: ../src/graphing.c:6875
 #, c-format
 msgid "Only specify %s and %s, or %s, not all at once."
-msgstr ""
+msgstr "Specifu nur %s kaj %s, aŭ %s, ne ĉiuj kune."
 
 #: ../src/graphing.c:7242
 msgid "Create Plot"
@@ -4582,31 +4582,31 @@ msgstr "%s: nur unu funkcio estas subtenanta"
 
 #: ../src/graphing.c:7324
 msgid "Graph limits not given as a 4-vector or a 6-vector"
-msgstr "Grafeaj limoj ne estas 4-vektoro au 6-vektoro"
+msgstr "Grafeaj limoj ne estas 4-vektoro aŭ 6-vektoro"
 
 #: ../src/graphing.c:7380 ../src/graphing.c:7634 ../src/graphing.c:7751
 #: ../src/graphing.c:7887 ../src/graphing.c:8036 ../src/graphing.c:8191
 #: ../src/graphing.c:10025
 #, c-format
 msgid "%s: invalid X range"
-msgstr ""
+msgstr "%s: nevalida amplekso de X"
 
 #: ../src/graphing.c:7385 ../src/graphing.c:7639 ../src/graphing.c:7756
 #: ../src/graphing.c:7892 ../src/graphing.c:8041 ../src/graphing.c:8196
 #: ../src/graphing.c:10030
 #, c-format
 msgid "%s: invalid Y range"
-msgstr ""
+msgstr "%s: nevalida amplekso de Y"
 
 #: ../src/graphing.c:7390 ../src/graphing.c:10035
 #, c-format
 msgid "%s: invalid Z range"
-msgstr ""
+msgstr "%s: nevalida amplekso de Z"
 
 #: ../src/graphing.c:7463
 #, c-format
 msgid "%s: dx must be positive"
-msgstr ""
+msgstr "%s: dx devas esti positiva"
 
 #: ../src/graphing.c:7470 ../src/graphing.c:7489
 #, c-format
@@ -4616,12 +4616,12 @@ msgstr ""
 #: ../src/graphing.c:7516
 #, c-format
 msgid "%s: dt must be positive"
-msgstr ""
+msgstr "%s: dt devas esti positiva"
 
 #: ../src/graphing.c:7522
 #, c-format
 msgid "%s: tlen must be positive"
-msgstr ""
+msgstr "%s: tlen devas esti positiva"
 
 #: ../src/graphing.c:7530 ../src/graphing.c:7551
 #, c-format
@@ -4650,7 +4650,7 @@ msgstr ""
 #: ../src/graphing.c:8046 ../src/graphing.c:8201
 #, c-format
 msgid "%s: invalid T range"
-msgstr ""
+msgstr "%s: nevalida amplekso de T"
 
 #: ../src/graphing.c:8422
 #, c-format
@@ -4681,7 +4681,7 @@ msgstr ""
 #: ../src/graphing.c:8777
 #, c-format
 msgid "%s: No color specified"
-msgstr ""
+msgstr "%s: Koloro ne specifita"
 
 #: ../src/graphing.c:8782 ../src/graphing.c:8789
 #, c-format
@@ -4712,7 +4712,7 @@ msgstr ""
 #: ../src/graphing.c:9618
 #, c-format
 msgid "%s: Wrong number of arguments"
-msgstr ""
+msgstr "%s: Malĝusta nombro de argumentoj"
 
 #: ../src/graphing.c:8945 ../src/graphing.c:9212 ../src/graphing.c:9445
 #: ../src/graphing.c:9678
@@ -4724,7 +4724,7 @@ msgstr ""
 #: ../src/graphing.c:9703
 #, c-format
 msgid "%s: No window specified"
-msgstr ""
+msgstr "%s: Fenestro ne specifita"
 
 #: ../src/graphing.c:9016 ../src/graphing.c:9041
 #, c-format
@@ -4765,7 +4765,7 @@ msgstr ""
 #: ../src/graphing.c:9932
 #, c-format
 msgid "%s: argument not a matrix of data"
-msgstr ""
+msgstr "%s: argumento ne estas matrico de dataoj"
 
 #: ../src/graphing.c:10116
 #, c-format
@@ -4775,7 +4775,7 @@ msgstr ""
 #: ../src/graphing.c:10162
 #, c-format
 msgid "%s: first argument not a matrix of data"
-msgstr ""
+msgstr "%s: unua argumento ne estas matrico de dataoj"
 
 #: ../src/graphing.c:10169
 #, c-format
diff --git a/src/Makefile.am b/src/Makefile.am
index 40e3c99..b20adfb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ plugin_includedir = $(includedir)/genius
 
 AM_YFLAGS = -d -t
 
-INCLUDES = \
+AM_CPPFLAGS = \
         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        -DG_LOG_DOMAIN=\"Genius\"                               \
        -DDATADIR=\""$(datadir)"\"                              \
diff --git a/src/funclib.c b/src/funclib.c
index ca09b9e..6d4a0e1 100644
--- a/src/funclib.c
+++ b/src/funclib.c
@@ -3193,7 +3193,7 @@ min_op (GelCtx *ctx, GelETree * * a, gboolean *exception)
                         */
                        return gel_stealnode (a[0]);
                } else {
-                       gel_errorout (_("%s: Input not a number or matrix of numbers."),
+                       gel_errorout (_("%s: Input not a number or a matrix of numbers."),
                                      "min");
                        return NULL;
                }
diff --git a/src/gnome-genius.c b/src/gnome-genius.c
index 98c29ec..5d38078 100644
--- a/src/gnome-genius.c
+++ b/src/gnome-genius.c
@@ -4663,6 +4663,30 @@ open_plugin_cb (GtkWidget *w, GelPlugin * plug)
        gel_open_plugin (plug);
 }
 
+static pid_t
+my_fork_command (VteTerminal *terminal, char **argv)
+{
+       gboolean ret;
+       GPid child_pid;
+
+       ret = vte_terminal_fork_command_full (terminal,
+                                             VTE_PTY_DEFAULT,
+                                             NULL,
+                                             argv,
+                                             NULL,
+                                             (GSpawnFlags)(G_SPAWN_CHILD_INHERITS_STDIN | 
G_SPAWN_SEARCH_PATH), 
+                                             NULL,
+                                             NULL,
+                                             &child_pid,
+                                             NULL);
+
+       if (ret)
+               return (pid_t) child_pid;
+       else
+               return -1;
+
+}
+
 static void
 fork_a_helper (void)
 {
@@ -4737,14 +4761,7 @@ fork_a_helper (void)
 
        argv[3] = NULL;
 
-       helper_pid = vte_terminal_fork_command (VTE_TERMINAL (term),
-                                               foo,
-                                               argv,
-                                               NULL /* envv */,
-                                               NULL /* directory */,
-                                               FALSE /* lastlog */,
-                                               FALSE /* utmp */,
-                                               FALSE /* wtmp */);
+       helper_pid = my_fork_command (VTE_TERMINAL (term), argv);
 
        g_free (libexecdir);
        g_free (foo);
@@ -5046,15 +5063,15 @@ update_term_geometry (void)
        GdkGeometry hints;
        int char_width;
        int char_height;
-       int xpad, ypad;
+       GtkBorder *border = NULL;
 
        char_width = vte_terminal_get_char_width (VTE_TERMINAL (term));
        char_height = vte_terminal_get_char_height (VTE_TERMINAL (term));
-  
-       vte_terminal_get_padding (VTE_TERMINAL (term), &xpad, &ypad);
 
-       hints.base_width = xpad;
-       hints.base_height = ypad;
+       gtk_widget_style_get (GTK_WIDGET (term), "inner-border", &border, NULL);
+       hints.base_width = border->left + border->right;
+       hints.base_height = border->top + border->bottom;
+       gtk_border_free (border);
 
 #define MIN_WIDTH_CHARS 10
 #define MIN_HEIGHT_CHARS 4
diff --git a/ve/Makefile.am b/ve/Makefile.am
index 4497b1b..9142829 100644
--- a/ve/Makefile.am
+++ b/ve/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce makefile.in
 SUBDIRS=.
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I.                                     \
        -I..                                    \
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]