Hello community,
here is the log from the commit of package gnome-calculator for
openSUSE:Factory checked in at 2015-06-17 16:15:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-calculator (Old)
and /work/SRC/openSUSE:Factory/.gnome-calculator.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-calculator"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-calculator/gnome-calculator.changes
2015-05-23 13:23:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gnome-calculator.new/gnome-calculator.changes
2015-06-17 16:15:30.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jun 12 19:58:01 UTC 2015 - zai...@opensuse.org
+
+- Update to version 3.16.2:
+ + Fix: Search provider crash introduced by 3.16.1.
+
+-------------------------------------------------------------------
Old:
----
gnome-calculator-3.16.1.tar.xz
New:
----
gnome-calculator-3.16.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-calculator.spec ++++++
--- /var/tmp/diff_new_pack.yi8rLx/_old 2015-06-17 16:15:31.000000000 +0200
+++ /var/tmp/diff_new_pack.yi8rLx/_new 2015-06-17 16:15:31.000000000 +0200
@@ -17,7 +17,7 @@
Name: gnome-calculator
-Version: 3.16.1
+Version: 3.16.2
Release: 0
Summary: A GNOME Calculator Application
License: GPL-3.0+
++++++ gnome-calculator-3.16.1.tar.xz -> gnome-calculator-3.16.2.tar.xz ++++++
++++ 2618 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/NEWS new/gnome-calculator-3.16.2/NEWS
--- old/gnome-calculator-3.16.1/NEWS 2015-05-22 17:36:25.000000000 +0200
+++ new/gnome-calculator-3.16.2/NEWS 2015-06-10 00:43:27.000000000 +0200
@@ -1,3 +1,6 @@
+Overview of changes in gnome-calculator 3.16.2
+ * Fix : Search provider crash introduced by 3.16.1, oops (Michael
Catanzaro)
+
Overview of changes in gnome-calculator 3.16.1
* Update : Translations (Translation team)
* Fix : Search provider should discard child stdout/stderr (Michael
Catanzaro)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/compile new/gnome-calculator-3.16.2/compile
--- old/gnome-calculator-3.16.1/compile 2015-05-22 17:37:22.000000000 +0200
+++ new/gnome-calculator-3.16.2/compile 2015-06-10 00:43:58.000000000 +0200
@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tro...@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/configure.ac
new/gnome-calculator-3.16.2/configure.ac
--- old/gnome-calculator-3.16.1/configure.ac 2015-05-22 17:35:41.000000000
+0200
+++ new/gnome-calculator-3.16.2/configure.ac 2015-06-10 00:43:33.000000000
+0200
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(gnome-calculator, 3.16.1)
+AC_INIT(gnome-calculator, 3.16.2)
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
AM_SILENT_RULES([yes])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/m4/intltool.m4
new/gnome-calculator-3.16.2/m4/intltool.m4
--- old/gnome-calculator-3.16.1/m4/intltool.m4 2015-05-22 17:37:18.000000000
+0200
+++ new/gnome-calculator-3.16.2/m4/intltool.m4 2015-06-10 00:43:51.000000000
+0200
@@ -155,31 +155,6 @@
# Substitute ALL_LINGUAS so we can use it in po/Makefile
AC_SUBST(ALL_LINGUAS)
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[]],
- [[extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr]])],
- [DATADIRNAME=share],
- [case $host in
- *-*-solaris*)
- dnl On Solaris, if bind_textdomain_codeset is in libc,
- dnl GNU format message catalog is always supported,
- dnl since both are added to the libc all together.
- dnl Hence, we'd like to go with DATADIRNAME=share
- dnl in this case.
- AC_CHECK_FUNC(bind_textdomain_codeset,
- [DATADIRNAME=share], [DATADIRNAME=lib])
- ;;
- *)
- [DATADIRNAME=lib]
- ;;
- esac])
-fi
-AC_SUBST(DATADIRNAME)
-
IT_PO_SUBDIR([po])
])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/missing new/gnome-calculator-3.16.2/missing
--- old/gnome-calculator-3.16.1/missing 2015-05-22 17:37:22.000000000 +0200
+++ new/gnome-calculator-3.16.2/missing 2015-06-10 00:43:58.000000000 +0200
@@ -3,7 +3,7 @@
scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/po/Makefile.in.in
new/gnome-calculator-3.16.2/po/Makefile.in.in
--- old/gnome-calculator-3.16.1/po/Makefile.in.in 2015-05-22
17:37:18.000000000 +0200
+++ new/gnome-calculator-3.16.2/po/Makefile.in.in 2015-06-10
00:43:50.000000000 +0200
@@ -33,8 +33,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+localedir = @localedir@
subdir = po
install_sh = @install_sh@
# Automake >= 1.8 provides @mkdir_p@.
@@ -80,7 +79,7 @@
.po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot
- $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+ $(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox
.po.mo:
$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
@@ -108,7 +107,7 @@
install-data-yes: all
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+ dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
$(mkdir_p) $$dir; \
if test -r $$lang.gmo; then \
$(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@@ -142,8 +141,8 @@
uninstall:
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
- rm -f
$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
- rm -f
$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+ rm -f
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+ rm -f
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
check: all $(GETTEXT_PACKAGE).pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/search-provider/search-provider.c
new/gnome-calculator-3.16.2/search-provider/search-provider.c
--- old/gnome-calculator-3.16.1/search-provider/search-provider.c
2015-05-22 17:37:28.000000000 +0200
+++ new/gnome-calculator-3.16.2/search-provider/search-provider.c
2015-06-10 00:39:35.000000000 +0200
@@ -1,4 +1,4 @@
-/* search-provider.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* search-provider.c generated by valac 0.29.1, the Vala compiler
* generated from search-provider.vala, do not modify */
/* -*- Mode: vala; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -1208,28 +1208,28 @@
static void _g_free0_ (gpointer var) {
-#line 115
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 114
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
var = (g_free (var), NULL);
#line 1214 "search-provider.c"
}
static void _g_variant_unref0_ (gpointer var) {
-#line 115
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 114
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
(var == NULL) ? NULL : (var = (g_variant_unref (var), NULL));
#line 1221 "search-provider.c"
}
static GVariant* _variant_new1 (const gchar* value) {
-#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 115
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
return g_variant_ref_sink (g_variant_new_string (value));
#line 1228 "search-provider.c"
}
static GVariant* _variant_new2 (gchar* value) {
-#line 117
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
return g_variant_ref_sink (g_variant_new_string (value));
#line 1235 "search-provider.c"
}
@@ -1413,9 +1413,6 @@
#line 1414 "search-provider.c"
goto __catch3_g_error;
}
-#line 107
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
- _vala_assert (g_strcmp0 (stderr_buf, "") == 0, "stderr_buf ==
\"\"");
-#line 1419 "search-provider.c"
}
goto __finally3;
__catch3_g_error:
@@ -1426,13 +1423,13 @@
e = _inner_error_;
#line 104
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_inner_error_ = NULL;
-#line 111
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 110
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp16_ = e->message;
-#line 111
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
- g_error ("search-provider.vala:111: Failed reading result: %s",
_tmp16_);
+#line 110
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+ g_error ("search-provider.vala:110: Failed reading result: %s",
_tmp16_);
#line 104
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_g_error_free0 (e);
-#line 1436 "search-provider.c"
+#line 1433 "search-provider.c"
}
__finally3:
#line 104
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
@@ -1451,91 +1448,91 @@
g_clear_error (&_inner_error_);
#line 104
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
return NULL;
-#line 1455 "search-provider.c"
+#line 1452 "search-provider.c"
}
-#line 114
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 113
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp17_ = g_new0 (GHashTable*, 1 + 1);
-#line 114
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 113
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
metadata = _tmp17_;
-#line 114
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 113
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
metadata_length1 = 1;
-#line 114
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 113
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_metadata_size_ = metadata_length1;
-#line 115
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 114
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp18_ = g_str_hash;
-#line 115
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 114
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp19_ = g_str_equal;
-#line 115
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 114
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp20_ = g_hash_table_new_full (_tmp18_, _tmp19_, _g_free0_,
_g_variant_unref0_);
-#line 115
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 114
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_g_hash_table_unref0 (metadata[0]);
-#line 115
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 114
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
metadata[0] = _tmp20_;
-#line 115
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 114
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp21_ = metadata[0];
-#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 115
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp22_ = metadata[0];
-#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 115
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp23_ = g_strdup ("id");
-#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 115
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp24_ = results;
-#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 115
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp24__length1 = results_length1;
-#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 115
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp25_ = _tmp24_[0];
-#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 115
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp26_ = _variant_new1 (_tmp25_);
-#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 115
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
g_hash_table_insert (_tmp22_, _tmp23_, _tmp26_);
-#line 117
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp27_ = metadata[0];
-#line 117
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp28_ = g_strdup ("name");
-#line 117
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp29_ = results;
-#line 117
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp29__length1 = results_length1;
-#line 117
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp30_ = _tmp29_[0];
-#line 117
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp31_ = g_strconcat (_tmp30_, " = ", NULL);
-#line 117
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp32_ = _tmp31_;
-#line 117
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp33_ = g_strconcat (_tmp32_, stdout_buf, NULL);
-#line 117
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp34_ = _tmp33_;
-#line 117
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp35_ = _variant_new2 (_tmp34_);
-#line 117
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
g_hash_table_insert (_tmp27_, _tmp28_, _tmp35_);
-#line 117
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_g_free0 (_tmp34_);
-#line 117
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 116
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_g_free0 (_tmp32_);
-#line 119
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 118
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp36_ = metadata;
-#line 119
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 118
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp36__length1 = metadata_length1;
-#line 119
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 118
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
if (result_length1) {
-#line 119
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 118
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
*result_length1 = _tmp36__length1;
-#line 1525 "search-provider.c"
+#line 1522 "search-provider.c"
}
-#line 119
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 118
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
result = _tmp36_;
-#line 119
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 118
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free),
NULL);
-#line 119
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 118
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_g_free0 (stderr_buf);
-#line 119
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 118
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_g_free0 (stdout_buf);
-#line 119
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 118
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_g_object_unref0 (subprocess);
-#line 119
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 118
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
return result;
-#line 1539 "search-provider.c"
+#line 1536 "search-provider.c"
}
@@ -1550,44 +1547,44 @@
gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 126
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 125
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp0_ = terms;
-#line 126
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 125
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp0__length1 = terms_length1;
-#line 126
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 125
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp1_ = search_provider_terms_to_equation (_tmp0_,
_tmp0__length1);
-#line 126
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 125
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp2_ = _tmp1_;
-#line 126
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 125
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp3_ = g_shell_quote (_tmp2_);
-#line 126
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 125
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp4_ = _tmp3_;
-#line 126
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 125
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp5_ = g_strconcat ("gnome-calculator --equation ", _tmp4_,
NULL);
-#line 126
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 125
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp6_ = _tmp5_;
-#line 126
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 125
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
g_spawn_command_line_async (_tmp6_, &_inner_error_);
-#line 126
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 125
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_g_free0 (_tmp6_);
-#line 126
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 125
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_g_free0 (_tmp4_);
-#line 126
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 125
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_g_free0 (_tmp2_);
-#line 126
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 125
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 126
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 125
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
if (_inner_error_->domain == G_SPAWN_ERROR) {
-#line 1582 "search-provider.c"
+#line 1579 "search-provider.c"
goto __catch4_g_spawn_error;
}
-#line 126
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 125
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
g_critical ("file %s: line %d: unexpected error: %s
(%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string
(_inner_error_->domain), _inner_error_->code);
-#line 126
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 125
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
g_clear_error (&_inner_error_);
-#line 126
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 125
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
return;
-#line 1591 "search-provider.c"
+#line 1588 "search-provider.c"
}
}
goto __finally4;
@@ -1595,28 +1592,28 @@
{
GError* e = NULL;
const gchar* _tmp7_ = NULL;
-#line 124
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 123
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
e = _inner_error_;
-#line 124
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 123
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_inner_error_ = NULL;
-#line 131
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 130
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp7_ = e->message;
-#line 131
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
- g_error ("search-provider.vala:131: Failed to spawn Calculator:
%s", _tmp7_);
-#line 124
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 130
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+ g_error ("search-provider.vala:130: Failed to spawn Calculator:
%s", _tmp7_);
+#line 123
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_g_error_free0 (e);
-#line 1609 "search-provider.c"
+#line 1606 "search-provider.c"
}
__finally4:
-#line 124
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 123
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 124
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 123
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)",
__FILE__, __LINE__, _inner_error_->message, g_quark_to_string
(_inner_error_->domain), _inner_error_->code);
-#line 124
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 123
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
g_clear_error (&_inner_error_);
-#line 124
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 123
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
return;
-#line 1620 "search-provider.c"
+#line 1617 "search-provider.c"
}
}
@@ -1624,32 +1621,32 @@
void search_provider_activate_result (SearchProvider* self, const gchar*
_result_, gchar** terms, int terms_length1, guint32 timestamp) {
gchar** _tmp0_ = NULL;
gint _tmp0__length1 = 0;
-#line 135
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 134
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
g_return_if_fail (self != NULL);
-#line 135
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 134
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
g_return_if_fail (_result_ != NULL);
-#line 137
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 136
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp0_ = terms;
-#line 137
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 136
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp0__length1 = terms_length1;
-#line 137
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 136
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
search_provider_spawn_and_display_equation (_tmp0_, _tmp0__length1);
-#line 1638 "search-provider.c"
+#line 1635 "search-provider.c"
}
void search_provider_launch_search (SearchProvider* self, gchar** terms, int
terms_length1, guint32 timestamp) {
gchar** _tmp0_ = NULL;
gint _tmp0__length1 = 0;
-#line 140
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 139
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
g_return_if_fail (self != NULL);
-#line 142
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 141
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp0_ = terms;
-#line 142
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 141
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp0__length1 = terms_length1;
-#line 142
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 141
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
search_provider_spawn_and_display_equation (_tmp0_, _tmp0__length1);
-#line 1653 "search-provider.c"
+#line 1650 "search-provider.c"
}
@@ -1659,21 +1656,21 @@
self = (SearchProvider*) g_object_new (object_type, NULL);
#line 13
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
return self;
-#line 1663 "search-provider.c"
+#line 1660 "search-provider.c"
}
SearchProvider* search_provider_new (void) {
#line 13
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
return search_provider_construct (TYPE_SEARCH_PROVIDER);
-#line 1670 "search-provider.c"
+#line 1667 "search-provider.c"
}
static void search_provider_class_init (SearchProviderClass * klass) {
#line 13
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
search_provider_parent_class = g_type_class_peek_parent (klass);
-#line 1677 "search-provider.c"
+#line 1674 "search-provider.c"
}
@@ -2086,18 +2083,18 @@
SearchProviderApp* search_provider_app_construct (GType object_type) {
SearchProviderApp * self = NULL;
-#line 151
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 150
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
self = (SearchProviderApp*) g_object_new (object_type,
"application-id", "org.gnome.Calculator.SearchProvider", "flags",
G_APPLICATION_IS_SERVICE, "inactivity-timeout", 60000, NULL);
-#line 149
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 148
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
return self;
-#line 2094 "search-provider.c"
+#line 2091 "search-provider.c"
}
SearchProviderApp* search_provider_app_new (void) {
-#line 149
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 148
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
return search_provider_app_construct (TYPE_SEARCH_PROVIDER_APP);
-#line 2101 "search-provider.c"
+#line 2098 "search-provider.c"
}
@@ -2105,44 +2102,44 @@
SearchProviderApp * self;
gboolean result = FALSE;
GError * _inner_error_ = NULL;
-#line 156
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 155
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
self = (SearchProviderApp*) base;
-#line 156
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 155
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
g_return_val_if_fail (connection != NULL, FALSE);
-#line 156
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 155
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
g_return_val_if_fail (object_path != NULL, FALSE);
-#line 2115 "search-provider.c"
+#line 2112 "search-provider.c"
{
GDBusConnection* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
SearchProvider* _tmp2_ = NULL;
SearchProvider* _tmp3_ = NULL;
-#line 160
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 159
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp0_ = connection;
-#line 160
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 159
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp1_ = object_path;
-#line 160
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 159
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp2_ = search_provider_new ();
-#line 160
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 159
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp3_ = _tmp2_;
-#line 160
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 159
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
search_provider_register_object (_tmp3_, _tmp0_, _tmp1_,
&_inner_error_);
-#line 160
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 159
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_g_object_unref0 (_tmp3_);
-#line 160
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 159
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 160
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 159
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
if (_inner_error_->domain == G_IO_ERROR) {
-#line 2137 "search-provider.c"
+#line 2134 "search-provider.c"
goto __catch5_g_io_error;
}
-#line 160
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 159
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
g_critical ("file %s: line %d: unexpected error: %s
(%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string
(_inner_error_->domain), _inner_error_->code);
-#line 160
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 159
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
g_clear_error (&_inner_error_);
-#line 160
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 159
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
return FALSE;
-#line 2146 "search-provider.c"
+#line 2143 "search-provider.c"
}
}
goto __finally5;
@@ -2152,49 +2149,49 @@
FILE* _tmp4_ = NULL;
GError* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
-#line 158
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 157
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_error_ = _inner_error_;
-#line 158
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 157
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_inner_error_ = NULL;
-#line 164
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 163
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp4_ = stderr;
-#line 164
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 163
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp5_ = _error_;
-#line 164
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 163
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp6_ = _tmp5_->message;
-#line 164
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 163
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
fprintf (_tmp4_, "Could not register service: %s\n", _tmp6_);
-#line 165
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 164
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
g_application_quit ((GApplication*) self);
-#line 158
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 157
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_g_error_free0 (_error_);
-#line 2172 "search-provider.c"
+#line 2169 "search-provider.c"
}
__finally5:
-#line 158
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 157
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 158
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 157
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)",
__FILE__, __LINE__, _inner_error_->message, g_quark_to_string
(_inner_error_->domain), _inner_error_->code);
-#line 158
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 157
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
g_clear_error (&_inner_error_);
-#line 158
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 157
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
return FALSE;
-#line 2183 "search-provider.c"
+#line 2180 "search-provider.c"
}
-#line 168
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 167
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
result = TRUE;
-#line 168
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 167
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
return result;
-#line 2189 "search-provider.c"
+#line 2186 "search-provider.c"
}
static void search_provider_app_class_init (SearchProviderAppClass * klass) {
-#line 147
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 146
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
search_provider_app_parent_class = g_type_class_peek_parent (klass);
-#line 147
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 146
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
((GApplicationClass *) klass)->dbus_register =
search_provider_app_real_dbus_register;
-#line 2198 "search-provider.c"
+#line 2195 "search-provider.c"
}
@@ -2220,23 +2217,23 @@
SearchProviderApp* _tmp1_ = NULL;
gint _tmp2_ = 0;
gint _tmp3_ = 0;
-#line 174
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 173
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
setlocale (LC_ALL, "");
-#line 176
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 175
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp0_ = search_provider_app_new ();
-#line 176
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 175
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp1_ = _tmp0_;
-#line 176
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 175
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp2_ = g_application_run ((GApplication*) _tmp1_, 0, NULL);
-#line 176
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 175
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_tmp3_ = _tmp2_;
-#line 176
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 175
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
_g_object_unref0 (_tmp1_);
-#line 176
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 175
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
result = _tmp3_;
-#line 176
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 175
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
return result;
-#line 2240 "search-provider.c"
+#line 2237 "search-provider.c"
}
@@ -2244,9 +2241,9 @@
#if !GLIB_CHECK_VERSION (2,35,0)
g_type_init ();
#endif
-#line 172
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
+#line 171
"/home/mcatanzaro/jhbuild/checkout/gnome-calculator/search-provider/search-provider.vala"
return _vala_main ();
-#line 2250 "search-provider.c"
+#line 2247 "search-provider.c"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/search-provider/search-provider.vala
new/gnome-calculator-3.16.2/search-provider/search-provider.vala
--- old/gnome-calculator-3.16.1/search-provider/search-provider.vala
2015-05-22 17:35:32.000000000 +0200
+++ new/gnome-calculator-3.16.2/search-provider/search-provider.vala
2015-06-10 00:38:53.000000000 +0200
@@ -104,7 +104,6 @@
try
{
subprocess.communicate_utf8 (null, null, out stdout_buf, out
stderr_buf);
- assert (stderr_buf == "");
}
catch (Error e)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/currency.c
new/gnome-calculator-3.16.2/src/currency.c
--- old/gnome-calculator-3.16.1/src/currency.c 2015-05-22 17:37:26.000000000
+0200
+++ new/gnome-calculator-3.16.2/src/currency.c 2015-06-10 00:39:30.000000000
+0200
@@ -1,4 +1,4 @@
-/* currency.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* currency.c generated by valac 0.29.1, the Vala compiler
* generated from currency.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/equation-lexer.c
new/gnome-calculator-3.16.2/src/equation-lexer.c
--- old/gnome-calculator-3.16.1/src/equation-lexer.c 2015-05-22
17:37:26.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/equation-lexer.c 2015-06-10
00:39:29.000000000 +0200
@@ -1,4 +1,4 @@
-/* equation-lexer.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* equation-lexer.c generated by valac 0.29.1, the Vala compiler
* generated from equation-lexer.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/equation-parser.c
new/gnome-calculator-3.16.2/src/equation-parser.c
--- old/gnome-calculator-3.16.1/src/equation-parser.c 2015-05-22
17:37:26.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/equation-parser.c 2015-06-10
00:39:31.000000000 +0200
@@ -1,4 +1,4 @@
-/* equation-parser.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* equation-parser.c generated by valac 0.29.1, the Vala compiler
* generated from equation-parser.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/equation.c
new/gnome-calculator-3.16.2/src/equation.c
--- old/gnome-calculator-3.16.1/src/equation.c 2015-05-22 17:37:26.000000000
+0200
+++ new/gnome-calculator-3.16.2/src/equation.c 2015-06-10 00:39:29.000000000
+0200
@@ -1,4 +1,4 @@
-/* equation.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* equation.c generated by valac 0.29.1, the Vala compiler
* generated from equation.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/financial.c
new/gnome-calculator-3.16.2/src/financial.c
--- old/gnome-calculator-3.16.1/src/financial.c 2015-05-22 17:37:26.000000000
+0200
+++ new/gnome-calculator-3.16.2/src/financial.c 2015-06-10 00:39:31.000000000
+0200
@@ -1,4 +1,4 @@
-/* financial.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* financial.c generated by valac 0.29.1, the Vala compiler
* generated from financial.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/function-manager.c
new/gnome-calculator-3.16.2/src/function-manager.c
--- old/gnome-calculator-3.16.1/src/function-manager.c 2015-05-22
17:37:27.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/function-manager.c 2015-06-10
00:39:31.000000000 +0200
@@ -1,4 +1,4 @@
-/* function-manager.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* function-manager.c generated by valac 0.29.1, the Vala compiler
* generated from function-manager.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/gcalccmd.c
new/gnome-calculator-3.16.2/src/gcalccmd.c
--- old/gnome-calculator-3.16.1/src/gcalccmd.c 2015-05-22 17:37:25.000000000
+0200
+++ new/gnome-calculator-3.16.2/src/gcalccmd.c 2015-06-10 00:39:29.000000000
+0200
@@ -1,4 +1,4 @@
-/* gcalccmd.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* gcalccmd.c generated by valac 0.29.1, the Vala compiler
* generated from gcalccmd.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/gnome-calculator.c
new/gnome-calculator-3.16.2/src/gnome-calculator.c
--- old/gnome-calculator-3.16.1/src/gnome-calculator.c 2015-05-22
17:37:26.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/gnome-calculator.c 2015-06-10
00:39:30.000000000 +0200
@@ -1,4 +1,4 @@
-/* gnome-calculator.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* gnome-calculator.c generated by valac 0.29.1, the Vala compiler
* generated from gnome-calculator.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/math-buttons.c
new/gnome-calculator-3.16.2/src/math-buttons.c
--- old/gnome-calculator-3.16.1/src/math-buttons.c 2015-05-22
17:37:26.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/math-buttons.c 2015-06-10
00:39:31.000000000 +0200
@@ -1,4 +1,4 @@
-/* math-buttons.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* math-buttons.c generated by valac 0.29.1, the Vala compiler
* generated from math-buttons.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/math-converter.c
new/gnome-calculator-3.16.2/src/math-converter.c
--- old/gnome-calculator-3.16.1/src/math-converter.c 2015-05-22
17:37:26.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/math-converter.c 2015-06-10
00:39:31.000000000 +0200
@@ -1,4 +1,4 @@
-/* math-converter.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* math-converter.c generated by valac 0.29.1, the Vala compiler
* generated from math-converter.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/math-display.c
new/gnome-calculator-3.16.2/src/math-display.c
--- old/gnome-calculator-3.16.1/src/math-display.c 2015-05-22
17:37:26.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/math-display.c 2015-06-10
00:39:31.000000000 +0200
@@ -1,4 +1,4 @@
-/* math-display.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* math-display.c generated by valac 0.29.1, the Vala compiler
* generated from math-display.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/math-equation.c
new/gnome-calculator-3.16.2/src/math-equation.c
--- old/gnome-calculator-3.16.1/src/math-equation.c 2015-05-22
17:37:27.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/math-equation.c 2015-06-10
00:39:31.000000000 +0200
@@ -1,4 +1,4 @@
-/* math-equation.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* math-equation.c generated by valac 0.29.1, the Vala compiler
* generated from math-equation.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/math-function-popup.c
new/gnome-calculator-3.16.2/src/math-function-popup.c
--- old/gnome-calculator-3.16.1/src/math-function-popup.c 2015-05-22
17:37:27.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/math-function-popup.c 2015-06-10
00:39:31.000000000 +0200
@@ -1,4 +1,4 @@
-/* math-function-popup.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* math-function-popup.c generated by valac 0.29.1, the Vala compiler
* generated from math-function-popup.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/math-function.c
new/gnome-calculator-3.16.2/src/math-function.c
--- old/gnome-calculator-3.16.1/src/math-function.c 2015-05-22
17:37:27.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/math-function.c 2015-06-10
00:39:31.000000000 +0200
@@ -1,4 +1,4 @@
-/* math-function.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* math-function.c generated by valac 0.29.1, the Vala compiler
* generated from math-function.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/math-history.c
new/gnome-calculator-3.16.2/src/math-history.c
--- old/gnome-calculator-3.16.1/src/math-history.c 2015-05-22
17:37:27.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/math-history.c 2015-06-10
00:39:31.000000000 +0200
@@ -1,4 +1,4 @@
-/* math-history.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* math-history.c generated by valac 0.29.1, the Vala compiler
* generated from math-history.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/math-preferences.c
new/gnome-calculator-3.16.2/src/math-preferences.c
--- old/gnome-calculator-3.16.1/src/math-preferences.c 2015-05-22
17:37:27.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/math-preferences.c 2015-06-10
00:39:31.000000000 +0200
@@ -1,4 +1,4 @@
-/* math-preferences.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* math-preferences.c generated by valac 0.29.1, the Vala compiler
* generated from math-preferences.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/math-variable-popup.c
new/gnome-calculator-3.16.2/src/math-variable-popup.c
--- old/gnome-calculator-3.16.1/src/math-variable-popup.c 2015-05-22
17:37:27.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/math-variable-popup.c 2015-06-10
00:39:31.000000000 +0200
@@ -1,4 +1,4 @@
-/* math-variable-popup.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* math-variable-popup.c generated by valac 0.29.1, the Vala compiler
* generated from math-variable-popup.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/math-variables.c
new/gnome-calculator-3.16.2/src/math-variables.c
--- old/gnome-calculator-3.16.1/src/math-variables.c 2015-05-22
17:37:27.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/math-variables.c 2015-06-10
00:39:31.000000000 +0200
@@ -1,4 +1,4 @@
-/* math-variables.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* math-variables.c generated by valac 0.29.1, the Vala compiler
* generated from math-variables.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/math-window.c
new/gnome-calculator-3.16.2/src/math-window.c
--- old/gnome-calculator-3.16.1/src/math-window.c 2015-05-22
17:37:27.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/math-window.c 2015-06-10
00:39:31.000000000 +0200
@@ -1,4 +1,4 @@
-/* math-window.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* math-window.c generated by valac 0.29.1, the Vala compiler
* generated from math-window.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/number.c
new/gnome-calculator-3.16.2/src/number.c
--- old/gnome-calculator-3.16.1/src/number.c 2015-05-22 17:37:25.000000000
+0200
+++ new/gnome-calculator-3.16.2/src/number.c 2015-06-10 00:39:29.000000000
+0200
@@ -1,4 +1,4 @@
-/* number.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* number.c generated by valac 0.29.1, the Vala compiler
* generated from number.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/serializer.c
new/gnome-calculator-3.16.2/src/serializer.c
--- old/gnome-calculator-3.16.1/src/serializer.c 2015-05-22
17:37:25.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/serializer.c 2015-06-10
00:39:30.000000000 +0200
@@ -1,4 +1,4 @@
-/* serializer.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* serializer.c generated by valac 0.29.1, the Vala compiler
* generated from serializer.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/test-equation.c
new/gnome-calculator-3.16.2/src/test-equation.c
--- old/gnome-calculator-3.16.1/src/test-equation.c 2015-05-22
17:37:26.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/test-equation.c 2015-06-10
00:39:29.000000000 +0200
@@ -1,4 +1,4 @@
-/* test-equation.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* test-equation.c generated by valac 0.29.1, the Vala compiler
* generated from test-equation.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/test-number.c
new/gnome-calculator-3.16.2/src/test-number.c
--- old/gnome-calculator-3.16.1/src/test-number.c 2015-05-22
17:37:25.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/test-number.c 2015-06-10
00:39:29.000000000 +0200
@@ -1,4 +1,4 @@
-/* test-number.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* test-number.c generated by valac 0.29.1, the Vala compiler
* generated from test-number.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/test-serializer.c
new/gnome-calculator-3.16.2/src/test-serializer.c
--- old/gnome-calculator-3.16.1/src/test-serializer.c 2015-05-22
17:37:25.000000000 +0200
+++ new/gnome-calculator-3.16.2/src/test-serializer.c 2015-06-10
00:39:29.000000000 +0200
@@ -1,4 +1,4 @@
-/* test-serializer.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* test-serializer.c generated by valac 0.29.1, the Vala compiler
* generated from test-serializer.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/src/unit.c new/gnome-calculator-3.16.2/src/unit.c
--- old/gnome-calculator-3.16.1/src/unit.c 2015-05-22 17:37:26.000000000
+0200
+++ new/gnome-calculator-3.16.2/src/unit.c 2015-06-10 00:39:30.000000000
+0200
@@ -1,4 +1,4 @@
-/* unit.c generated by valac 0.28.0.14-080be, the Vala compiler
+/* unit.c generated by valac 0.29.1, the Vala compiler
* generated from unit.vala, do not modify */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/gnome-calculator-3.16.1/test-driver new/gnome-calculator-3.16.2/test-driver
--- old/gnome-calculator-3.16.1/test-driver 2015-05-22 17:37:23.000000000
+0200
+++ new/gnome-calculator-3.16.2/test-driver 2015-06-10 00:43:58.000000000
+0200
@@ -3,7 +3,7 @@
scriptversion=2013-07-13.22; # UTC
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -106,11 +106,14 @@
# Test script is run here.
"$@" >$log_file 2>&1
estatus=$?
+
if test $enable_hard_errors = no && test $estatus -eq 99; then
- estatus=1
+ tweaked_estatus=1
+else
+ tweaked_estatus=$estatus
fi
-case $estatus:$expect_failure in
+case $tweaked_estatus:$expect_failure in
0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
0:*) col=$grn res=PASS recheck=no gcopy=no;;
77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
@@ -119,6 +122,12 @@
*:*) col=$red res=FAIL recheck=yes gcopy=yes;;
esac
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>$log_file
+
# Report outcome to console.
echo "${col}${res}${std}: $test_name"
