diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.in | 46 | ||||
-rw-r--r-- | src/autosave-manager.c | 6 | ||||
-rw-r--r-- | src/autosave-manager.vala | 2 | ||||
-rw-r--r-- | src/book-view.c | 2 | ||||
-rw-r--r-- | src/book.c | 140 | ||||
-rw-r--r-- | src/page-view.c | 2 | ||||
-rw-r--r-- | src/page.c | 42 | ||||
-rw-r--r-- | src/scanner.c | 104 | ||||
-rw-r--r-- | src/simple-scan.c | 118 | ||||
-rw-r--r-- | src/ui.c | 124 |
10 files changed, 302 insertions, 284 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 451e4ff..caf53de 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -86,14 +86,20 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ bin_PROGRAMS = simple-scan$(EXEEXT) @HAVE_COLORD_TRUE@am__append_1 = -D HAVE_COLORD @HAVE_PACKAGEKIT_TRUE@am__append_2 = -D HAVE_PACKAGEKIT subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/yelp.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gsettings.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/yelp.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -185,9 +191,9 @@ am__DIST_COMMON = $(srcdir)/Makefile.in \ scanner.c simple-scan.c ui.c DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -207,10 +213,12 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ HELP_DIR = @HELP_DIR@ @@ -219,24 +227,23 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ ITSTOOL = @ITSTOOL@ LDFLAGS = @LDFLAGS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ @@ -252,6 +259,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +POSUB = @POSUB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIMPLE_SCAN_CFLAGS = @SIMPLE_SCAN_CFLAGS@ @@ -261,6 +270,8 @@ USE_NLS = @USE_NLS@ VALAC = @VALAC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ XMLLINT = @XMLLINT@ YELP_LC_DIST = @YELP_LC_DIST@ YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@ @@ -274,8 +285,13 @@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appstreamxmldir = @appstreamxmldir@ bindir = @bindir@ +build = @build@ build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ @@ -283,13 +299,15 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ gsettingsschemadir = @gsettingsschemadir@ +host = @host@ host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/src/autosave-manager.c b/src/autosave-manager.c index 044761e..0e78c5d 100644 --- a/src/autosave-manager.c +++ b/src/autosave-manager.c @@ -1,4 +1,4 @@ -/* autosave-manager.c generated by valac 0.30.1, the Vala compiler +/* autosave-manager.c generated by valac 0.32.1, the Vala compiler * generated from autosave-manager.vala, do not modify */ /* @@ -301,8 +301,8 @@ void autosave_manager_load (AutosaveManager* self) { #line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" _tmp8_ = _tmp7_->message; #line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" - g_warning ("autosave-manager.vala:77: Could not load autosave infomation; not rest" \ -"oring any autosaves: %s", _tmp8_); + g_warning ("autosave-manager.vala:77: Could not load autosave information; not res" \ +"toring any autosaves: %s", _tmp8_); #line 306 "autosave-manager.c" } #line 78 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala" diff --git a/src/autosave-manager.vala b/src/autosave-manager.vala index 9ea79f1..84a1e00 100644 --- a/src/autosave-manager.vala +++ b/src/autosave-manager.vala @@ -74,7 +74,7 @@ public class AutosaveManager catch (Error e) { if (!(e is FileError.NOENT)) - warning ("Could not load autosave infomation; not restoring any autosaves: %s", e.message); + warning ("Could not load autosave information; not restoring any autosaves: %s", e.message); return; } var pages = get_value (file, "simple-scan", "pages"); diff --git a/src/book-view.c b/src/book-view.c index 16176a5..9246682 100644 --- a/src/book-view.c +++ b/src/book-view.c @@ -1,4 +1,4 @@ -/* book-view.c generated by valac 0.30.1, the Vala compiler +/* book-view.c generated by valac 0.32.1, the Vala compiler * generated from book-view.vala, do not modify */ /* @@ -1,4 +1,4 @@ -/* book.c generated by valac 0.30.1, the Vala compiler +/* book.c generated by valac 0.32.1, the Vala compiler * generated from book.vala, do not modify */ /* @@ -832,33 +832,33 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start gunichar _tmp1_ = 0U; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 930 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1017 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); -#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 933 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 933 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { #line 850 "book.c" gchar* _tmp4_ = NULL; -#line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 858 "book.c" } else { -#line 936 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = -1; -#line 936 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 864 "book.c" } @@ -882,103 +882,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1230 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1231 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1231 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1231 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1232 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1232 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { #line 898 "book.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; #line 907 "book.c" } -#line 1235 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1235 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { #line 913 "book.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; #line 922 "book.c" } -#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { #line 928 "book.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; #line 937 "book.c" } else { -#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp8_ = FALSE; #line 941 "book.c" } -#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { #line 949 "book.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; #line 958 "book.c" } else { -#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 962 "book.c" } -#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1240 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1240 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1240 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 984 "book.c" } @@ -4902,47 +4902,47 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) { gint _tmp6_ = 0; gchar* _tmp7_ = NULL; gint _tmp7__length1 = 0; -#line 1307 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1405 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp2_ = g_new0 (gchar, _tmp1_ + 1); -#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _result__length1 = _tmp1_ + 1; -#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" __result__size_ = _result__length1; -#line 1309 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp3_ = _result__length1; -#line 1309 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _result__length1 = _tmp3_ - 1; -#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp4__length1 = _result__length1; -#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp5_ = strlen (self); -#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp6_ = _tmp5_; -#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" memcpy (_tmp4_, self, (gsize) _tmp6_); -#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp7_ = _result_; -#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp7__length1 = _result__length1; -#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (result_length1) { -#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" *result_length1 = _tmp7__length1; #line 4942 "book.c" } -#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = _tmp7_; -#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 4948 "book.c" } diff --git a/src/page-view.c b/src/page-view.c index 7489ed0..8657814 100644 --- a/src/page-view.c +++ b/src/page-view.c @@ -1,4 +1,4 @@ -/* page-view.c generated by valac 0.30.1, the Vala compiler +/* page-view.c generated by valac 0.32.1, the Vala compiler * generated from page-view.vala, do not modify */ /* @@ -1,4 +1,4 @@ -/* page.c generated by valac 0.30.1, the Vala compiler +/* page.c generated by valac 0.32.1, the Vala compiler * generated from page.vala, do not modify */ /* @@ -2711,47 +2711,47 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) { gint _tmp6_ = 0; gchar* _tmp7_ = NULL; gint _tmp7__length1 = 0; -#line 1307 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1405 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp2_ = g_new0 (gchar, _tmp1_ + 1); -#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _result__length1 = _tmp1_ + 1; -#line 1308 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1406 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" __result__size_ = _result__length1; -#line 1309 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp3_ = _result__length1; -#line 1309 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _result__length1 = _tmp3_ - 1; -#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp4__length1 = _result__length1; -#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp5_ = strlen (self); -#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp6_ = _tmp5_; -#line 1310 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1408 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" memcpy (_tmp4_, self, (gsize) _tmp6_); -#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp7_ = _result_; -#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp7__length1 = _result__length1; -#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (result_length1) { -#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" *result_length1 = _tmp7__length1; #line 2751 "page.c" } -#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = _tmp7_; -#line 1311 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1409 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 2757 "page.c" } diff --git a/src/scanner.c b/src/scanner.c index 1db0c10..cdbbd35 100644 --- a/src/scanner.c +++ b/src/scanner.c @@ -1,4 +1,4 @@ -/* scanner.c generated by valac 0.30.1, the Vala compiler +/* scanner.c generated by valac 0.32.1, the Vala compiler * generated from scanner.vala, do not modify */ /* @@ -4421,17 +4421,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) { gboolean result = FALSE; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1278 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1278 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1279 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1279 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1279 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1279 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 4437 "scanner.c" } @@ -4738,11 +4738,11 @@ static gchar* sane_status_to_string (SANE_Status status) { static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; GError * _inner_error_ = NULL; -#line 1282 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1282 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1282 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); #line 4748 "scanner.c" { @@ -4757,73 +4757,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; -#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = old; -#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp2_ = _tmp1_; -#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _g_free0 (_tmp2_); -#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" regex = _tmp4_; -#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 4779 "scanner.c" goto __catch15_g_regex_error; } -#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" 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 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return NULL; #line 4788 "scanner.c" } -#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp6_ = regex; -#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp7_ = replacement; -#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_; -#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 4804 "scanner.c" goto __catch15_g_regex_error; } -#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" 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 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return NULL; #line 4815 "scanner.c" } -#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp9_ = _tmp5_; -#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp5_ = NULL; -#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = _tmp9_; -#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _g_free0 (_tmp5_); -#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 4829 "scanner.c" } @@ -4831,24 +4831,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* __catch15_g_regex_error: { GError* e = NULL; -#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1287 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _g_error_free0 (e); #line 4843 "scanner.c" } __finally15: -#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" 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 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return NULL; #line 4854 "scanner.c" } @@ -6274,15 +6274,15 @@ static gchar string_get (const gchar* self, glong index) { gchar result = '\0'; glong _tmp0_ = 0L; gchar _tmp1_ = '\0'; -#line 996 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = _tmp1_; -#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 6282 "scanner.c" } diff --git a/src/simple-scan.c b/src/simple-scan.c index 1e0d4a4..93b9e2c 100644 --- a/src/simple-scan.c +++ b/src/simple-scan.c @@ -1,4 +1,4 @@ -/* simple-scan.c generated by valac 0.30.1, the Vala compiler +/* simple-scan.c generated by valac 0.32.1, the Vala compiler * generated from simple-scan.vala, do not modify */ /* @@ -973,13 +973,13 @@ static void _g_free0_ (gpointer var) { static gint g_ptr_array_get_length (GPtrArray* self) { gint result; guint _tmp0_ = 0U; -#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = self->len; -#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = (gint) _tmp0_; -#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 985 "simple-scan.c" } @@ -987,11 +987,11 @@ static gint g_ptr_array_get_length (GPtrArray* self) { static void g_ptr_array_set_length (GPtrArray* self, gint value) { gint _tmp0_ = 0; -#line 4453 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 4808 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_if_fail (self != NULL); -#line 4453 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 4808 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = value; -#line 4453 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 4808 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_ptr_array_set_size (self, _tmp0_); #line 997 "simple-scan.c" } @@ -3022,37 +3022,37 @@ static glong string_strnlen (gchar* str, glong maxlen) { glong _tmp1_ = 0L; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1197 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1197 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1197 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1197 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1198 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1198 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { #line 3037 "simple-scan.c" glong _tmp4_ = 0L; -#line 1199 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp4_ = maxlen; -#line 1199 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1199 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 3045 "simple-scan.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 1201 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1201 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp6_ = str; -#line 1201 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = (glong) (_tmp5_ - _tmp6_); -#line 1201 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 3057 "simple-scan.c" } @@ -3072,112 +3072,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { glong _tmp20_ = 0L; glong _tmp21_ = 0L; gchar* _tmp22_ = NULL; -#line 1208 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { #line 3081 "simple-scan.c" glong _tmp2_ = 0L; -#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp2_ = len; -#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); #line 3087 "simple-scan.c" } else { -#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = FALSE; #line 3091 "simple-scan.c" } -#line 1210 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp0_) { #line 3095 "simple-scan.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; glong _tmp5_ = 0L; -#line 1212 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp3_ = offset; -#line 1212 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp4_ = len; -#line 1212 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1212 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" string_length = _tmp5_; #line 3107 "simple-scan.c" } else { gint _tmp6_ = 0; gint _tmp7_ = 0; -#line 1214 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp6_ = strlen (self); -#line 1214 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp7_ = _tmp6_; -#line 1214 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; #line 3117 "simple-scan.c" } -#line 1217 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp8_ = offset; -#line 1217 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { #line 3123 "simple-scan.c" glong _tmp9_ = 0L; glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1218 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp9_ = string_length; -#line 1218 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp10_ = offset; -#line 1218 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" offset = _tmp9_ + _tmp10_; -#line 1219 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp11_ = offset; -#line 1219 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); #line 3137 "simple-scan.c" } else { glong _tmp12_ = 0L; glong _tmp13_ = 0L; -#line 1221 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp12_ = offset; -#line 1221 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp13_ = string_length; -#line 1221 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); #line 3147 "simple-scan.c" } -#line 1223 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp14_ = len; -#line 1223 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { #line 3153 "simple-scan.c" glong _tmp15_ = 0L; glong _tmp16_ = 0L; -#line 1224 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1224 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp16_ = offset; -#line 1224 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; #line 3162 "simple-scan.c" } -#line 1226 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp17_ = offset; -#line 1226 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp18_ = len; -#line 1226 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp19_ = string_length; -#line 1226 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp20_ = offset; -#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp21_ = len; -#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = _tmp22_; -#line 1227 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 3182 "simple-scan.c" } @@ -1,4 +1,4 @@ -/* ui.c generated by valac 0.30.1, the Vala compiler +/* ui.c generated by valac 0.32.1, the Vala compiler * generated from ui.vala, do not modify */ /* @@ -2002,33 +2002,33 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start gunichar _tmp1_ = 0U; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 930 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1017 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); -#line 931 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 933 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 933 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { #line 2020 "ui.c" gchar* _tmp4_ = NULL; -#line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 934 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 2028 "ui.c" } else { -#line 936 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = -1; -#line 936 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 2034 "ui.c" } @@ -2052,103 +2052,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1230 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1231 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1231 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1231 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1232 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1232 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { #line 2068 "ui.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1233 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; #line 2077 "ui.c" } -#line 1235 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1235 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { #line 2083 "ui.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1236 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; #line 2092 "ui.c" } -#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { #line 2098 "ui.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; #line 2107 "ui.c" } else { -#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp8_ = FALSE; #line 2111 "ui.c" } -#line 1238 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { #line 2119 "ui.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; #line 2128 "ui.c" } else { -#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 2132 "ui.c" } -#line 1239 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1240 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1240 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1240 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1241 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 2154 "ui.c" } @@ -5927,15 +5927,15 @@ static gchar string_get (const gchar* self, glong index) { gchar result = '\0'; glong _tmp0_ = 0L; gchar _tmp1_ = '\0'; -#line 996 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = _tmp1_; -#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 5941 "ui.c" } @@ -7846,13 +7846,13 @@ static void user_interface_install_packages_ready (GObject* source_object, GAsyn static gint g_ptr_array_get_length (GPtrArray* self) { gint result; guint _tmp0_ = 0U; -#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = self->len; -#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = (gint) _tmp0_; -#line 4452 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 4807 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 7844 "ui.c" } @@ -7860,11 +7860,11 @@ static gint g_ptr_array_get_length (GPtrArray* self) { static void g_ptr_array_set_length (GPtrArray* self, gint value) { gint _tmp0_ = 0; -#line 4453 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 4808 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_if_fail (self != NULL); -#line 4453 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 4808 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = value; -#line 4453 "/usr/share/vala-0.30/vapi/glib-2.0.vapi" +#line 4808 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_ptr_array_set_size (self, _tmp0_); #line 7856 "ui.c" } |